diff options
| -rw-r--r-- | core/Controller/LoginController.php | 4 | ||||
| -rw-r--r-- | tests/Core/Controller/LoginControllerTest.php | 29 |
2 files changed, 6 insertions, 27 deletions
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php index d3873d1329e..2ddba2bb98a 100644 --- a/core/Controller/LoginController.php +++ b/core/Controller/LoginController.php @@ -34,7 +34,6 @@ declare(strict_types=1); */ namespace OC\Core\Controller; -use OC\AppFramework\Http\Request; use OC\Authentication\Login\Chain; use OC\Authentication\Login\LoginData; use OC\Authentication\WebAuthn\Manager as WebAuthnManager; @@ -125,7 +124,8 @@ class LoginController extends Controller { $this->session->set('clearingExecutionContexts', '1'); $this->session->close(); - if (!$this->request->isUserAgent([Request::USER_AGENT_CHROME, Request::USER_AGENT_ANDROID_MOBILE_CHROME])) { + if ($this->request->getServerProtocol() === 'https') { + // This feature is available only in secure contexts $response->addHeader('Clear-Site-Data', '"cache", "storage"'); } diff --git a/tests/Core/Controller/LoginControllerTest.php b/tests/Core/Controller/LoginControllerTest.php index ae033582d3c..6044440bdaf 100644 --- a/tests/Core/Controller/LoginControllerTest.php +++ b/tests/Core/Controller/LoginControllerTest.php @@ -143,9 +143,8 @@ class LoginControllerTest extends TestCase { ->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'); @@ -160,26 +159,6 @@ class LoginControllerTest extends TestCase { $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()) @@ -188,8 +167,8 @@ class LoginControllerTest extends TestCase { ->willReturn('MyLoginToken'); $this->request ->expects($this->once()) - ->method('isUserAgent') - ->willReturn(false); + ->method('getServerProtocol') + ->willReturn('https'); $user = $this->createMock(IUser::class); $user ->expects($this->once()) |