Merge pull request #28262 from nextcloud/fix/set-up-2fa-providers-enforced-with-backup-codes

kesselb · web-flow · commit 98ad69fec2f3 · 2021-08-25T14:36:54.000+02:00
Fix setting up 2FA providers when 2FA is enforced and bc are generated
diff --git a/core/Middleware/TwoFactorMiddleware.php b/core/Middleware/TwoFactorMiddleware.php
@@ -92,7 +92,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();
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public function beforeController($controller, $methodName) {`
`92`	`92`	`&& !$this->reflector->hasAnnotation('TwoFactorSetUpDoneRequired')) {`
`93`	`93`	`$providers = $this->twoFactorManager->getProviderSet($this->userSession->getUser());`
`94`	`94`
`95`		`- if (!($providers->getProviders() === [] && !$providers->isProviderMissing())) {`
	`95`	`+ if (!($providers->getPrimaryProviders() === [] && !$providers->isProviderMissing())) {`
`96`	`96`	`throw new TwoFactorAuthRequiredException();`
`97`	`97`	`}`
`98`	`98`	`}`