Skip to content

Commit a26a2a6

Browse files
authored
Merge pull request #28087 from nextcloud/backport/28078/stable20
[stable20] Improve provider check
2 parents ab28f29 + f5dd0f2 commit a26a2a6

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

core/Middleware/TwoFactorMiddleware.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,11 @@ public function beforeController($controller, $methodName) {
101101
if ($controller instanceof ALoginSetupController
102102
&& $this->userSession->getUser() !== null
103103
&& $this->twoFactorManager->needsSecondFactor($this->userSession->getUser())) {
104-
return;
104+
$providers = $this->twoFactorManager->getProviderSet($this->userSession->getUser());
105+
106+
if ($providers->getProviders() === [] && !$providers->isProviderMissing()) {
107+
return;
108+
}
105109
}
106110

107111
if ($controller instanceof LoginController && $methodName === 'logout') {

0 commit comments

Comments
 (0)