FND 1264 - restrict silent takeover scenarios #36716
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
bethanyaconnor
changed the title
|
Wondering if we should add a reset password link on this page directly, similar to what we have on the sign in page, |
| if allows_silent_takeover(user, auth_hash) | ||
| user = silent_takeover user, auth_hash | ||
| sign_in_user user | ||
| if email_already_taken(user) |
There was a problem hiding this comment.
won't this new conditional break the one below it?
code-dot-org/dashboard/app/controllers/omniauth_callbacks_controller.rb
Lines 193 to 197 in e921188
| lookup_user = User.find_by_email_or_hashed_email(oauth_user.email) | ||
| verified_email_credentials = AuthenticationOption::TRUSTED_EMAIL_CREDENTIAL_TYPES - [AuthenticationOption::EMAIL] | ||
|
|
||
| lookup_user = AuthenticationOption.where(credential_type: verified_email_credentials).find_by(hashed_email: User.hash_email(oauth_user.email))&.user || User.where(hashed_email: User.hash_email(oauth_user.email)).where(provider: verified_email_credentials).first |
There was a problem hiding this comment.
[i know this is a draft, so excuse the nit] we should break this into multiple lines for readability and so that we only need to look up the User once
maddiedierker
approved these changes
Sep 23, 2020
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.
See the JIRA ticket for more info.
This PR limits silent takeover cases to only when the the account being taken over already has a trusted authentication option.
In other cases, when a user tries to sign up, they'll see
Links
Testing story
Reviewer Checklist: