From 6c465099a2e3e366b88a0d0577d8d3235ab9bf6e Mon Sep 17 00:00:00 2001 From: wcater803 <96142740+wcater803@users.noreply.github.com> Date: Tue, 25 Feb 2025 07:52:27 -0500 Subject: [PATCH] Hardcoded Keycloak paths (#577) --- .pre-commit-config.yaml | 2 +- backend/ibutsu_server/util/keycloak.py | 3 +-- frontend/src/services/keycloak.js | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6f78bd91..0c82efe1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,7 +11,7 @@ repos: - id: debug-statements - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.9.6 + rev: v0.9.7 hooks: - id: ruff args: diff --git a/backend/ibutsu_server/util/keycloak.py b/backend/ibutsu_server/util/keycloak.py index ee30316c..421de094 100644 --- a/backend/ibutsu_server/util/keycloak.py +++ b/backend/ibutsu_server/util/keycloak.py @@ -26,8 +26,7 @@ def get_keycloak_config(is_private=False): "authorization_url": build_url(realm_base_url, "protocol/openid-connect/auth"), "realm": realm, "client_id": current_app.config.get("KEYCLOAK_CLIENT_ID"), - "redirect_uri": backend_url - + current_app.config.get("KEYCLOAK_AUTH_PATH", "/login/auth/keycloak"), + "redirect_uri": backend_url + "/login/keycloak", } if current_app.config.get("KEYCLOAK_ICON"): config["icon"] = current_app.config["KEYCLOAK_ICON"] diff --git a/frontend/src/services/keycloak.js b/frontend/src/services/keycloak.js index b57c4d20..3f52876c 100644 --- a/frontend/src/services/keycloak.js +++ b/frontend/src/services/keycloak.js @@ -6,6 +6,6 @@ export class KeycloakService { static login(url, realm, client_id) { const keycloakInstance = new Keycloak({url: url, realm: realm, clientId: client_id}); keycloakInstance.init({onLoad: 'login-required', checkLoginIframe: false, responseMode: 'query', - redirectUri: Settings.serverUrl + (Settings.keycloakAuthPath || '/login/auth/keycloak') }); + redirectUri: Settings.serverUrl + '/login/keycloak' }); } }