Compare commits

..

2 Commits

Author SHA1 Message Date
mo
e124f05e7b Merge pull request 'Update OAuth redirect URIs and API routing structure' (#48) from ph4 into prod
Reviewed-on: #48
2025-06-01 22:43:17 +02:00
mohamad
dda39532d6 Update OAuth redirect URIs and API routing structure
All checks were successful
Deploy to Production, build images and push to Gitea Registry / build_and_push (pull_request) Successful in 1m16s
- Changed the Google and Apple redirect URIs in the configuration to include the API version in the path.
- Reorganized the inclusion of OAuth routes in the main application to ensure they are properly prefixed and accessible.

These updates aim to enhance the API structure and ensure consistency in the authentication flow.
2025-06-01 22:43:02 +02:00
3 changed files with 6 additions and 9 deletions

View File

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

View File

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

View File

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