Added logic for different keycloak auth paths (#567)

* Added logic for different keycloak auth paths * Modified code with suggestions * Fixed linting issues Hardcoded Keycloak paths Removed /auth from server_url Linting changes Hardcoded Keycloak paths (#577) Added debug for frontend login
ibutsu · Feb 27, 2025 · cd4df1b · cd4df1b
1 parent 7214327
commit cd4df1b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git 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.8.2
+  rev: v0.9.7
   hooks:
     - id: ruff
       args:

diff --git a/backend/ibutsu_server/constants.py b/backend/ibutsu_server/constants.py
@@ -118,7 +118,7 @@
         "params": [
             {
                 "name": "filters",
-                "description": "The filters for the runs to be included" " in the query.",
+                "description": "The filters for the runs to be included in the query.",
                 "type": "string",
                 "required": True,
             },

diff --git a/backend/ibutsu_server/util/keycloak.py b/backend/ibutsu_server/util/keycloak.py
@@ -17,10 +17,11 @@ def get_keycloak_config(is_private=False):
     if not backend_url.endswith("/api"):
         backend_url += "/api"
     server_url = current_app.config["KEYCLOAK_BASE_URL"]
-    if not server_url.endswith("auth"):
-        server_url = build_url(server_url, "auth")
+    # if not server_url.endswith("auth"):
+    #    server_url = build_url(server_url, "auth")
     realm = current_app.config.get("KEYCLOAK_REALM")
     realm_base_url = build_url(server_url, "realms", realm)
+    print("Checking server_url:", server_url)
     config = {
         "server_url": server_url,
         "authorization_url": build_url(realm_base_url, "protocol/openid-connect/auth"),

diff --git 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 + '/login/auth/keycloak'});
+       redirectUri: Settings.serverUrl + '/login/auth/keycloak' });
   }
 }