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

Store redirect login url in session instead of using url parameter

Browse Source
This commit is contained in:
Frederic Guillot
2015-07-16 22:22:33 -04:00
parent e0d4877126
commit 493c7c2c74
6 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Controller/Auth.php
View File

@@ -25,7 +25,6 @@ class Auth extends Base
'errors' => $errors,
'values' => $values,
'no_layout' => true,
'redirect_query' => $this->request->getStringParam('redirect_query'),
'title' => t('Login')
)));
}
@@ -37,14 +36,15 @@ class Auth extends Base
*/
public function check()
{
$redirect_query = $this->request->getStringParam('redirect_query');
$values = $this->request->getValues();
list($valid, $errors) = $this->authentication->validateForm($values);
if ($valid) {
if ($redirect_query !== '') {
$this->response->redirect('?'.urldecode($redirect_query));
if (! empty($this->session['login_redirect']) && ! filter_var($this->session['login_redirect'], FILTER_VALIDATE_URL)) {
$redirect = $this->session['login_redirect'];
unset($this->session['login_redirect']);
$this->response->redirect($redirect);
}
$this->response->redirect($this->helper->url->to('app', 'index'));

3
app/Controller/Base.php
View File

@@ -127,7 +127,8 @@ abstract class Base extends \Core\Base
$this->response->text('Not Authorized', 401);
}
$this->response->redirect($this->helper->url->to('auth', 'login', array('redirect_query' => urlencode($this->request->getQueryString()))));
$this->session['login_redirect'] = $this->request->getUri();
$this->response->redirect($this->helper->url->to('auth', 'login'));
}
}

1
app/Controller/Oauth.php
View File

@@ -116,7 +116,6 @@ class Oauth extends Base
'errors' => array('login' => t('External authentication failed')),
'values' => array(),
'no_layout' => true,
'redirect_query' => '',
'title' => t('Login')
)));
}