AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Redirect to original URL after oauth login

This commit is contained in:
kent1 2018-03-05 19:43:15 +01:00 committed by Frédéric Guillot
parent b4beace91c
commit a991758e98
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Controller/AuthController.php
View File

@ -64,20 +64,4 @@ class AuthController extends BaseController
$this->response->redirect($this->helper->url->to('DashboardController', 'show'));
}
}
/**
* Redirect the user after the authentication
*
* @access private
*/
private function redirectAfterLogin()
{
if (session_exists('redirectAfterLogin') && ! filter_var(session_get('redirectAfterLogin'), FILTER_VALIDATE_URL)) {
$redirect = session_get('redirectAfterLogin');
session_remove('redirectAfterLogin');
$this->response->redirect($redirect);
} else {
$this->response->redirect($this->helper->url->to('DashboardController', 'show'));
}
}
}

16
app/Controller/BaseController.php
View File

@ -305,4 +305,20 @@ abstract class BaseController extends Base
return $filter;
}
/**
* Redirect the user after the authentication
*
* @access protected
*/
protected function redirectAfterLogin()
{
if (session_exists('redirectAfterLogin') && ! filter_var(session_get('redirectAfterLogin'), FILTER_VALIDATE_URL)) {
$redirect = session_get('redirectAfterLogin');
session_remove('redirectAfterLogin');
$this->response->redirect($redirect);
} else {
$this->response->redirect($this->helper->url->to('DashboardController', 'show'));
}
}
}

2
app/Controller/OAuthController.php
View File

@ -106,7 +106,7 @@ class OAuthController extends BaseController
protected function authenticate($providerName)
{
if ($this->authenticationManager->oauthAuthentication($providerName)) {
$this->response->redirect($this->helper->url->to('DashboardController', 'show'));
$this->redirectAfterLogin();
} else {
$this->authenticationFailure(t('External authentication failed'));
}