Merge pull request #28085 from nextcloud/backport/28078/stable22

[stable22] Improve provider check
This commit is contained in:
Lukas Reschke 2021-07-21 21:45:43 +02:00 committed by GitHub
commit 9305eaac55
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -100,7 +100,11 @@ class TwoFactorMiddleware extends Middleware {
if ($controller instanceof ALoginSetupController
&& $this->userSession->getUser() !== null
&& $this->twoFactorManager->needsSecondFactor($this->userSession->getUser())) {
return;
$providers = $this->twoFactorManager->getProviderSet($this->userSession->getUser());
if ($providers->getProviders() === [] && !$providers->isProviderMissing()) {
return;
}
}
if ($controller instanceof LoginController && $methodName === 'logout') {