From ff93606e4c9df60b28ddaefc893586b18b518976 Mon Sep 17 00:00:00 2001 From: Chen Wang Date: Thu, 4 Apr 2024 09:08:27 -0500 Subject: [PATCH] 981 clowder2 register link on the topbar doesnt work (#988) * missing redirect uri * fix redirect uri * have to explicitly spell redirect uri --- backend/app/config.py | 2 +- .../charts/clowder2/templates/backend/deployment.yaml | 2 +- docker-compose.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/app/config.py b/backend/app/config.py index 8603e1ced..f53265a19 100644 --- a/backend/app/config.py +++ b/backend/app/config.py @@ -49,7 +49,7 @@ class Settings(BaseSettings): # scope=openid email&redirect_uri=http:///&kc_locale= auth_register_url = ( f"{auth_base}/keycloak/realms/{auth_realm}/protocol/openid-connect/registrations?client_id" - f"={auth_client_id}&response_type=code" + f"={auth_client_id}&response_type=code&redirect_uri={auth_redirect_uri}" ) auth_token_url = ( f"{auth_base}/keycloak/realms/{auth_realm}/protocol/openid-connect/token" diff --git a/deployments/kubernetes/charts/clowder2/templates/backend/deployment.yaml b/deployments/kubernetes/charts/clowder2/templates/backend/deployment.yaml index 27a94324d..b4d0a7bfb 100644 --- a/deployments/kubernetes/charts/clowder2/templates/backend/deployment.yaml +++ b/deployments/kubernetes/charts/clowder2/templates/backend/deployment.yaml @@ -75,7 +75,7 @@ spec: - name: oauth2_scheme_auth_url value: http://{{ include "clowder2.name" .}}-keycloak-headless:8080/keycloak/realms/clowder/protocol/openid-connect/auth?client_id=clowder2-backend&response_type=code - name: auth_register_url - value: $(CLOWDER2_URL)/keycloak/realms/clowder/protocol/openid-connect/registrations?client_id=clowder2-backend&response_type=code + value: $(CLOWDER2_URL)/keycloak/realms/clowder/protocol/openid-connect/registrations?client_id=clowder2-backend&response_type=code&redirect_uri=$(auth_redirect_uri) - name: auth_token_url value: http://{{ include "clowder2.name" .}}-keycloak-headless:8080/keycloak/realms/clowder/protocol/openid-connect/token - name: auth_server_url diff --git a/docker-compose.yml b/docker-compose.yml index 1540ebe4c..480ea0110 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -58,7 +58,7 @@ services: auth_redirect_uri: http://localhost:80/api/v2/auth auth_url: http://localhost/keycloak/realms/clowder/protocol/openid-connect/auth?client_id=clowder2-backend&response_type=code oauth2_scheme_auth_url: http://keycloak:8080/keycloak/realms/clowder/protocol/openid-connect/auth?client_id=clowder2-backend&response_type=code - auth_register_url: http://localhost/keycloak/realms/clowder/protocol/openid-connect/registrations?client_id=clowder2-backend&response_type=code + auth_register_url: http://localhost/keycloak/realms/clowder/protocol/openid-connect/registrations?client_id=clowder2-backend&response_type=code&redirect_uri=http://localhost:80/api/v2/auth auth_token_url: http://keycloak:8080/keycloak/realms/clowder/protocol/openid-connect/token auth_server_url: http://keycloak:8080/keycloak/ keycloak_base: http://localhost/api