Merge pull request #28597 from nextcloud/backport/28262/stable21

artonge · web-flow · commit 5855b67ac5b1 · 2021-08-26T14:20:07.000+02:00
[stable21] 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
@@ -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();
 			}
 		}

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