Merge pull request #459 from MODSetter/dev

feat: add BACKEND_URL configuration for OAuth redirect

Author: MODSetter

surfsense_backend/app/app.py

@@ -68,6 +68,14 @@ def registration_allowed():
     app.include_router(
         fastapi_users.get_oauth_router(
             google_oauth_client, auth_backend, SECRET, is_verified_by_default=True
+        )
+        if not config.BACKEND_URL
+        else fastapi_users.get_oauth_router(
+            google_oauth_client,
+            auth_backend,
+            SECRET,
+            is_verified_by_default=True,
+            redirect_url=f"{config.BACKEND_URL}/auth/google/callback",
         ),
         prefix="/auth/google",
         tags=["auth"],

surfsense_backend/app/config/__init__.py

@@ -97,6 +97,8 @@ class Config:
     DATABASE_URL = os.getenv("DATABASE_URL")
 
     NEXT_FRONTEND_URL = os.getenv("NEXT_FRONTEND_URL")
+    # Backend URL to override the http to https in the OAuth redirect URI
+    BACKEND_URL = os.getenv("BACKEND_URL")
 
     # Auth
     AUTH_TYPE = os.getenv("AUTH_TYPE")