diff --git a/src/client.py b/src/client.py index f0bfd2a..a93a4a8 100644 --- a/src/client.py +++ b/src/client.py @@ -81,7 +81,10 @@ def createClientBlueprint(wireguardConfigurations: dict[WireguardConfiguration], if session.get('username') is None: return ResponseObject(False, "Sign in status is invalid", status_code=401) session['totpVerified'] = True - return ResponseObject(True) + return ResponseObject(True, data={ + "Email": session.get('username'), + "Profile": DashboardClients.GetClientProfile(session.get("ClientID")) + }) return ResponseObject(status, msg) @client.get(prefix) diff --git a/src/modules/DashboardClients.py b/src/modules/DashboardClients.py index 2e6a95a..2d0bdc5 100644 --- a/src/modules/DashboardClients.py +++ b/src/modules/DashboardClients.py @@ -59,7 +59,14 @@ class DashboardClients: ).where( self.dashboardClientsTable.c.DeletedDate is None) ).mappings().fetchall() - + + def GetClientProfile(self, ClientID): + with self.engine.connect() as conn: + return dict(conn.execute( + self.dashboardClientsInfoTable.select().where( + self.dashboardClientsInfoTable.c.ClientID == ClientID + ) + ).mappings().fetchone()) def SignIn(self, Email, Password) -> tuple[bool, str]: if not all([Email, Password]): diff --git a/src/modules/DashboardClientsPeerAssignment.py b/src/modules/DashboardClientsPeerAssignment.py index 8800b94..14cb07f 100644 --- a/src/modules/DashboardClientsPeerAssignment.py +++ b/src/modules/DashboardClientsPeerAssignment.py @@ -74,10 +74,8 @@ class DashboardClientsPeerAssignment: def GetAssignedPeers(self, ClientID): peers = [] - assigned = list( - filter(lambda e: - e['ClientID'] == ClientID, self.assignments) - ) + assigned = filter(lambda e: + e['ClientID'] == ClientID, self.assignments) for a in assigned: peer = filter(lambda e : e.id == a['PeerID'], @@ -97,6 +95,4 @@ class DashboardClientsPeerAssignment: 'configuration_name': a['ConfigurationName'], 'peer_configuration_data': p.downloadPeer() }) - - print(peers) return peers \ No newline at end of file diff --git a/src/static/client/src/App.vue b/src/static/client/src/App.vue index ecea778..aff1e24 100644 --- a/src/static/client/src/App.vue +++ b/src/static/client/src/App.vue @@ -1,6 +1,6 @@