Skip to content
Snippets Groups Projects
Unverified Commit f095bd16 authored by Morris Jobke's avatar Morris Jobke
Browse files

Use non-absolute logout URL to fix wrong URL in reverse proxy scenario


Signed-off-by: default avatarMorris Jobke <hey@morrisjobke.de>
parent df1f53c5
No related branches found
No related tags found
No related merge requests found
...@@ -269,7 +269,7 @@ class OC_User { ...@@ -269,7 +269,7 @@ class OC_User {
return $backend->getLogoutUrl(); return $backend->getLogoutUrl();
} }
$logoutUrl = $urlGenerator->linkToRouteAbsolute('core.login.logout'); $logoutUrl = $urlGenerator->linkToRoute('core.login.logout');
$logoutUrl .= '?requesttoken=' . urlencode(\OCP\Util::callRegister()); $logoutUrl .= '?requesttoken=' . urlencode(\OCP\Util::callRegister());
return $logoutUrl; return $logoutUrl;
......
...@@ -217,14 +217,12 @@ class NavigationManagerTest extends TestCase { ...@@ -217,14 +217,12 @@ class NavigationManagerTest extends TestCase {
$this->urlGenerator->expects($this->any())->method('imagePath')->willReturnCallback(function ($appName, $file) { $this->urlGenerator->expects($this->any())->method('imagePath')->willReturnCallback(function ($appName, $file) {
return "/apps/$appName/img/$file"; return "/apps/$appName/img/$file";
}); });
$this->urlGenerator->expects($this->any())->method('linkToRoute')->willReturnCallback(function () { $this->urlGenerator->expects($this->any())->method('linkToRoute')->willReturnCallback(function ($route) {
if ($route === 'core.login.logout') {
return 'https://example.com/logout';
}
return '/apps/test/'; return '/apps/test/';
}); });
$this->urlGenerator
->expects($this->once())
->method('linkToRouteAbsolute')
->with('core.login.logout')
->willReturn('https://example.com/logout');
$user = $this->createMock(IUser::class); $user = $this->createMock(IUser::class);
$user->expects($this->any())->method('getUID')->willReturn('user001'); $user->expects($this->any())->method('getUID')->willReturn('user001');
$this->userSession->expects($this->any())->method('getUser')->willReturn($user); $this->userSession->expects($this->any())->method('getUser')->willReturn($user);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment