fix(login): Support subfolder install for ephemeral sessions

Signed-off-by: Louis Chemineau <louis@chmn.me>
nextcloud · Mar 3, 2025 · 2551cc7 · 2551cc7
1 parent 90363d2
commit 2551cc7
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,20 +10,23 @@
 
 use OC\Core\Controller\ClientFlowLoginV2Controller;
 use OCP\ISession;
+use OCP\IURLGenerator;
 
 class FlowV2EphemeralSessionsCommand extends ALoginCommand {
 	private ISession $session;
 	private IURLGenerator $urlGenerator;
 
 	public function __construct(
 		ISession $session,
+		IURLGenerator $urlGenerator
 	) {
 		$this->session = $session;
 		$this->urlGenerator = $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);
 		}