FIX: Suggest current username for staged users #13706
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
If user had a staged account and logged in using a third party service a different username was suggested. This change will try to use the username given by the authentication provider first, then the current staged username and last suggest a new one.
eviltrout
approved these changes
Jul 12, 2021
| if email_valid && email.present? | ||
| if username.present? && User.username_available?(username, email) | ||
| suggested_username = username | ||
| elsif staged_user = User.where(staged: true).find_by_email(email) |
There was a problem hiding this comment.
I don't think we need this branch... it's already covered by the logic in User#username_available?
Line 282 in 2f5e63f
So I think the whole thing could be reduced to something like:
suggested_username = UserNameSuggester.suggest(username_suggester_attributes)
if email_valid && email.present? && username.present? && User.username_available?(username, email)
suggested_username = username
end
There was a problem hiding this comment.
I checked it, I think that we need that fallback in case the username is not provided by the authenticator
lis2
approved these changes
Jul 12, 2021
AndrewPrigorshnev
added a commit
that referenced
this pull request
Dec 16, 2021
…15320) Some time ago, we made this fix to external authentication – #13706. We didn't address Discourse Connect (https://meta.discourse.org/t/discourseconnect-official-single-sign-on-for-discourse-sso/13045) at that moment, so I wanted to fix it for Discourse Connect as well. Turned out though that Discourse Connect doesn't contain this problem and already handles staged users correctly. This PR adds tests that confirm it. Also, I've extracted two functions in Discourse Connect implementation along the way and decided to merge this refactoring too (the refactoring is supported with tests).
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.
If user had a staged account and logged in using a third party service
a different username was suggested. This change will try to use the
username given by the authentication provider first, then the current
staged username and last suggest a new one.