also avoid login redirect to user_oidc's single logout

Signed-off-by: Julien Veyssier <[email protected]>
nextcloud · Jan 16, 2024 · ec99f0c · ec99f0c
1 parent bba1392
commit ec99f0c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -100,7 +100,8 @@ private function registerRedirect(IRequest $request, IURLGenerator $urlGenerator
 			// To avoid login/logout loop if the IdP session is still alive:
 			// if the login page's redirect_url GET param is the logout page, just use the base URL instead
 			$logoutUrl = $urlGenerator->linkToRoute('core.login.logout');
-			if (strpos($redirectUrl, $logoutUrl) !== false) {
+			$userOidcLogoutUrl = $urlGenerator->linkToRoute(self::APP_ID . '.login.singleLogoutService');
+			if (strpos($redirectUrl, $logoutUrl) !== false || strpos($redirectUrl, $userOidcLogoutUrl) !== false) {
 				$redirectUrl = $urlGenerator->getBaseUrl();
 			}
 			$targetUrl = $urlGenerator->linkToRoute(self::APP_ID . '.login.login', [