mirror of https://github.com/MISP/MISP
Merge pull request #5541 from JakubOnderka/proper_logout
fix: Proper logout when `CustomAuth_custom_logout` is setpull/5555/head
commit
56e0d009e7
|
@ -112,7 +112,14 @@ class AppController extends Controller
|
|||
public function beforeFilter()
|
||||
{
|
||||
$this->Auth->loginRedirect = Configure::read('MISP.baseurl') . '/users/routeafterlogin';
|
||||
$this->Auth->logoutRedirect = Configure::read('MISP.baseurl') . '/users/login';
|
||||
|
||||
$customLogout = Configure::read('Plugin.CustomAuth_custom_logout');
|
||||
if ($customLogout) {
|
||||
$this->Auth->logoutRedirect = $customLogout;
|
||||
} else {
|
||||
$this->Auth->logoutRedirect = Configure::read('MISP.baseurl') . '/users/login';
|
||||
}
|
||||
|
||||
$this->__sessionMassage();
|
||||
if (Configure::read('Security.allow_cors')) {
|
||||
// Add CORS headers
|
||||
|
|
|
@ -419,15 +419,10 @@
|
|||
)
|
||||
)
|
||||
),
|
||||
array(
|
||||
'url' => h(Configure::read('Plugin.CustomAuth_custom_logout')),
|
||||
'text' => __('Log out'),
|
||||
'requirement' => (Configure::read('Plugin.CustomAuth_custom_logout') && empty(Configure::read('Plugin.CustomAuth_disable_logout')))
|
||||
),
|
||||
array(
|
||||
'url' => '/users/logout',
|
||||
'text' => __('Log out'),
|
||||
'requirement' => (!$externalAuthUser && empty(Configure::read('Plugin.CustomAuth_disable_logout')))
|
||||
'requirement' => empty(Configure::read('Plugin.CustomAuth_disable_logout'))
|
||||
)
|
||||
);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue