Add preshared key default toggle (#1207)

* Add previous PR changes

* Import lowercase dayjs

* Build dist

* Revert "Build dist"

This reverts commit 152da2ca10
Dist not to be built at @DaanSelen request

src/client.py

@@ -100,7 +100,7 @@ def createClientBlueprint(wireguardConfigurations: dict[WireguardConfiguration],
         date = datetime.datetime.now(tz=datetime.timezone.utc).strftime('%Y-%m-%d %H:%M:%S UTC')
         
         emailSender = EmailSender(dashboardConfig)
-        if not emailSender.ready():
+        if not emailSender.is_ready():
             return ResponseObject(False, "We can't send you an email due to your Administrator has not setup email service. Please contact your administrator.") 
         
         data = request.get_json()
@@ -244,4 +244,4 @@ def createClientBlueprint(wireguardConfigurations: dict[WireguardConfiguration],
     
         return ResponseObject(status, message)       
     
-    return client
+    return client

src/modules/DashboardConfig.py

@@ -51,7 +51,8 @@ class DashboardConfig:
                 "peer_display_mode": "grid",
                 "remote_endpoint": GetRemoteEndpoint(),
                 "peer_MTU": "1420",
-                "peer_keep_alive": "21"
+                "peer_keep_alive": "21",
+                "peer_preshared_key_default": "false"
             },
             "Other": {
                 "welcome_session": "true"
@@ -146,14 +147,17 @@ class DashboardConfig:
                         if col_name not in existing_columns:
                             type_str = col_type().compile(dialect=self.engine.dialect)
                             current_app.logger.info(f"Adding missing column '{col_name}' to table '{table_name}'")
-                            conn.execute(db.text(f'ALTER TABLE "{table_name}" ADD COLUMN "{col_name}" {type_str}'))
+                            preparer = self.engine.dialect.identifier_preparer
+                            quoted_table = preparer.quote_identifier(table_name)
+                            quoted_column = preparer.quote_identifier(col_name)
+                            conn.execute(db.text(f"ALTER TABLE {quoted_table} ADD COLUMN {quoted_column} {type_str}"))
 
     def getConnectionString(self, database) -> str or None:
         sqlitePath = os.path.join(DashboardConfig.ConfigurationPath, "db")
-        
+
         if not os.path.isdir(sqlitePath):
             os.mkdir(sqlitePath)
-        
+
         if self.GetConfig("Database", "type")[1] == "postgresql":
             cn = f'postgresql+psycopg2://{self.GetConfig("Database", "username")[1]}:{self.GetConfig("Database", "password")[1]}@{self.GetConfig("Database", "host")[1]}/{database}'
         elif self.GetConfig("Database", "type")[1] == "mysql":

src/requirements.txt

@@ -8,10 +8,10 @@ icmplib==3.0.4
 gunicorn==25.0.3
 requests==2.32.5
 tcconfig==0.30.1
-sqlalchemy==2.0.46
+sqlalchemy==2.0.49
 sqlalchemy_utils==0.42.1
 psycopg[binary]==3.3.3
 PyMySQL==1.1.2
 tzlocal==5.3.1
 python-jose==3.5.0
-pydantic==2.12.5
+pydantic==2.13.0

src/static/app/package.json

@@ -20,28 +20,28 @@
     "animate.css": "^4.1.1",
     "bootstrap": "^5.3.2",
     "bootstrap-icons": "^1.11.3",
-    "cidr-tools": "^11.3.2",
+    "cidr-tools": "^11.3.3",
     "css-color-converter": "^2.0.0",
     "dayjs": "^1.11.19",
     "electron-builder": "^26.7.0",
-    "fuse.js": "^7.0.0",
+    "fuse.js": "^7.3.0",
     "i": "^0.3.7",
     "is-cidr": "^6.0.3",
     "npm": "^11.8.0",
-    "ol": "^10.7.0",
+    "ol": "^10.8.0",
     "pinia": "^3.0.4",
     "pinia-plugin-persistedstate": "^4.7.1",
     "qrcode": "^1.5.3",
     "qrcodejs": "^1.0.0",
     "simple-code-editor": "^2.0.9",
     "uuid": "^13.0.0",
-    "vue": "^3.5.31",
+    "vue": "^3.5.32",
     "vue-chartjs": "^5.3.3",
     "vue-router": "^5.0.4"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^6.0.4",
-    "vite": "^7.3.1"
+    "vite": "^8.0.8"
   },
   "overrides": {
     "tar": "^7.5.6"

src/static/app/src/components/configurationComponents/newPeersComponents/presharedKeyInput.vue

@@ -6,18 +6,27 @@ export default {
 	components: {LocaleText},
 	props: {
 		data: Object,
-		saving: Boolean
+		saving: Boolean,
+		defaultEnabled: Boolean
 	},
 	data(){
 		return{
 			enable: false
 		}
 	},
+	mounted() {
+		const hasKey = !!(this.data && this.data.preshared_key && this.data.preshared_key.length > 0)
+		if (hasKey || this.defaultEnabled){
+			this.enable = true
+		}
+	},
 	watch:{
 		enable(){
-			if (this.enable){
+			if (this.enable) {
-				this.data.preshared_key = window.wireguard.generateKeypair().presharedKey
+				if (!this.data.preshared_key){
-			}else {
+					this.data.preshared_key = window.wireguard.generateKeypair().presharedKey
+				}
+			} else {
 				this.data.preshared_key = ""
 			}
 		}
@@ -48,4 +57,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/static/app/src/components/configurationComponents/peerAddModal.vue

@@ -32,7 +32,7 @@ const peerData = ref({
 	keepalive: parseInt(dashboardStore.Configuration.Peers.peer_keep_alive),
 	mtu: parseInt(dashboardStore.Configuration.Peers.peer_mtu),
 	preshared_key: "",
-	preshared_key_bulkAdd: false,
+	preshared_key_bulkAdd: Boolean(dashboardStore.Configuration.Peers.peer_preshared_key_default),
 	allowed_ips_validation: true,
 })
 const availableIp = ref([])
@@ -128,7 +128,7 @@ watch(() => {
 											<EndpointAllowedIps :saving="saving" :data="peerData"></EndpointAllowedIps>
 											<div class="row gy-3">
 												<div class="col-sm" v-if="!peerData.bulkAdd">
-													<PresharedKeyInput :saving="saving" :data="peerData" :bulk="peerData.bulkAdd"></PresharedKeyInput>
+													<PresharedKeyInput :saving="saving" :data="peerData" :bulk="peerData.bulkAdd" :defaultEnabled="Boolean(dashboardStore.Configuration.Peers.peer_preshared_key_default)"></PresharedKeyInput>
 												</div>
 
 												<div class="col-sm">
@@ -177,4 +177,4 @@ watch(() => {
 
 <style scoped>
 
-</style>
+</style>

src/static/app/src/components/configurationComponents/peerCreate.vue

@@ -36,7 +36,7 @@ export default {
 				keepalive: parseInt(this.dashboardStore.Configuration.Peers.peer_keep_alive),
 				mtu: parseInt(this.dashboardStore.Configuration.Peers.peer_mtu),
 				preshared_key: "",
-				preshared_key_bulkAdd: false,
+				preshared_key_bulkAdd: Boolean(this.dashboardStore.Configuration.Peers.peer_preshared_key_default),
 			},
 			availableIp: undefined,
 			availableIpSearchString: "",
@@ -133,7 +133,7 @@ export default {
 			<hr class="mb-0 mt-2">
 			<div class="row gy-3">
 				<div class="col-sm" v-if="!this.data.bulkAdd">
-					<PresharedKeyInput :saving="saving" :data="data" :bulk="this.data.bulkAdd"></PresharedKeyInput>
+					<PresharedKeyInput :saving="saving" :data="data" :bulk="this.data.bulkAdd" :defaultEnabled="Boolean(this.dashboardStore.Configuration.Peers.peer_preshared_key_default)"></PresharedKeyInput>
 				</div>
 				
 				<div class="col-sm">
@@ -187,4 +187,4 @@ div{
 .card{
 	max-height: 100%;
 }
-</style>
+</style>

src/static/app/src/components/settingsComponent/peerDefaultSettings.vue

@@ -22,6 +22,8 @@ import PeersDefaultSettingsInput from "@/components/settingsComponent/peersDefau
 						targetData="peer_mtu" title="MTU"></PeersDefaultSettingsInput>
 					<PeersDefaultSettingsInput
 						targetData="peer_keep_alive" title="Persistent Keepalive"></PeersDefaultSettingsInput>
+						<PeersDefaultSettingsInput
+						targetData="peer_preshared_key_default" title="Pre-Shared Key Default"></PeersDefaultSettingsInput>
 					<PeersDefaultSettingsInput
 						targetData="remote_endpoint" title="Peer Remote Endpoint"
 						:warning="true" warningText="This will be changed globally, and will be apply to all peer's QR code and configuration file."
@@ -34,4 +36,4 @@ import PeersDefaultSettingsInput from "@/components/settingsComponent/peersDefau
 
 <style scoped>
 
-</style>
+</style>

src/static/app/src/components/settingsComponent/peersDefaultSettingsInput.vue

@@ -31,6 +31,11 @@ export default {
 	mounted() {
 		this.value = this.store.Configuration.Peers[this.targetData];
 	},
+	computed: {
+		isBoolean(){
+			return typeof this.value === "boolean"
+		}
+	},
 	methods:{
 		async useValidation(){
 			if(this.changed){
@@ -67,7 +72,14 @@ export default {
 				<LocaleText :t="this.title"></LocaleText>
 			</small></strong>
 		</label>
-		<input type="text" class="form-control" 
+		<div v-if="isBoolean" class="form-check form-switch">
+			<input class="form-check-input" type="checkbox" role="switch"
+			       v-model="this.value"
+			       :id="this.uuid"
+			       @change="this.changed = true; useValidation()"
+			       :disabled="this.updating">
+		</div>
+		<input v-else type="text" class="form-control" 
 		       :class="{'is-invalid': showInvalidFeedback, 'is-valid': isValid}"
 		       :id="this.uuid"
 		       v-model="this.value"
@@ -88,4 +100,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/static/client/package.json

@@ -13,16 +13,16 @@
     "bootstrap": "^5.3.6",
     "bootstrap-icons": "^1.13.1",
     "dayjs": "^1.11.13",
-    "oidc-client-ts": "^3.2.1",
+    "oidc-client-ts": "^3.5.0",
     "pinia": "^3.0.2",
     "qrcode": "^1.5.4",
-    "uuid": "^11.1.0",
+    "uuid": "^13.0.0",
-    "vue": "^3.5.13",
+    "vue": "^3.5.32",
     "vue-router": "^4.5.1"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^5.2.3",
-    "vite": "^6.2.4",
+    "vite": "^8.0.8",
-    "vite-plugin-vue-devtools": "^7.7.2"
+    "vite-plugin-vue-devtools": "^8.1.1"
   }
 }