Update service/auth_service.py

service/auth_service.py

@@ -54,17 +54,23 @@ class AuthService:
             raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail=str(e))
 
     @staticmethod
-    def get_google_oauth_url():
+    def get_google_oauth_url(redirect_to: str = None):
         try:
-            # Step 1: Tell Supabase to redirect the user to our FASTAPI backend callback
-            redirect_url = f"{settings.API_URL}/auth/callback"
+            # Step 1: Tell Supabase where to redirect. 
+            # If the router passes a specific URL, use it. Otherwise, fall back to the default.
+            target_redirect = redirect_to if redirect_to else f"{settings.API_URL}/auth/callback"
+            
             response = supabase.auth.sign_in_with_oauth({
                 "provider": "google",
                 "options": {
-                    "redirect_to": redirect_url
+                    "redirect_to": target_redirect
                 }
             })
-            return {"url": response.url}
+            
+            # Since the router expects just the URL string (based on your auth_routes.py code),
+            # we should return just the string, not a dictionary.
+            return response.url
+            
         except Exception as e:
             logger.error("Failed to generate Google URL: %s", str(e))
             raise HTTPException(
@@ -77,10 +83,10 @@ class AuthService:
         try:
             # Step 2: Exchange the one-time code from Google for a valid Supabase session
             response = supabase.auth.exchange_code_for_session({"auth_code": auth_code})
-            
+
             if not response.session:
                 raise ValueError("No session returned from Supabase")
-                
+
             return response.session.access_token
         except Exception as e:
             logger.error("Code exchange failed: %s", str(e))