From b24c4f02e84af2e372148caa53ba949c520c5d16 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 25 Aug 2025 10:39:17 +0200
Subject: [PATCH] fix(2fa): Fix 2FA session setup when ephemeral session is
 used

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .../Middleware/FlowV2EphemeralSessionsMiddleware.php          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/private/AppFramework/Middleware/FlowV2EphemeralSessionsMiddleware.php b/lib/private/AppFramework/Middleware/FlowV2EphemeralSessionsMiddleware.php
index 2404285b2d421..79c7148d67d80 100644
--- a/lib/private/AppFramework/Middleware/FlowV2EphemeralSessionsMiddleware.php
+++ b/lib/private/AppFramework/Middleware/FlowV2EphemeralSessionsMiddleware.php
@@ -11,6 +11,7 @@
 use OC\Core\Controller\ClientFlowLoginV2Controller;
 use OC\Core\Controller\TwoFactorChallengeController;
 use OCP\AppFramework\Middleware;
+use OCP\Authentication\TwoFactorAuth\ALoginSetupController;
 use OCP\ISession;
 use OCP\IUserSession;
 
@@ -36,7 +37,8 @@ public function beforeController($controller, $methodName) {
 			return;
 		}
 
-		if ($controller instanceof TwoFactorChallengeController) {
+		if ($controller instanceof TwoFactorChallengeController
+			|| $controller instanceof ALoginSetupController) {
 			return;
 		}