fix: try auth user to handle api keys

l3vels · Dec 12, 2023 · 9afa5bf · 9afa5bf
1 parent cd324f3
commit 9afa5bf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/apps/server/controllers/chat.py b/apps/server/controllers/chat.py
@@ -21,7 +21,7 @@
                           NegotiateOutput, UpdateChatInput)
 from typings.config import ConfigOutput
 from utils.auth import (authenticate, authenticate_by_token_or_api_key,
-                        try_auth_user)
+                        try_auth_user, try_auth_user_with_token_or_api_key)
 from utils.chat import (convert_chats_to_chat_list, convert_model_to_response,
                         get_chat_session_id)
 from utils.configuration import \
@@ -277,7 +277,7 @@ def create_chat_message(request: Request, response: Response, body: ChatMessageI
     Create new chat message
     """
     # authenticate
-    auth: UserAccount = try_auth_user(request, response)
+    auth: UserAccount = try_auth_user_with_token_or_api_key(request, response)
     return create_client_message(body, auth)
 
 

diff --git a/apps/server/utils/auth.py b/apps/server/utils/auth.py
@@ -87,6 +87,16 @@ def authenticate_by_auth_token(
         raise HTTPException(status_code=401, detail="Invalid auth token")
 
 
+def try_auth_user_with_token_or_api_key(
+    request: Request, response: Response
+) -> Tuple[UserOutput, AccountOutput]:
+    try:
+        return authenticate_by_token_or_api_key(request, response)
+    except Exception:
+        return None
+
+
+# TODO: reuse from authenticate_by_token_or_api_key and then remove try_auth_user_with_token_or_api_key
 def try_auth_user(
     request: Request, response: Response
 ) -> Tuple[UserOutput, AccountOutput]: