Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support adding new aud values #828

Closed
wants to merge 1 commit into from
Closed

feat: support adding new aud values #828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions token/jwt/claims_id_token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,29 @@ func (c *IDTokenClaims) ToMap() map[string]interface{} {
ret["jti"] = uuid.New().String()
}

if _, ok := ret["aud"].([]string); !ok {
if _, ok := ret["aud"].(string); ok {
ret["aud"] = []string{ret["aud"].(string)}
} else {
ret["aud"] = []string{}
}
}

if len(c.Audience) > 0 {
ret["aud"] = c.Audience
} else {
ret["aud"] = []string{}
newAuds := []string{}
m := map[string]struct{}{}
for _, a := range c.Audience {
m[a] = struct{}{}
newAuds = append(newAuds, a)
}

var extraAud = ret["aud"].([]string)
for _, aud := range extraAud {
if _, ok := m[aud]; !ok {
newAuds = append(newAuds, aud)
}
}
ret["aud"] = newAuds
}

if !c.IssuedAt.IsZero() {
Expand Down
50 changes: 50 additions & 0 deletions token/jwt/claims_id_token_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,53 @@ func TestIDTokenClaimsToMap(t *testing.T) {
"nonce": idTokenClaims.Nonce,
}, idTokenClaims.ToMap())
}

func TestIDTokenClaimsToMap_new_aud(t *testing.T) {
// extra & overlap
IDClaims := &IDTokenClaims{
JTI: "foo-id",
Audience: []string{"default"},
Extra: map[string]any{
"aud": []string{"default", "new"},
},
}
assert.Equal(t, map[string]any{
"jti": "foo-id",
"aud": []string{"default", "new"},
}, IDClaims.ToMap())

// extra & no original values
IDClaims = &IDTokenClaims{
JTI: "foo-id",
Extra: map[string]any{
"aud": []string{"default", "new"},
},
}
assert.Equal(t, map[string]any{
"jti": "foo-id",
"aud": []string{"default", "new"},
}, IDClaims.ToMap())

// only original values
IDClaims = &IDTokenClaims{
JTI: "foo-id",
Audience: []string{"default"},
}
assert.Equal(t, map[string]any{
"jti": "foo-id",
"aud": []string{"default"},
}, IDClaims.ToMap())

// extra value is an string
IDClaims = &IDTokenClaims{
JTI: "foo-id",
Audience: []string{"default"},
Extra: map[string]any{
"aud": "new",
},
}
assert.Equal(t, map[string]any{
"jti": "foo-id",
"aud": []string{"default", "new"},
}, IDClaims.ToMap())
}
Loading