Browse Source

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

- fix Nextcloud source patch
- fix patches not applied on installation
- add an empty patches directory to work around a nasty cache issue when running package_check
pull/115/head
Jimmy Monin 8 years ago
parent
commit
3fdcdf6576
  1. 4
      scripts/upgrade
  2. 3
      scripts/upgrade.d/upgrade.last.sh
  3. 0
      sources/patches/.gitignore
  4. 12
      sources/patches_last_version/app-00-add-logout_url-conf.patch

4
scripts/upgrade

@ -175,9 +175,7 @@ do
# If the current version has the same major version than the next one, # If the current version has the same major version than the next one,
# then it's the last upgrade to do # then it's the last upgrade to do
if [ "$major_version" -eq "$current_major_version" ]; then 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 fi
# Load the value for this version # Load the value for this version

3
scripts/upgrade.d/upgrade.last.sh

@ -5,3 +5,6 @@ next_version="13.0.1"
# Nextcloud tarball checksum sha256 # Nextcloud tarball checksum sha256
nextcloud_source_sha256="5743314a71e972ae46a14b36b37394d4545915aa5f32d9e12ba786d04c1f1d11" nextcloud_source_sha256="5743314a71e972ae46a14b36b37394d4545915aa5f32d9e12ba786d04c1f1d11"
# Patch nextcloud files only for the last version
cp -a ../sources/patches_last_version/* ../sources/patches

0
sources/patches/.gitignore

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

@ -1,14 +1,14 @@
--- a/core/Controller/LoginController.php --- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php +++ b/core/Controller/LoginController.php
@@ -100,7 +100,10 @@ class LoginController extends Controller {
@@ -119,7 +119,10 @@
} }
$this->userSession->logout(); $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', + $redirectUrl = $this->config->getSystemValue('logout_url',
+ $this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm') + $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;
} }
/**
Loading…
Cancel
Save