fix(login): Support subfolder install for ephemeral sessions

Signed-off-by: Louis Chemineau <[email protected]>
nextcloud · Feb 27, 2025 · 68f86b3 · 68f86b3
1 parent 47bd75a
commit 68f86b3
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/private/Authentication/Login/FlowV2EphemeralSessionsCommand.php b/lib/private/Authentication/Login/FlowV2EphemeralSessionsCommand.php
@@ -10,15 +10,18 @@
 
 use OC\Core\Controller\ClientFlowLoginV2Controller;
 use OCP\ISession;
+use OCP\IURLGenerator;
 
 class FlowV2EphemeralSessionsCommand extends ALoginCommand {
 	public function __construct(
 		private ISession $session,
+		private IURLGenerator $urlGenerator,
 	) {
 	}
 
 	public function process(LoginData $loginData): LoginResult {
-		if (str_starts_with($loginData->getRedirectUrl() ?? '', '/login/v2/grant')) {
+		$loginV2GrantRoute = $this->urlGenerator->linkToRoute('core.ClientFlowLoginV2.grantPage');
+		if (str_starts_with($loginData->getRedirectUrl() ?? '', $loginV2GrantRoute)) {
 			$this->session->set(ClientFlowLoginV2Controller::EPHEMERAL_NAME, true);
 		}