Skip to content

refactor: align struct fields with OpenID Connect specification #470

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

Open
HuckOps wants to merge 1 commit into
base: v3
Choose a base branch
from
Open

refactor: align struct fields with OpenID Connect specification #470

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
14 changes: 14 additions & 0 deletions oidc/oidc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,10 @@ type UserInfo struct {
Profile string `json:"profile"`
Email string `json:"email"`
EmailVerified bool `json:"email_verified"`
Name string `json:"name"`
Picture string `json:"picture"`
GivenName string `json:"given_name"`
FamilyName string `json:"family_name"`

claims []byte
}
Expand All @@ -337,6 +341,12 @@ type userInfoRaw struct {
// https://forums.aws.amazon.com/thread.jspa?messageID=949441&#949441 and
// https://discuss.elastic.co/t/openid-error-after-authenticating-against-aws-cognito/206018/11
EmailVerified stringAsBool `json:"email_verified"`
// Align the fields in the OpenID example
//https://openid.net/specs/openid-connect-core-1_0.html#UserInfoResponse
Name string `json:"name"`
Picture string `json:"picture"`
GivenName string `json:"given_name"`
FamilyName string `json:"family_name"`
}

// Claims unmarshals the raw JSON object claims into the provided object.
Expand Down Expand Up @@ -397,6 +407,10 @@ func (p *Provider) UserInfo(ctx context.Context, tokenSource oauth2.TokenSource)
Email: userInfo.Email,
EmailVerified: bool(userInfo.EmailVerified),
claims: body,
Name: userInfo.Name,
Picture: userInfo.Picture,
GivenName: userInfo.GivenName,
FamilyName: userInfo.FamilyName,
}, nil
}

Expand Down