Skip to content

Send Clear-Site-Data header and let browsers ignore it if unsupported #37405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 2 commits into from
Mar 28, 2023
Merged

Send Clear-Site-Data header and let browsers ignore it if unsupported #37405

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfd7a57
Send header to all browsers under HTTPS
solracsf Mar 25, 2023
346054f
Fix tests
solracsf Mar 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix tests 
Signed-off-by: Git'Fellow <[email protected]>
  • Loading branch information
@solracsf
solracsf authored Mar 28, 2023
commit 346054f85402bcf6a2ccd9d672abf6d9194ea793
29 changes: 4 additions & 25 deletions tests/Core/Controller/LoginControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,8 @@ public function testLogoutWithoutToken() {
->with('nc_token')
->willReturn(null);
$this->request
->expects($this->once())
->method('isUserAgent')
->willReturn(false);
->method('getServerProtocol')
->willReturn('https');
$this->config
->expects($this->never())
->method('deleteUserValue');
Expand All @@ -160,26 +159,6 @@ public function testLogoutWithoutToken() {
$this->assertEquals($expected, $this->loginController->logout());
}

public function testLogoutNoClearSiteData() {
$this->request
->expects($this->once())
->method('getCookie')
->with('nc_token')
->willReturn(null);
$this->request
->expects($this->once())
->method('isUserAgent')
->willReturn(true);
$this->urlGenerator
->expects($this->once())
->method('linkToRouteAbsolute')
->with('core.login.showLoginForm')
->willReturn('/login');

$expected = new RedirectResponse('/login');
$this->assertEquals($expected, $this->loginController->logout());
}

public function testLogoutWithToken() {
$this->request
->expects($this->once())
Expand All @@ -188,8 +167,8 @@ public function testLogoutWithToken() {
->willReturn('MyLoginToken');
$this->request
->expects($this->once())
->method('isUserAgent')
->willReturn(false);
->method('getServerProtocol')
->willReturn('https');
$user = $this->createMock(IUser::class);
$user
->expects($this->once())
Expand Down