Merge pull request #30251 from nextcloud/backport/30193/stable21

MichaIng · web-flow · commit a45a9bf860f8 · 2021-12-20T18:42:40.000+01:00
[stable21] Fix setting up 2FA when no providers are set up but backup codes
diff --git a/core/Middleware/TwoFactorMiddleware.php b/core/Middleware/TwoFactorMiddleware.php
@@ -110,7 +110,7 @@ public function beforeController($controller, $methodName) {
 			&& $this->twoFactorManager->needsSecondFactor($this->userSession->getUser())) {
 			$providers = $this->twoFactorManager->getProviderSet($this->userSession->getUser());
 
-			if ($providers->getProviders() === [] && !$providers->isProviderMissing()) {
+			if ($providers->getPrimaryProviders() === [] && !$providers->isProviderMissing()) {
 				return;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public function beforeController($controller, $methodName) {`
`110`	`110`	`&& $this->twoFactorManager->needsSecondFactor($this->userSession->getUser())) {`
`111`	`111`	`$providers = $this->twoFactorManager->getProviderSet($this->userSession->getUser());`
`112`	`112`
`113`		`- if ($providers->getProviders() === [] && !$providers->isProviderMissing()) {`
	`113`	`+ if ($providers->getPrimaryProviders() === [] && !$providers->isProviderMissing()) {`
`114`	`114`	`return;`
`115`	`115`	`}`
`116`	`116`	`}`