be/app/config.py

@@ -115,13 +115,13 @@ Organic Bananas
     # OAuth Settings
     GOOGLE_CLIENT_ID: str = ""
     GOOGLE_CLIENT_SECRET: str = ""
-    GOOGLE_REDIRECT_URI: str = "http://localhost:8000/api/v1/auth/google/callback"
+    GOOGLE_REDIRECT_URI: str = "http://localhost:8000/auth/google/callback"
     
     APPLE_CLIENT_ID: str = ""
     APPLE_TEAM_ID: str = ""
     APPLE_KEY_ID: str = ""
     APPLE_PRIVATE_KEY: str = ""
-    APPLE_REDIRECT_URI: str = "http://localhost:8000/api/v1/auth/apple/callback"
+    APPLE_REDIRECT_URI: str = "http://localhost:8000/auth/apple/callback"
 
     # Session Settings
     SESSION_SECRET_KEY: str = "your-session-secret-key"  # Change this in production

be/app/main.py

@@ -154,9 +154,6 @@ async def refresh_jwt_token(
         )
 
 # --- Include API Routers ---
-# Include OAuth routes first (no auth required)
-app.include_router(oauth_router, prefix="/auth", tags=["auth"])
-
 # Include FastAPI-Users routes
 app.include_router(
     fastapi_users.get_auth_router(auth_backend),
@@ -184,8 +181,14 @@ app.include_router(
     tags=["users"],
 )
 
+# Include OAuth routes
+# app.include_router(oauth_router, prefix="/auth", tags=["auth"])
+
 # Include your API router
 app.include_router(api_router, prefix=settings.API_PREFIX)
+
+# Include OAuth routes under the main API prefix
+app.include_router(oauth_router, prefix=f"{settings.API_PREFIX}/auth", tags=["auth"])
 # --- End Include API Routers ---
 
 # Health check endpoint

fe/src/components/SocialLoginButtons.vue

@@ -39,7 +39,7 @@ import { useRouter } from 'vue-router';
 const router = useRouter();
 
 const handleGoogleLogin = () => {
-    window.location.href = '/auth/google/login';
+    window.location.href = '/api/v1/auth/google/login';
 };
 
 const handleAppleLogin = () => {