summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-10-23 17:04:45 +0200
committerGitHub <noreply@github.com>2018-10-23 17:04:45 +0200
commite0f9257be933ae8605424aaf5a08860cfd4359ff (patch)
tree0d6496f415b72d29a1974aa332daa8c31e1aedbf
parenta9fb21f9fccf14eee9192a01a22a41b94904a729 (diff)
parent1806baaeafa284808cceb1a38ea2e1a9189d0407 (diff)
downloadnextcloud-server-e0f9257be933ae8605424aaf5a08860cfd4359ff.tar.gz
nextcloud-server-e0f9257be933ae8605424aaf5a08860cfd4359ff.zip
Merge pull request #11847 from iPaat/Fix/DeleteCookiesThroughClearSiteData
Remove cookies from Clear-Site-Data Header
-rw-r--r--core/Controller/LoginController.php2
-rw-r--r--tests/Core/Controller/LoginControllerTest.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index ecb4e479206..a9fb22f21b7 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -131,7 +131,7 @@ class LoginController extends Controller {
$this->userSession->logout();
$response = new RedirectResponse($this->urlGenerator->linkToRouteAbsolute('core.login.showLoginForm'));
- $response->addHeader('Clear-Site-Data', '"cache", "cookies", "storage", "executionContexts"');
+ $response->addHeader('Clear-Site-Data', '"cache", "storage", "executionContexts"');
return $response;
}
diff --git a/tests/Core/Controller/LoginControllerTest.php b/tests/Core/Controller/LoginControllerTest.php
index f3e6c854808..f2e8d112b64 100644
--- a/tests/Core/Controller/LoginControllerTest.php
+++ b/tests/Core/Controller/LoginControllerTest.php
@@ -117,7 +117,7 @@ class LoginControllerTest extends TestCase {
->willReturn('/login');
$expected = new RedirectResponse('/login');
- $expected->addHeader('Clear-Site-Data', '"cache", "cookies", "storage", "executionContexts"');
+ $expected->addHeader('Clear-Site-Data', '"cache", "storage", "executionContexts"');
$this->assertEquals($expected, $this->loginController->logout());
}
@@ -147,7 +147,7 @@ class LoginControllerTest extends TestCase {
->willReturn('/login');
$expected = new RedirectResponse('/login');
- $expected->addHeader('Clear-Site-Data', '"cache", "cookies", "storage", "executionContexts"');
+ $expected->addHeader('Clear-Site-Data', '"cache", "storage", "executionContexts"');
$this->assertEquals($expected, $this->loginController->logout());
}