From 007b181bdfc550d6d954d546111a6cf37a2ca36f Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 4 Oct 2021 09:54:58 +0200
Subject: Allow "TwoFactor Nextcloud Notifications" to pull the state of the
 2FA again

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 core/Middleware/TwoFactorMiddleware.php | 6 ++++++
 psalm.xml                               | 1 +
 2 files changed, 7 insertions(+)

diff --git a/core/Middleware/TwoFactorMiddleware.php b/core/Middleware/TwoFactorMiddleware.php
index d5a8a2f877a..c0e01cbe033 100644
--- a/core/Middleware/TwoFactorMiddleware.php
+++ b/core/Middleware/TwoFactorMiddleware.php
@@ -32,6 +32,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;
@@ -83,6 +84,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')) {
diff --git a/psalm.xml b/psalm.xml
index d51dbb9dde6..a075ceb24a7 100644
--- a/psalm.xml
+++ b/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>
-- 
cgit v1.2.3