From 41a3eca4f1f56080925ae27577d8785fa4c77d69 Mon Sep 17 00:00:00 2001 From: Nikos Date: Mon, 23 Sep 2024 11:49:26 +0300 Subject: [PATCH 1/2] fix: add device code grant_type to oidc metadata --- oauth2/.snapshots/TestHandlerWellKnown-hsm_enabled=false.json | 3 ++- oauth2/.snapshots/TestHandlerWellKnown-hsm_enabled=true.json | 3 ++- oauth2/handler.go | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/oauth2/.snapshots/TestHandlerWellKnown-hsm_enabled=false.json b/oauth2/.snapshots/TestHandlerWellKnown-hsm_enabled=false.json index 3ec9f69664d..6a7ca616431 100644 --- a/oauth2/.snapshots/TestHandlerWellKnown-hsm_enabled=false.json +++ b/oauth2/.snapshots/TestHandlerWellKnown-hsm_enabled=false.json @@ -43,7 +43,8 @@ "authorization_code", "implicit", "client_credentials", - "refresh_token" + "refresh_token", + "urn:ietf:params:oauth:grant-type:device_code" ], "id_token_signed_response_alg": [ "RS256" diff --git a/oauth2/.snapshots/TestHandlerWellKnown-hsm_enabled=true.json b/oauth2/.snapshots/TestHandlerWellKnown-hsm_enabled=true.json index 3ec9f69664d..6a7ca616431 100644 --- a/oauth2/.snapshots/TestHandlerWellKnown-hsm_enabled=true.json +++ b/oauth2/.snapshots/TestHandlerWellKnown-hsm_enabled=true.json @@ -43,7 +43,8 @@ "authorization_code", "implicit", "client_credentials", - "refresh_token" + "refresh_token", + "urn:ietf:params:oauth:grant-type:device_code" ], "id_token_signed_response_alg": [ "RS256" diff --git a/oauth2/handler.go b/oauth2/handler.go index 7c0d7e2504a..b999206f7f4 100644 --- a/oauth2/handler.go +++ b/oauth2/handler.go @@ -518,7 +518,7 @@ func (h *Handler) discoverOidcConfiguration(w http.ResponseWriter, r *http.Reque IDTokenSigningAlgValuesSupported: []string{key.Algorithm}, IDTokenSignedResponseAlg: []string{key.Algorithm}, UserinfoSignedResponseAlg: []string{key.Algorithm}, - GrantTypesSupported: []string{"authorization_code", "implicit", "client_credentials", "refresh_token"}, + GrantTypesSupported: []string{"authorization_code", "implicit", "client_credentials", "refresh_token", "urn:ietf:params:oauth:grant-type:device_code"}, ResponseModesSupported: []string{"query", "fragment"}, UserinfoSigningAlgValuesSupported: []string{"none", key.Algorithm}, RequestParameterSupported: true, From b09f3b9712f475a1e3714aed130581587acbc902 Mon Sep 17 00:00:00 2001 From: Nikos Date: Mon, 23 Sep 2024 11:53:35 +0300 Subject: [PATCH 2/2] fix: fix ci (REMOVE) --- test/conformance/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/conformance/start.sh b/test/conformance/start.sh index 65080fe2c02..09957271f64 100755 --- a/test/conformance/start.sh +++ b/test/conformance/start.sh @@ -4,4 +4,4 @@ set -euxo pipefail cd "$( dirname "${BASH_SOURCE[0]}" )/../.." # shellcheck disable=SC2086 -docker-compose -f quickstart.yml -f quickstart-postgres.yml -f test/conformance/docker-compose.yml up ${1:-} -d --force-recreate --build +docker compose -f quickstart.yml -f quickstart-postgres.yml -f test/conformance/docker-compose.yml up ${1:-} -d --force-recreate --build