wip #92

Author: previ

docker/default.conf

@@ -22,6 +22,6 @@ server {
     }
     location /wifi {
         rewrite /wifi/(.*) /$1  break;
-        proxy_pass   http://127.0.0.1:8080;
+        proxy_pass   http://127.0.0.1:9090;
     }
 }

src/common/wifi_connect.js

@@ -1,26 +1,43 @@
 class WifiConnect {
   constructor(CB, axios) {
-    this.CB = CB + '/wifi';
+    this.CB = CB + '/wifi/v1';
     this.$axios = axios;
   }
 
   networks() {
-    return this.$axios.get(`${this.CB}/networks`);
+    return this.$axios.get(`${this.CB}/list_access_points`);
   }
 
-  connect(ssid, identity, passphrase) {
+  connect(ssid, conn_type, username, password) {
     return this.$axios.post(`${this.CB}/connect`, {
       ssid: ssid,
-      identity: identity,
-      passphrase: passphrase,
+      conn_type: conn_type,
+      username: username,
+      password: password,
     });
   }
 
-  disconnect(ssid) {
-    return this.$axios.post(`${this.CB}/disconnect`, {
-      ssid: ssid,
+  disconnect() {
+    return this.$axios.post(`${this.CB}/forget`, {
+      all_networks: true
     });
   }
+
+  set_hotspot_ssid(ssid) {
+    return this.$axios.post(`${this.CB}/sset_hotspot_ssid`, {
+      ssid: ssid
+    });
+  }
+
+  set_hotspot_password(password) {
+    return this.$axios.post(`${this.CB}/set_hotspot_password`, {
+      ssid: password
+    });
+  }
+
+  connection_status() {
+    return this.$axios.get(`${this.CB}/connection_status`);
+  }
 }
 
 export default WifiConnect;

src/components/Settings.vue

@@ -396,6 +396,12 @@
                         >
                         </v-select>
                         <v-text-field 
+                        v-if="network_require_user()"
+                        :disabled="settings.wifiMode!='client'"
+                        v-model="settings.wifiUser"
+                        :type="text"
+                         v-bind:label="$t('message.settings_network_user')"></v-text-field>
+                        <v-text-field 
                         :disabled="settings.wifiMode!='client'"
                         v-model="settings.wifiPsw"
                         :append-icon="wifi_pwd_show ? 'mdi-eye' : 'mdi-eye-off'"
@@ -765,6 +771,12 @@ export default {
       next();
     }
   },
+  computed: {
+    network_require_user() {
+      const network = this.networks.find(item => { return item.ssid==this.v$.settings.wifiSSID });
+      return network.conn_type == "ENTERPRISE";
+    }
+  },
   methods: {
     pickFile() {
       this.$refs.file.click();
@@ -937,14 +949,15 @@ export default {
         });
         if (this.v$.settings.wifiMode.$dirty || this.v$.settings.wifiSSID.$dirty || this.v$.settings.wifiPsw.$dirty) {
           if(this.settings.wifiMode=="client") {
-            this.$wifi_connect.connect(this.settings.wifiSSID, "", this.settings.wifiPsw)
+            const network = this.networks.find(item => { return item.ssid==this.v$.settings.wifiSSID });
+            this.$wifi_connect.connect(network.ssid, network.conn_type, this.settings.wifiUser, this.settings.wifiPsw)
               .then(() => {
                 console.log('connect Sent');
                 this.snackText = this.$i18n.t('message.settings_network_updated');
                 this.snackbar = true;
               });
           } else {
-            this.$wifi_connect.disconnect(this.settings.wifiSSID)
+            this.$wifi_connect.disconnect()
               .then(() => {
                 console.log('disconnect Sent');
                 this.snackText = this.$i18n.t('message.settings_network_updated');
@@ -1035,6 +1048,7 @@ export default {
         btnFun: null,
         wifiMode: 'ap',
         wifiSSID: null,
+        wifiUser: null,
         wifiPsw: null,
 
         hardwareVersion: null,