Skip to content

[stable20] Fix setting up 2FA providers when 2FA is enforced and bc are generated #28598

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.

Sign up for GitHub

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

Merged
artonge merged 1 commit into from
Aug 26, 2021
Merged

[stable20] Fix setting up 2FA providers when 2FA is enforced and bc are generated #28598

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix setting up 2FA providers when 2FA is enforced and bc are generated 
When a user has backup codes generated and got their 2FA enforced then
they should be able to set up TOTP and similar providers during the
login.

Signed-off-by: Christoph Wurst <[email protected]>
  • Loading branch information
@ChristophWurst @backportbot
ChristophWurst authored and backportbot[bot] committed Aug 25, 2021
commit c2d175a7106a9239bcdfc74879498b753b6ef449
2 changes: 1 addition & 1 deletion core/Middleware/TwoFactorMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public function beforeController($controller, $methodName) {
&& !$this->reflector->hasAnnotation('TwoFactorSetUpDoneRequired')) {
$providers = $this->twoFactorManager->getProviderSet($this->userSession->getUser());

if (!($providers->getProviders() === [] && !$providers->isProviderMissing())) {
if (!($providers->getPrimaryProviders() === [] && !$providers->isProviderMissing())) {
throw new TwoFactorAuthRequiredException();
}
}
Expand Down