Merge pull request #63706 from nextcloud/backport/62235/stable32

[stable32] Improve logout url generation

Author: CarlSchwan

core/AppInfo/Application.php

@@ -98,5 +98,4 @@ public function register(IRegistrationContext $context): void {
 	public function boot(IBootContext $context): void {
 		// ...
 	}
-
 }

lib/private/NavigationManager.php

@@ -309,17 +309,15 @@ private function init(bool $resolveClosures = true): void {
 			}
 
 			$logoutUrl = \OC_User::getLogoutUrl($this->urlGenerator);
-			if ($logoutUrl !== '') {
-				// Logout
-				$this->add([
-					'type' => 'settings',
-					'id' => 'logout',
-					'order' => 99999,
-					'href' => $logoutUrl,
-					'name' => $l->t('Log out'),
-					'icon' => $this->urlGenerator->imagePath('core', 'actions/logout.svg'),
-				]);
-			}
+			// Logout
+			$this->add([
+				'type' => 'settings',
+				'id' => 'logout',
+				'order' => 99999,
+				'href' => $logoutUrl,
+				'name' => $l->t('Log out'),
+				'icon' => $this->urlGenerator->imagePath('core', 'actions/logout.svg'),
+			]);
 
 			if ($this->isSubadmin()) {
 				// User management

lib/private/legacy/OC_User.php

@@ -282,7 +282,7 @@ public static function isIncognitoMode() {
 	 * Returns the current logout URL valid for the currently logged-in user
 	 *
 	 * @param \OCP\IURLGenerator $urlGenerator
-	 * @return string
+	 * @return non-empty-string
 	 */
 	public static function getLogoutUrl(\OCP\IURLGenerator $urlGenerator) {
 		$backend = self::findFirstActiveUsedBackend();
@@ -294,7 +294,10 @@ public static function getLogoutUrl(\OCP\IURLGenerator $urlGenerator) {
 		if ($user instanceof IUser) {
 			$backend = $user->getBackend();
 			if ($backend instanceof \OCP\User\Backend\ICustomLogout) {
-				return $backend->getLogoutUrl();
+				$logoutUrl = $backend->getLogoutUrl();
+				if ($logoutUrl !== '') {
+					return $logoutUrl;
+				}
 			}
 		}
 

lib/public/Authentication/IApacheBackend.php

@@ -27,7 +27,7 @@ public function isSessionActive();
 	/**
 	 * Gets the current logout URL
 	 *
-	 * @return string
+	 * @return non-empty-string
 	 * @since 12.0.3
 	 */
 	public function getLogoutUrl();