Merge pull request #13757 from nextcloud/enh/also_cache_logout_route
Allow caching of the logout route
This commit is contained in:
commit
68c0fd3863
|
@ -269,12 +269,8 @@ class OC_User {
|
||||||
return $backend->getLogoutUrl();
|
return $backend->getLogoutUrl();
|
||||||
}
|
}
|
||||||
|
|
||||||
$logoutUrl = $urlGenerator->linkToRouteAbsolute(
|
$logoutUrl = $urlGenerator->linkToRouteAbsolute('core.login.logout');
|
||||||
'core.login.logout',
|
$logoutUrl .= '?requesttoken=' . \OCP\Util::callRegister();
|
||||||
[
|
|
||||||
'requesttoken' => \OCP\Util::callRegister(),
|
|
||||||
]
|
|
||||||
);
|
|
||||||
|
|
||||||
return $logoutUrl;
|
return $logoutUrl;
|
||||||
}
|
}
|
||||||
|
|
|
@ -221,15 +221,10 @@ class NavigationManagerTest extends TestCase {
|
||||||
return '/apps/test/';
|
return '/apps/test/';
|
||||||
});
|
});
|
||||||
$this->urlGenerator
|
$this->urlGenerator
|
||||||
->expects($this->once())
|
->expects($this->once())
|
||||||
->method('linkToRouteAbsolute')
|
->method('linkToRouteAbsolute')
|
||||||
->with(
|
->with('core.login.logout')
|
||||||
'core.login.logout',
|
->willReturn('https://example.com/logout');
|
||||||
[
|
|
||||||
'requesttoken' => \OCP\Util::callRegister()
|
|
||||||
]
|
|
||||||
)
|
|
||||||
->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);
|
||||||
|
@ -275,7 +270,7 @@ class NavigationManagerTest extends TestCase {
|
||||||
'logout' => [
|
'logout' => [
|
||||||
'id' => 'logout',
|
'id' => 'logout',
|
||||||
'order' => 99999,
|
'order' => 99999,
|
||||||
'href' => 'https://example.com/logout',
|
'href' => 'https://example.com/logout?requesttoken='. \OCP\Util::callRegister(),
|
||||||
'icon' => '/apps/core/img/actions/logout.svg',
|
'icon' => '/apps/core/img/actions/logout.svg',
|
||||||
'name' => 'Log out',
|
'name' => 'Log out',
|
||||||
'active' => false,
|
'active' => false,
|
||||||
|
|
Loading…
Reference in New Issue