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

Add auth controller

This commit is contained in:
Frederic Guillot 2015-04-11 18:05:10 -04:00
parent ea9d402587
commit 7df055aff1
6 changed files with 74 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
app/Controller/Auth.php Normal file
View File

@ -0,0 +1,67 @@
<?php
namespace Controller;
/**
* Authentication controller
*
* @package controller
* @author Frederic Guillot
*/
class Auth extends Base
{
/**
* Display the form login
*
* @access public
*/
public function login(array $values = array(), array $errors = array())
{
if ($this->userSession->isLogged()) {
$this->response->redirect($this->helper->url('app', 'index'));
}
$this->response->html($this->template->layout('auth/index', array(
'errors' => $errors,
'values' => $values,
'no_layout' => true,
'redirect_query' => $this->request->getStringParam('redirect_query'),
'title' => t('Login')
)));
}
/**
* Check credentials
*
* @access public
*/
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));
}
$this->response->redirect($this->helper->url('app', 'index'));
}
$this->login($values, $errors);
}
/**
* Logout and destroy session
*
* @access public
*/
public function logout()
{
$this->authentication->backend('rememberMe')->destroy($this->userSession->getId());
$this->session->close();
$this->response->redirect($this->helper->url('auth', 'login'));
}
}

2
app/Controller/Base.php
View File

@ -197,7 +197,7 @@ abstract class Base
$this->response->text('Not Authorized', 401);
}
$this->response->redirect('?controller=user&action=login&redirect_query='.urlencode($this->request->getQueryString()));
$this->response->redirect($this->helper->url('auth', 'login', array('redirect_query' => urlencode($this->request->getQueryString()))));
}
}

60
app/Controller/User.php
View File

@ -10,62 +10,6 @@ namespace Controller;
*/
class User extends Base
{
/**
* Logout and destroy session
*
* @access public
*/
public function logout()
{
$this->checkCSRFParam();
$this->authentication->backend('rememberMe')->destroy($this->userSession->getId());
$this->session->close();
$this->response->redirect('?controller=user&action=login');
}
/**
* Display the form login
*
* @access public
*/
public function login(array $values = array(), array $errors = array())
{
if ($this->userSession->isLogged()) {
$this->response->redirect('?controller=app');
}
$this->response->html($this->template->layout('user/login', array(
'errors' => $errors,
'values' => $values,
'no_layout' => true,
'redirect_query' => $this->request->getStringParam('redirect_query'),
'title' => t('Login')
)));
}
/**
* Check credentials
*
* @access public
*/
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));
}
else {
$this->response->redirect('?controller=app');
}
}
$this->login($values, $errors);
}
/**
* Common layout for user views
*
@ -450,7 +394,7 @@ class User extends Base
$this->response->redirect('?controller=app');
}
else {
$this->response->html($this->template->layout('user/login', array(
$this->response->html($this->template->layout('auth/index', array(
'errors' => array('login' => t('Google authentication failed')),
'values' => array(),
'no_layout' => true,
@ -512,7 +456,7 @@ class User extends Base
$this->response->redirect('?controller=app');
}
else {
$this->response->html($this->template->layout('user/login', array(
$this->response->html($this->template->layout('auth/index', array(
'errors' => array('login' => t('GitHub authentication failed')),
'values' => array(),
'no_layout' => true,

3
app/Model/Acl.php
View File

@ -17,7 +17,8 @@ class Acl extends Base
* @var array
*/
private $public_acl = array(
'user' => array('login', 'check', 'google', 'github'),
'auth' => array('login', 'check'),
'user' => array('google', 'github'),
'task' => array('readonly'),
'board' => array('readonly'),
'project' => array('feed'),

2
app/Template/user/login.php → app/Template/auth/index.php
View File

@ -4,7 +4,7 @@
<p class="alert alert-error"><?= $this->e($errors['login']) ?></p>
<?php endif ?>
<form method="post" action="<?= $this->u('user', 'check', array('redirect_query' => urlencode($redirect_query))) ?>">
<form method="post" action="<?= $this->u('auth', 'check', array('redirect_query' => $redirect_query)) ?>">
<?= $this->formCsrf() ?>

2
app/Template/layout.php
View File

@ -58,7 +58,7 @@
</li>
<?php endif ?>
<li>
<?= $this->a(t('Logout'), 'user', 'logout', array(), true) ?>
<?= $this->a(t('Logout'), 'auth', 'logout') ?>
<span class="username hide-tablet">(<?= $this->a($this->e($this->getFullname()), 'user', 'show', array('user_id' => $this->userSession->getId())) ?>)</span>
</li>
</ul>