alcehmy and event functions updated

databases/extensions/auth.py

@@ -46,50 +46,42 @@ class AuthModule(PasswordModule):
 
     @classmethod
     def check_user_exits(cls, access_key, domain):
-
-        found_user: Users = cls.filter_active(
+        found_user: Users = cls.filter_one(
             or_(
                 cls.email == str(access_key).lower(),
                 cls.phone_number == str(access_key).replace(" ", ""),
             ),
-            filter_records=False,
-        )
-        if not found_user.data:
+        ).data
+        if not found_user:
             raise HTTPException(
                 status_code=status.HTTP_400_BAD_REQUEST,
                 detail="Given access key or domain is not matching with the any user record.",
             )
-        found_user = found_user.data[0]
+
         other_domains_list = found_user.get_main_domain_and_other_domains(
             get_main_domain=False
         )
-
         if domain not in other_domains_list:
             raise HTTPException(
                 status_code=401,
                 detail=dict(message="Unauthorized User attempts to connect api"),
             )
-
-        if not found_user:
-            raise HTTPException(
-                status_code=401,
-                detail="Given access key or domain is not matching with the any user record.",
-            )
         return found_user
 
     def generate_access_token(self):
         return self.generate_token(Auth.ACCESS_TOKEN_LENGTH)
 
     def remove_refresher_token(self, domain, disconnect: bool = False):
-        registered_tokens = ([], 0)
         if disconnect:
-            registered_tokens = UsersTokens.filter_by(user_id=self.id)
+            registered_tokens = UsersTokens.filter_all(
+                UsersTokens.user_id==self.id, system=True
+            )
         else:
-            registered_tokens = UsersTokens.filter_by(domain=domain, user_id=self.id)
-        for token in registered_tokens[0]:
-            token.session.delete(token)
-            token.session.commit()
-            token.session.flush()
+            registered_tokens = UsersTokens.filter_all(
+                UsersTokens.domain==domain, UsersTokens.user_id==self.id, system=True
+            )
+        registered_tokens.query.delete()
+        UsersTokens.save()
 
     def check_password(self, password):
         main_domain = self.get_main_domain_and_other_domains(get_main_domain=True)
@@ -182,6 +174,7 @@ class AuthModule(PasswordModule):
                 token=refresh_token,
                 domain=domain,
             )
+            UsersTokens.save()
             return refresh_token
         return None