Restart running hotspot on SSID or Password change

maggie44 · maggie44 · commit 504d97f9c707 · 2022-03-04T11:24:18.000Z
diff --git a/src/common/wifi.py b/src/common/wifi.py
@@ -71,7 +71,6 @@ def auto_connect(ssid=None, username=None, password=None):
 
 # Returns True when a connection to a router is made, or the Hotspot is live
 def check_device_state():
-    # Save the wi-fi device object to a variable
     if get_device().State == Pnm.NM_DEVICE_STATE_ACTIVATED:
         return True
     else:
diff --git a/src/resources/wifi_routes.py b/src/resources/wifi_routes.py
@@ -6,6 +6,7 @@
 from common.wifi import check_wifi_status
 from common.wifi import connect
 from common.wifi import forget
+from common.wifi import get_connection_id
 from common.wifi import list_access_points
 from dotenv import dotenv_values
 from flask import request
@@ -50,12 +51,12 @@ def get(self):
 
 class wifi_forget(Resource):
     def post(self):
-        # If the device is not connected to a wifi network
-        if not check_wifi_status():
-            return {"message": "Device is already disconnected."}, 409
-
         # Check the all_networks boolean
         if not request.get_json() or "all_networks" not in request.get_json():
+            # If the device is not connected to a wifi network
+            if not check_wifi_status():
+                return {"message": "Device is already disconnected."}, 409
+
             forget_mode = False
         else:
             forget_mode = request.get_json()["all_networks"]
@@ -97,6 +98,23 @@ def post(self):
                 "db/.db", "PWC_HOTSPOT_PASSWORD", content["password"]
             )
 
+        # Set the new SSID to the global var
+        config.hotspot_password = content["password"]
+
+        # Fetch ID of any current connection
+        connection = get_connection_id()
+
+        # If there is a running hotspot, recreate it with the new details
+        if (
+            connection
+            and connection.GetSettings()["802-11-wireless"]["mode"] == "ap"
+        ):
+            wifi_forget_thread = threading.Thread(
+                target=forget,
+                kwargs={"create_new_hotspot": True},
+            )
+            wifi_forget_thread.start()
+
         return {"message": "ok"}, 200
 
 
@@ -110,6 +128,23 @@ def post(self):
         else:
             dotenv.set_key("db/.db", "PWC_HOTSPOT_SSID", content["ssid"])
 
+        # Set the new SSID to the global var
+        config.hotspot_ssid = content["ssid"]
+
+        # Fetch ID of any current connection
+        connection = get_connection_id()
+
+        # If there is a running hotspot, recreate it with the new details
+        if (
+            connection
+            and connection.GetSettings()["802-11-wireless"]["mode"] == "ap"
+        ):
+            wifi_forget_thread = threading.Thread(
+                target=forget,
+                kwargs={"create_new_hotspot": True},
+            )
+            wifi_forget_thread.start()
+
         return {"message": "ok"}, 200
 
 
