Merge pull request #115 from YunoHost-Apps/fix_logout_patch

Fix automatic logout from YunoHost when logging out from Nextcloud (#106)

scripts/upgrade

@@ -175,9 +175,7 @@ do
     # If the current version has the same major version than the next one,
     # then it's the last upgrade to do
     if [ "$major_version" -eq "$current_major_version" ]; then
-	current_major_version=last
-	# Patch nexcloud files only for the last upgrade.
-	cp -a ../sources/patches_last_version ../sources/patches
+      current_major_version=last
     fi
 
     # Load the value for this version

scripts/upgrade.d/upgrade.last.sh

@@ -5,3 +5,7 @@ next_version="13.0.2"
 
 # Nextcloud tarball checksum sha256
 nextcloud_source_sha256="7396f98a1a53a9f4b144f55360d87c89cb6ee899feef1cfbf29a736219f9c47d"
+
+# Patch nextcloud files only for the last version
+cp -a ../sources/patches_last_version/* ../sources/patches
+

sources/patches_last_version/app-00-add-logout_url-conf.patch

@@ -1,14 +1,14 @@
 --- a/core/Controller/LoginController.php
 +++ b/core/Controller/LoginController.php
-@@ -100,7 +100,10 @@ class LoginController extends Controller {
+@@ -119,7 +119,10 @@
  		}
  		$this->userSession->logout();
- 
--		return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
+
+-		$response = new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
 +		$redirectUrl = $this->config->getSystemValue('logout_url',
 +			$this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm')
 +		);
-+		return new RedirectResponse($redirectUrl);
++		$response = new RedirectResponse($redirectUrl);
+ 		$response->addHeader('Clear-Site-Data', '"cache", "cookies", "storage", "executionContexts"');
+ 		return $response;
  	}
- 
- 	/**