enhance: support multiple auth providers #1720
Merged
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
Signed-off-by: Grant Linville <[email protected]>
g-linville
requested review from
drpebcak,
thedadams,
ivyjeong13,
njhale,
StrongMonkey,
iwilltry42 and
ryanhopperlowe
g-linville
commented
Feb 11, 2025
| @@ -63,7 +63,7 @@ func ensureIdentity(tx *gorm.DB, id *types.Identity, timezone string, role types | |||
| if user.ID != 0 { | |||
| userQuery = userQuery.Where("id = ?", user.ID) | |||
| } else { | |||
| userQuery = userQuery.Where("username = ?", user.Username) | |||
| userQuery = userQuery.Where("email = ?", user.Email) | |||
There was a problem hiding this comment.
Surprisingly, this is the only backend change that was necessary to reconcile identities from different auth providers down to the same user.
njhale
approved these changes
Feb 11, 2025
thedadams
approved these changes
Feb 12, 2025
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.
for #1719
This makes it so that a new identity will be mapped to an existing user, if the existing user has the same email address as the new identity. Previously we were doing this based on username, but while usernames in GitHub can be set by the user, the username in Google is just a random number, so this doesn't work.
I also removed the restrictions (in both the frontend and the backend) that prevent you from configuring more than one auth provider at once.
Google and GitHub both require you to verify that you have access to the email for your account, so this implementation is secure. It is important that future auth providers that we add also adhere to this constraint, and do not allow you to have an email address that you don't really own.