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

chore: allow explicit configuration of api base url

Browse source
This commit is contained in:
Paul Bienkowski 2021-12-03 17:54:26 +01:00
parent 09fe1a7ac0
commit 69e8591fae
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
api/config.dev.py
View file

@ -8,6 +8,7 @@ KEYCLOAK_URL = "http://keycloak:8080/auth/realms/obs-dev/"
KEYCLOAK_CLIENT_ID = "portal" 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
API_URL = "http://localhost:3000/"
FRONTEND_URL = "http://localhost:3001/" FRONTEND_URL = "http://localhost:3001/"
FRONTEND_HTTPS = False FRONTEND_HTTPS = False
FRONTEND_DIR = None FRONTEND_DIR = None

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

@ -117,9 +117,17 @@ async def inject_urls(req):
else: else:
req.ctx.frontend_scheme = req.scheme req.ctx.frontend_scheme = req.scheme
req.ctx.api_scheme = req.ctx.frontend_scheme # just use the same for now if req.app.config.get("API_URL"):
req.ctx.api_base_path = remove_right(req.server_path, req.path) req.ctx.api_url = req.app.config.API_URL.rstrip("/")
req.ctx.api_url = f"{req.ctx.frontend_scheme}://{req.host}{req.ctx.api_base_path}" api_url_parsed = urlparse(req.ctx.api_url)
req.ctx.api_scheme = api_url_parsed.scheme # just use the same for now
req.ctx.api_base_path = api_url_parsed.path
else:
req.ctx.api_scheme = req.ctx.frontend_scheme # just use the same for now
req.ctx.api_base_path = remove_right(req.server_path, req.path)
req.ctx.api_url = (
f"{req.ctx.frontend_scheme}://{req.host}{req.ctx.api_base_path}"
)
if req.app.config.FRONTEND_URL: if req.app.config.FRONTEND_URL:
req.ctx.frontend_base_path = "/" + urlparse( req.ctx.frontend_base_path = "/" + urlparse(