Merge pull request #334 from mattmoyer/fix-test-e2e-full-integration-groups-assertion

Fix an issue in TestE2EFullIntegration groups assertions.
This commit is contained in:
Matt Moyer 2021-01-14 21:22:13 -06:00 committed by GitHub
commit 156e8d9df4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -292,14 +292,12 @@ func TestE2EFullIntegration(t *testing.T) {
require.NotNil(t, token) require.NotNil(t, token)
idTokenClaims := token.IDToken.Claims idTokenClaims := token.IDToken.Claims
username := idTokenClaims[oidc.DownstreamUsernameClaim].(string) require.Equal(t, env.SupervisorTestUpstream.Username, idTokenClaims[oidc.DownstreamUsernameClaim])
groups, _ := idTokenClaims[oidc.DownstreamGroupsClaim].([]string)
require.Equal(t, env.SupervisorTestUpstream.Username, username) // The groups claim in the file ends up as an []interface{}, so adjust our expectation to match.
if len(env.SupervisorTestUpstream.ExpectedGroups) == 0 { expectedGroups := make([]interface{}, 0, len(env.SupervisorTestUpstream.ExpectedGroups))
// We only put a groups claim in our downstream ID token if we got groups from the upstream. for _, g := range env.SupervisorTestUpstream.ExpectedGroups {
require.Nil(t, groups) expectedGroups = append(expectedGroups, g)
} else {
require.Equal(t, env.SupervisorTestUpstream.ExpectedGroups, groups)
} }
require.Equal(t, expectedGroups, idTokenClaims[oidc.DownstreamGroupsClaim])
} }