Fix detecting https for base url

eloravpn · Dec 20, 2024 · 6a63274 · 6a63274
1 parent ab8a197
commit 6a63274
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/src/__init__.py b/src/__init__.py
@@ -112,15 +112,9 @@ async def custom_config(request: Request):
         base_url = config.CUSTOM_BASE_URL
 
         if base_url is None:
-            # Get domain and port from request
-            domain = request.headers.get("host", "localhost:8000")
-            # Detect if request is using HTTPS
-            protocol = (
-                "https"
-                if request.headers.get("x-forwarded-proto") == "https"
-                else "http"
-            )
-            config_data["BASE_URL"] = f"{protocol}://{domain}/api/"
+            config_data["BASE_URL"] = str(request.base_url) + "api/"
+        else:
+            config_data["BASE_URL"] = base_url
 
         return JSONResponse(content=config_data)
     except json.JSONDecodeError: