pub-solar/obs-portal
5
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Allow forcing https for frontend config URLs

Browse source
This commit is contained in:
Paul Bienkowski 2021-11-25 00:11:21 +01:00
parent c90d4da97a
commit fe62af9d97
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
api/config.dev.py
View file

@ -9,6 +9,7 @@ KEYCLOAK_CLIENT_ID = "portal"
KEYCLOAK_CLIENT_SECRET = "c385278e-bd2e-4f13-9937-34b0c0f44c2d" KEYCLOAK_CLIENT_SECRET = "c385278e-bd2e-4f13-9937-34b0c0f44c2d"
DEDICATED_WORKER = True DEDICATED_WORKER = True
FRONTEND_URL = "http://localhost:3001/" FRONTEND_URL = "http://localhost:3001/"
FRONTEND_HTTPS = False
FRONTEND_DIR = None FRONTEND_DIR = None
FRONTEND_CONFIG = None FRONTEND_CONFIG = None
TILES_FILE = None # "/tiles/tiles.mbtiles" TILES_FILE = None # "/tiles/tiles.mbtiles"

1
api/config.py.example
View file

@ -26,6 +26,7 @@ DEDICATED_WORKER = True
# The root of the frontend. Needed for redirecting after login, and for CORS. # The root of the frontend. Needed for redirecting after login, and for CORS.
# Set to None if frontend is served by the API. # Set to None if frontend is served by the API.
FRONTEND_URL = None FRONTEND_URL = None
FRONTEND_HTTPS = True
# Where to find the compiled frontend assets (must include index.html), or None # Where to find the compiled frontend assets (must include index.html), or None
# to disable serving the frontend. # to disable serving the frontend.

5
api/obs/api/app.py
View file

@ -157,10 +157,11 @@ if INDEX_HTML and exists(INDEX_HTML):
@app.get("/config.json") @app.get("/config.json")
def get_frontend_config(req): def get_frontend_config(req):
base_path = req.server_path.replace("config.json", "") base_path = req.server_path.replace("config.json", "")
scheme = 'https' if req.app.config.FRONTEND_HTTPS else req.scheme
result = { result = {
**req.app.config.FRONTEND_CONFIG, **req.app.config.FRONTEND_CONFIG,
"apiUrl": f"{req.scheme}://{req.host}{base_path}api", "apiUrl": f"{scheme}://{req.host}{base_path}api",
"loginUrl": f"{req.scheme}://{req.host}{base_path}login", "loginUrl": f"{scheme}://{req.host}{base_path}login",
} }
print(req.app.config) print(req.app.config)
if req.app.config.get("TILES_FILE"): if req.app.config.get("TILES_FILE"):