Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] 2FA by Email setting showing for the user even when disabled by the admin #18473

Merged
merged 1 commit into from
Aug 18, 2020

Conversation

rodrigok
Copy link
Member

@rodrigok rodrigok commented Aug 4, 2020

Proposed changes

Hide the option to enable/disable the 2FA by Email for the user when disabled in the admin area.

Issue(s)

Closes #17755

How to test or reproduce

Screenshots

Types of changes

  • Bugfix (non-breaking change which fixes an issue)
  • Improvement (non-breaking change which improves a current function)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Hotfix (a major bugfix that has to be merged asap)
  • Documentation Update (if none of the other choices apply)

Checklist

  • I have read the CONTRIBUTING doc
  • I have signed the CLA
  • Lint and unit tests pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works (if applicable)
  • I have added necessary documentation (if applicable)
  • Any dependent changes have been merged and published in downstream modules

Changelog

The option to disable/enable the Two-factor authentication via Email at Account > Security > Two Factor Authentication was visible even when the setting Enable Two Factor Authentication via Email at Admin > Accounts > Two Factor Authentication was disabled leading to misbehavior since the functionality was disabled.

Further comments

@rodrigok rodrigok added this to the 3.6.0 milestone Aug 4, 2020
@rodrigok rodrigok requested a review from ggazzo August 4, 2020 11:57
@ggazzo ggazzo merged commit 01aeba7 into develop Aug 18, 2020
@rodrigok rodrigok deleted the fix/2fa-email-setting-showing-when-disabled branch August 20, 2020 15:08
@sampaiodiego sampaiodiego mentioned this pull request Aug 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Disable 2FA settings on user level when overridden by server-wide setting
2 participants