Update

src/modules/DashboardClients.py

@@ -6,6 +6,7 @@ import pyotp
 import sqlalchemy as db
 
 from .ConnectionString import ConnectionString
+from .DashboardClientsPeerAssignment import DashboardClientsPeerAssignment
 from .DashboardClientsTOTP import DashboardClientsTOTP
 from .Utilities import ValidatePasswordStrength
 from .DashboardLogger import DashboardLogger
@@ -18,7 +19,6 @@ class DashboardClients:
         self.engine = db.create_engine(ConnectionString("wgdashboard"))
         self.metadata = db.MetaData()
         
-        
         self.dashboardClientsTable = db.Table(
             'DashboardClients', self.metadata,
             db.Column('ClientID', db.String(255), nullable=False, primary_key=True),
@@ -46,6 +46,7 @@ class DashboardClients:
         self.Clients = []
         self.__getClients()
         self.DashboardClientsTOTP = DashboardClientsTOTP()
+        self.DashboardClientsPeerAssignment = DashboardClientsPeerAssignment()
         
     def __getClients(self):
         with self.engine.connect() as conn:
@@ -76,6 +77,7 @@ class DashboardClients:
     
     def SignIn_GetTotp(self, Token: str, UserProvidedTotp: str = None) -> tuple[bool, str] or tuple[bool, None, str]:
         status, data = self.DashboardClientsTOTP.GetTotp(Token)
+        
         if not status:
             return False, "TOTP Token is invalid"    
         if UserProvidedTotp is None:
@@ -83,7 +85,7 @@ class DashboardClients:
                 return True, pyotp.totp.TOTP(data.get('TotpKey')).provisioning_uri(name=data.get('Email'),
                                                                                    issuer_name="WGDashboard Client")
         else:
-            totpMatched = pyotp.TOTP(data.get('TotpKey')).verify(UserProvidedTotp)
+            totpMatched = pyotp.totp.TOTP(data.get('TotpKey')).verify(UserProvidedTotp)
             if not totpMatched:
                 return False, "TOTP is does not match"
             else:

src/modules/DashboardClientsPeerAssignment.py

@@ -0,0 +1,46 @@
+from .ConnectionString import ConnectionString
+from .DashboardLogger import DashboardLogger
+import sqlalchemy as db
+
+
+class DashboardClientsPeerAssignment:
+    def __init__(self):
+        self.logger = DashboardLogger()
+        self.engine = db.create_engine(ConnectionString("wgdashboard"))
+        self.metadata = db.MetaData()
+        
+        self.dashboardClientsPeerAssignmentTable = db.Table(
+            'DashboardClientsPeerAssignment', self.metadata,
+            db.Column('AssignmentID', db.String(255), nullable=False, primary_key=True),
+            db.Column('ClientID', db.String(255), nullable=False, index=True),
+            db.Column('ConfigurationName', db.String(255)),
+            db.Column('PeerID', db.String(500)),
+            db.Column('AssignedDate',
+                      (db.DATETIME if 'sqlite:///' in ConnectionString("wgdashboard") else db.TIMESTAMP),
+                      server_default=db.func.now()),
+            db.Column('UnassignedDate',
+                      (db.DATETIME if 'sqlite:///' in ConnectionString("wgdashboard") else db.TIMESTAMP)),
+            extend_existing=True
+        )
+        self.metadata.create_all(self.engine)
+        self.assignments = []
+    
+    def __getAssignments(self):
+        with self.engine.connect() as conn:
+            self.assignments = conn.execute(
+                self.dashboardClientsPeerAssignmentTable.select().where(
+                    self.dashboardClientsPeerAssignmentTable.c.UnassignedDate is None
+                )
+            ).mappings().fetchall()
+            
+    def AssignClient(self, ClientID, ConfigurationName, PeerID):
+        pass
+    
+    def UnassignClient(self, AssignmentID):
+        pass
+    
+    def GetAssignedClient(self, ConfigurationName, PeerID):
+        pass
+    
+    def GetAssignedPeers(self, ClientID):
+        pass