feat: Refactor authenticate_user to accept only username and password, return a dictionary containing the session token and user email, and simplify the main login endpoint.

Signed-off-by: aviralgarg05 <gargaviral99@gmail.com>

Author: aviralgarg05

backend/src/dna/prodtrack_providers/prodtrack_provider_base.py

@@ -89,8 +89,8 @@ def get_versions_for_playlist(self, playlist_id: int) -> list["Version"]:
         raise NotImplementedError("Subclasses must implement this method.")
 
     @staticmethod
-    def authenticate_user(url: str, login: str, password: str) -> str:
-        """Authenticate a user and return a session token."""
+    def authenticate_user(username: str, password: str) -> dict[str, Any]:
+        """Authenticate a user and return a session token and user info."""
         raise NotImplementedError("Subclasses must implement this method.")
 
 

backend/src/dna/prodtrack_providers/shotgrid.py

@@ -578,37 +578,38 @@ def get_versions_for_playlist(self, playlist_id: int) -> list[Version]:
 
 
     @staticmethod
-    def authenticate_user(url: str, login: str, password: str) -> str:
-        """Authenticate a user with ShotGrid and return a session token.
+    def authenticate_user(username: str, password: str) -> dict[str, Any]:
+        """Authenticate a user with ShotGrid and return session token and user info.
 
         Args:
-            url: ShotGrid server URL
-            login: User login/username
+            username: User login/username
             password: User password
 
         Returns:
-            Session token string
+            Dictionary containing 'token' and 'email'
 
         Raises:
             ValueError: If authentication fails
         """
+        url = os.getenv("SHOTGRID_URL")
+        if not url:
+            raise ValueError("SHOTGRID_URL not configured")
+
         try:
-            # Shotgun.authenticate_human_user returns the user object, but we need the session_token.
-            # However, the standard way to get a token is to just create a connection which validates creds.
-            # But wait, Shotgun API structure specifically for auth:
-            # We can use the simple authentication helper or instantiate to get token.
-            # Actually, standard shotgun_api3 doesn't easily expose 'authenticate_human_user' to get a token string directly
-            # without internals.
-            # Let's instantiate a connection to verify and get session_token if available or standard auth flow.
-            # The pattern usually is: sg = Shotgun(url, login=login, password=password) then sg.get_session_token().
-            
-            # Note: shotgun_api3 v3.3.0+ supports `login` and `password` in constructor for script-based auth,
-            # but for human user relying on session token:
-            
-            sg = Shotgun(url, login=login, password=password)
-            # This establishes connection. Now implementation detail: how to get the token?
-            # The 'get_session_token()' method provides it.
-            return sg.get_session_token()
+            # Initialize connection to verify credentials and get token
+            sg = Shotgun(url, login=username, password=password)
+            token = sg.get_session_token()
+
+            # Create a provider instance with the new token to fetch user details
+            # This reuses the existing entity mapping logic
+            provider = ShotgridProvider(url=url, session_token=token)
+            user = provider.get_user_by_login(username)
+
+            if not user.email:
+                raise ValueError("User has no email address configured")
+
+            return {"token": token, "email": user.email}
+
         except Exception as e:
             raise ValueError(f"Authentication failed: {str(e)}")
 

backend/src/main.py

@@ -1,6 +1,6 @@
 """FastAPI application entry point."""
 
-from functools import lru_cache
+
 from typing import Annotated, cast
 
 from fastapi import Depends, FastAPI, HTTPException, Header
@@ -173,29 +173,7 @@ def get_prodtrack_provider_dep(
 async def login(request: LoginRequest):
     """Login to ShotGrid."""
     try:
-        # We need a provider instance to access the static method if we want to keep it clean,
-        # or just import the class. We imported ShotgridProvider above.
-        # But we need the URL from the environment or default provider.
-        # Let's instantiate a default provider to get config, or just use the class method
-        # and assume env vars are set for URL if not passed?
-        # The static method requires URL.
-        
-        # Helper to get base URL
-        import os
-        url = os.getenv("SHOTGRID_URL")
-        if not url:
-             raise HTTPException(status_code=500, detail="SHOTGRID_URL not configured")
-
-        token = ShotgridProvider.authenticate_user(url, request.username, request.password)
-        
-        # Create a provider with this token to fetch the user details (email)
-        provider = ShotgridProvider(url=url, session_token=token)
-        user = provider.get_user_by_login(request.username)
-        
-        if not user.email:
-             raise HTTPException(status_code=400, detail="User has no email address configured")
-
-        return {"token": token, "email": user.email}
+        return ShotgridProvider.authenticate_user(request.username, request.password)
     except ValueError as e:
         raise HTTPException(status_code=401, detail=str(e))