fix: use BASE_URL config for redirect_url if available (#6995)

Co-authored-by: Michael Genson <genson.michael@gmail.com>

mealie/core/settings/settings.py

@@ -110,6 +110,11 @@ class AppSettings(AppLoggingSettings):
     BASE_URL: str = "http://localhost:8080"
     """trailing slashes are trimmed (ex. `http://localhost:8080/` becomes ``http://localhost:8080`)"""
 
+    @property
+    def is_default_base_url(self) -> bool:
+        """Returns True if BASE_URL has not been changed from the default."""
+        return self.BASE_URL == "http://localhost:8080"
+
     STATIC_FILES: str = str(PACKAGE_DIR / "frontend")
     """path to static files directory (ex. `mealie/dist`)"""
 

mealie/routes/auth/auth.py

@@ -99,7 +99,12 @@ async def oauth_login(request: Request):
         # in development, we want to redirect to the frontend
         redirect_url = "http://localhost:3000/login"
     else:
-        redirect_url = URLPath("/login").make_absolute_url(request.base_url)
+        # Prioritize User Configuration over Request Headers.
+        if not settings.is_default_base_url:
+            base = settings.BASE_URL or request.base_url
+        else:
+            base = request.base_url
+        redirect_url = URLPath("/login").make_absolute_url(base)
 
     response: RedirectResponse = await client.authorize_redirect(request, redirect_url)
     return response

tests/e2e/docker/docker-compose.yml

@@ -27,6 +27,7 @@ services:
     network_mode: host
     environment:
       ALLOW_SIGNUP: True
+      BASE_URL: http://localhost:9000
       DB_ENGINE: sqlite
 
       OIDC_AUTH_ENABLED: True