mirror of
https://github.com/YunoHost-Apps/nextcloud_ynh.git
synced 2024-09-03 19:55:57 +02:00
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
This commit is contained in:
parent
17e6ea7d42
commit
3fdcdf6576
4 changed files with 10 additions and 9 deletions
|
@ -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
|
||||
|
|
|
@ -5,3 +5,6 @@ next_version="13.0.1"
|
|||
|
||||
# Nextcloud tarball checksum sha256
|
||||
nextcloud_source_sha256="5743314a71e972ae46a14b36b37394d4545915aa5f32d9e12ba786d04c1f1d11"
|
||||
|
||||
# Patch nextcloud files only for the last version
|
||||
cp -a ../sources/patches_last_version/* ../sources/patches
|
||||
|
|
0
sources/patches/.gitignore
vendored
Normal file
0
sources/patches/.gitignore
vendored
Normal file
|
@ -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;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Reference in a new issue