[idp] Add email to ID token #17678
Merged
[idp] Add email to ID token #17678
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
easyCZ
reviewed
May 19, 2023
| Identities: []*protocol.Identity{ | ||
| nil, | ||
| {Deleted: true, PrimaryEmail: "nonsense@gitpod.io"}, | ||
| {PrimaryEmail: "correct@gitpod.io"}, |
There was a problem hiding this comment.
Suggested change
| {PrimaryEmail: "correct@gitpod.io"}, | |
| {Deleted: false, PrimaryEmail: "correct@gitpod.io"}, |
I know it's the default, but visually grepping the tests the symmetry makes it easier
easyCZ
reviewed
May 19, 2023
| @@ -79,6 +88,9 @@ func (srv *IdentityProviderService) GetIDToken(ctx context.Context, req *connect | |||
| userInfo := oidc.NewUserInfo() | |||
| userInfo.SetName(user.Name) | |||
| userInfo.SetSubject(subject) | |||
| if email != "" { | |||
There was a problem hiding this comment.
You could drop the if, it would set it to the empty string, which is the default value in the struct anyway - it's omitempty in the JSON struct
There was a problem hiding this comment.
Indeed. I like the explicitness of this code though :)
easyCZ
approved these changes
May 19, 2023
which is a valid claim because it's verified by the original IDP, and this is not the user-editable value.
roboquat
added
deployed: webapp
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR adds the
emailclaim to the ID tokens produced by the IDP feature.Related Issue(s)
Fixes #17530
How to test
see unit tests or
gp idp tokenDocumentation
Preview status
Gitpod was successfully deployed to your preview environment.
Build Options:
Run the build with werft instead of GHA
Run Leeway with
--dont-testPublish Options
Installer Options
Add desired feature flags to the end of the line above, space separated
Preview Environment Options:
If enabled this will build
install/previewIf enabled this will create the environment on GCE infra
Valid options are
all,workspace,webapp,ide,jetbrains,vscode,ssh/hold