Switch webauthn_credentials.any? and .present? to be webauthn_enabled? #3867
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
Codecov Report
@@ Coverage Diff @@
## master #3867 +/- ##
=======================================
Coverage 98.79% 98.79%
=======================================
Files 215 215
Lines 5372 5372
=======================================
Hits 5307 5307
Misses 65 65
|
jenshenny
approved these changes
Jun 16, 2023
| @@ -26,7 +26,7 @@ def no_mfa_devices? | |||
| end | |||
|
|
|||
| def mfa_gem_signin_authorized?(otp) | |||
| return true unless strong_mfa_level? || webauthn_credentials.present? | |||
| return true unless strong_mfa_level? || webauthn_enabled? | |||
There was a problem hiding this comment.
Suggested change
| return true unless strong_mfa_level? || webauthn_enabled? | |
| return true unless strong_mfa_level? |
This can be removed once the rake task to migrate all webauthn only users is run.
Comment on lines
+12
to
15
| if webauthn_enabled? && mfa_disabled? | ||
| self.mfa_level = :ui_and_gem_signin | ||
| save!(validate: false) | ||
| end |
There was a problem hiding this comment.
This can also be removed once the rake task is run.
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.
What problem are you solving?
user.webauthn_credentials.any?anduser.webauthn_credentials.present?were used to detect if any webauthn credentials are present. But, there is a method,webauthn_enabled?that we can now use. The different patterns used to detect if there are webauthn credentials is inconsistent.Further, prior to decoupling, we used
@user.mfa_enabled? || @user.webauthn_credentials.any?(orpresent?) to represent if MFA is enabled. Now that@user.mfa_enabled?encompasses both totp and webauthn devices, the|| @user.webauthn_credentials.any?should be removed.Contributes to #3800
What approach did you choose and why?
Removes instances of
.present?and.any?and replaces withwebauthn_enabled?where needed. Also remove the now unnecessary or-ing to check if mfa is enabled.