Merge f577d10 into 5c87222

square · Nov 19, 2020 · bd0076d · bd0076d
2 parents 5c87222 + f577d10
commit bd0076d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/jwt/jwt.go b/jwt/jwt.go
@@ -137,8 +137,14 @@ func ParseSignedAndEncrypted(s string) (*NestedJSONWebToken, error) {
 }
 
 func tryJWKS(headers []jose.Header, key interface{}) interface{} {
-	jwks, ok := key.(*jose.JSONWebKeySet)
-	if !ok {
+	var jwks jose.JSONWebKeySet
+
+	switch jwksType := key.(type) {
+	case *jose.JSONWebKeySet:
+		jwks = *jwksType
+	case jose.JSONWebKeySet:
+		jwks = jwksType
+	default:
 		return key
 	}
 

diff --git a/jwt/jwt_test.go b/jwt/jwt_test.go
@@ -81,12 +81,19 @@ func TestDecodeTokenWithJWKS(t *testing.T) {
 	tok, err := ParseSigned(rsaSignedTokenWithKid)
 	if assert.NoError(t, err, "Error parsing signed token.") {
 		cl := make(map[string]interface{})
+		expected := map[string]interface{}{
+			"sub":    "subject",
+			"iss":    "issuer",
+			"scopes": []interface{}{"s1", "s2"},
+		}
+
 		if assert.NoError(t, tok.Claims(jwks, &cl)) {
-			assert.Equal(t, map[string]interface{}{
-				"sub":    "subject",
-				"iss":    "issuer",
-				"scopes": []interface{}{"s1", "s2"},
-			}, cl)
+			assert.Equal(t, expected, cl)
+		}
+
+		cl = make(map[string]interface{})
+		if assert.NoError(t, tok.Claims(*jwks, &cl)) {
+			assert.Equal(t, expected, cl)
 		}
 	}
 }