Update auths.py

backend/apps/webui/models/auths.py

@@ -102,40 +102,44 @@ class AuthsTable:
         role: str = "pending",
         oauth_sub: Optional[str] = None,
     ) -> Optional[UserModel]:
-        log.info("insert_new_auth")
+        with get_db() as db:
 
-        id = str(uuid.uuid4())
+            log.info("insert_new_auth")
 
-        auth = AuthModel(
+            id = str(uuid.uuid4())
-            **{"id": id, "email": email, "password": password, "active": True}
-        )
-        result = Auth(**auth.model_dump())
-        db.add(result)
 
-        user = Users.insert_new_user(
+            auth = AuthModel(
-            id, name, email, profile_image_url, role, oauth_sub
+                **{"id": id, "email": email, "password": password, "active": True}
-        )
+            )
+            result = Auth(**auth.model_dump())
+            db.add(result)
 
-        db.commit()
+            user = Users.insert_new_user(
-        db.refresh(result)
+                id, name, email, profile_image_url, role, oauth_sub
+            )
 
-        if result and user:
+            db.commit()
-            return user
+            db.refresh(result)
-        else:
+
-            return None
+            if result and user:
+                return user
+            else:
+                return None
 
     def authenticate_user(self, email: str, password: str) -> Optional[UserModel]:
         log.info(f"authenticate_user: {email}")
         try:
-            auth = db.query(Auth).filter_by(email=email, active=True).first()
+            with get_db() as db:
-            if auth:
+
-                if verify_password(password, auth.password):
+                auth = db.query(Auth).filter_by(email=email, active=True).first()
-                    user = Users.get_user_by_id(auth.id)
+                if auth:
-                    return user
+                    if verify_password(password, auth.password):
+                        user = Users.get_user_by_id(auth.id)
+                        return user
+                    else:
+                        return None
                 else:
                     return None
-            else:
-                return None
         except:
             return None
 
@@ -154,38 +158,47 @@ class AuthsTable:
     def authenticate_user_by_trusted_header(self, email: str) -> Optional[UserModel]:
         log.info(f"authenticate_user_by_trusted_header: {email}")
         try:
-            auth = db.query(Auth).filter(email=email, active=True).first()
+            with get_db() as db:
-            if auth:
+                auth = db.query(Auth).filter(email=email, active=True).first()
-                user = Users.get_user_by_id(auth.id)
+                if auth:
-                return user
+                    user = Users.get_user_by_id(auth.id)
+                    return user
         except:
             return None
 
     def update_user_password_by_id(self, id: str, new_password: str) -> bool:
         try:
-            result = db.query(Auth).filter_by(id=id).update({"password": new_password})
+            with get_db() as db:
-            return True if result == 1 else False
+
+                result = (
+                    db.query(Auth).filter_by(id=id).update({"password": new_password})
+                )
+                return True if result == 1 else False
         except:
             return False
 
     def update_email_by_id(self, id: str, email: str) -> bool:
         try:
-            result = db.query(Auth).filter_by(id=id).update({"email": email})
+            with get_db() as db:
-            return True if result == 1 else False
+
+                result = db.query(Auth).filter_by(id=id).update({"email": email})
+                return True if result == 1 else False
         except:
             return False
 
     def delete_auth_by_id(self, id: str) -> bool:
         try:
-            # Delete User
+            with get_db() as db:
-            result = Users.delete_user_by_id(id)
 
-            if result:
+                # Delete User
-                db.query(Auth).filter_by(id=id).delete()
+                result = Users.delete_user_by_id(id)
 
-                return True
+                if result:
-            else:
+                    db.query(Auth).filter_by(id=id).delete()
-                return False
+
+                    return True
+                else:
+                    return False
         except:
             return False