Browse Source

Allow "TwoFactor Nextcloud Notifications" to pull the state of the 2FA again

Signed-off-by: Joas Schilling <coding@schilljs.com>
pull/29056/head
Joas Schilling 4 years ago
parent
commit
3710eca104
No known key found for this signature in database GPG Key ID: 7076EA9751AACDDA
  1. 6
      core/Middleware/TwoFactorMiddleware.php
  2. 1
      psalm.xml

6
core/Middleware/TwoFactorMiddleware.php

@ -31,6 +31,7 @@ use OC\Authentication\TwoFactorAuth\Manager;
use OC\Core\Controller\LoginController;
use OC\Core\Controller\TwoFactorChallengeController;
use OC\User\Session;
use OCA\TwoFactorNextcloudNotification\Controller\APIController;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\RedirectResponse;
use OCP\AppFramework\Middleware;
@ -82,6 +83,11 @@ class TwoFactorMiddleware extends Middleware {
* @param string $methodName
*/
public function beforeController($controller, $methodName) {
if ($controller instanceof APIController && $methodName === 'poll') {
// Allow polling the twofactor nextcloud notifications state
return;
}
if ($controller instanceof TwoFactorChallengeController
&& $this->userSession->getUser() !== null
&& !$this->reflector->hasAnnotation('TwoFactorSetUpDoneRequired')) {

1
psalm.xml

@ -80,6 +80,7 @@
<UndefinedClass>
<errorLevel type="suppress">
<referencedClass name="OCA\GroupFolders\Mount\GroupFolderStorage"/>
<referencedClass name="OCA\TwoFactorNextcloudNotification\Controller\APIController"/>
</errorLevel>
</UndefinedClass>
<UndefinedFunction>

Loading…
Cancel
Save