Merge pull request #29 from canonical/IAM-1050

fix: Add device code grant_type to oidc metadata
canonical · Sep 23, 2024 · b886b87 · b886b87
2 parents 327febe + b09f3b9
commit b886b87
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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,

diff --git 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