auth refactor

Author: apocas

.gitignore

@@ -181,4 +181,5 @@ restai_prod
 lab.py
 
 # pyenv
-.python-version
+.python-version
+.aider*

app/auth.py

@@ -29,85 +29,77 @@ def get_current_username(
         db_wrapper: DBWrapper = Depends(get_db_wrapper)
 ):
     auth_header = request.headers.get('Authorization')
-    bearer_token = None
     credentials = None
+    
     if auth_header:
         temp_bearer_token = auth_header.split(" ")[1]
-        if "Bearer" in auth_header:
-            bearer_token = temp_bearer_token
-        else:
+        
+        if "Bearer" in auth_header:            
+            user = db_wrapper.get_user_by_apikey(temp_bearer_token)
+
+            if user is None:
+                raise HTTPException(
+                    status_code=401,
+                    detail="Invalid key"
+                )
+
+            return User.model_validate(user)
+        elif "Basic" in auth_header:
             try:
                 credentials_b64 = base64.b64decode(temp_bearer_token).decode('utf-8')
                 username, password = credentials_b64.split(':', 1)
                 credentials = {
                     'username': username,
                     'password': password
                 }
+                
+                if RESTAI_AUTH_DISABLE_LOCAL or not credentials or ("username" not in credentials or "password" not in credentials):
+                    raise HTTPException(
+                        status_code=401,
+                        detail="Invalid credentials"
+                    )
+                
+                user = db_wrapper.get_user_by_username(credentials["username"])
+
+                if user is None or user.sso:
+                    raise HTTPException(
+                        status_code=401,
+                        detail="Invalid credentials"
+                    )
+
+                is_correct_username = credentials["username"] == user.username
+                is_correct_password = pwd_context.verify(
+                    credentials["password"], user.hashed_password)
+
+                if not (is_correct_username and is_correct_password):
+                    raise HTTPException(
+                        status_code=401,
+                        detail="Incorrect email or password",
+                        headers={"WWW-Authenticate": "Basic"},
+                    )
+
+                return User.model_validate(user)
+                
             except Exception:
                 pass
+    else:
+        jwt_token = request.cookies.get("restai_token")
 
-    jwt_token = request.cookies.get("restai_token")
-
-    if bearer_token:
-        user = db_wrapper.get_user_by_apikey(bearer_token)
+        if jwt_token:
+            try:
+                data = jwt.decode(jwt_token, RESTAI_AUTH_SECRET, algorithms=["HS512"])
 
-        if user is None:
-            raise HTTPException(
-                status_code=401,
-                detail="Invalid key"
-            )
+                user = db_wrapper.get_user_by_username(data["username"])
 
-        return User.model_validate(user)
-    elif jwt_token:
-        try:
-            data = jwt.decode(jwt_token, RESTAI_AUTH_SECRET, algorithms=["HS512"])
+                return User.model_validate(user)
+            except Exception:
+                raise HTTPException(
+                    status_code=401,
+                    detail="Invalid token"
+                )
 
-            user = db_wrapper.get_user_by_username(data["username"])
 
-            return User.model_validate(user)
-        except Exception:
-            raise HTTPException(
-                status_code=401,
-                detail="Invalid token"
-            )
-    else:
-        if RESTAI_AUTH_DISABLE_LOCAL or not credentials or (
-                "username" not in credentials or "password" not in credentials):
-            raise HTTPException(
-                status_code=401,
-                detail="Invalid credentials"
-            )
-
-        user = db_wrapper.get_user_by_username(credentials["username"])
-
-        if user is None:
-            raise HTTPException(
-                status_code=401,
-                detail="Invalid credentials"
-            )
-
-        if user.sso:
-            raise HTTPException(
-                status_code=401,
-                detail="SSO user"
-            )
-
-        if user is not None:
-            is_correct_username = credentials["username"] == user.username
-            is_correct_password = pwd_context.verify(
-                credentials["password"], user.hashed_password)
-        else:
-            is_correct_username = False
-            is_correct_password = False
-
-        if not (is_correct_username and is_correct_password):
-            raise HTTPException(
-                status_code=401,
-                detail="Incorrect email or password",
-                headers={"WWW-Authenticate": "Basic"},
-            )
-
-        return User.model_validate(user)
+  
 
 
 def get_current_username_admin(user: User = Depends(get_current_username)):

app/models/databasemodels.py

@@ -43,9 +43,10 @@ class ProjectDatabase(Base):
     human_name = Column(String(255))
     human_description = Column(Text)
     tools = Column(Text)
+    creator = Column(Integer)
     public = Column(Boolean, default=False)
     default_prompt = Column(Text)
-    creator = Column(Integer, ForeignKey("users.id"))
+    owner = Column(Integer, ForeignKey("users.id"))
     users = relationship('UserDatabase', secondary=users_projects, back_populates='projects')
     entrances = relationship("RouterEntrancesDatabase", back_populates="project")
 
@@ -109,4 +110,4 @@ class EmbeddingDatabase(Base):
     options = Column(Text)
     privacy = Column(String(255))
     description = Column(Text)
-    dimension = Column(Integer, default=1536)
+    dimension = Column(Integer, default=1536)