pnx/httpcb
Archived
1
0
Fork 0
Code Releases Activity

app/controllers/AuthController.php: use Httpcb\Auth\Result to have more detailed reason why an authentication failed.

Browse source
This commit is contained in:
Henrik Hautakoski 2018-08-17 16:54:38 +02:00
parent 1e9203f35f
commit ca7a3675f7
No known key found for this signature in database
GPG key ID: 839F3A7EAFAEAFAA
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/controllers/AuthController.php
View file

@ -5,9 +5,9 @@ namespace App\Controller;
use App\Controller\ControllerBase, use App\Controller\ControllerBase,
App\Model\Data\User, App\Model\Data\User,
App\Form\Login as LoginForm, App\Form\Login as LoginForm,
App\Form\Registration as RegistrationForm; App\Form\Registration as RegistrationForm,
Httpcb\OAuth\UserData\UserDataInterface,
use Httpcb\OAuth\UserData\UserDataInterface; Httpcb\Auth\Result;
class AuthController extends ControllerBase class AuthController extends ControllerBase
{ {
@ -30,7 +30,8 @@ class AuthController extends ControllerBase
$passwd = $form->getValue('Password'); $passwd = $form->getValue('Password');
// Perform login // Perform login
if ($this->auth->login($email, $passwd)) { $result = $this->auth->login($email, $passwd);
if ($result->isValid()) {
$this->response->redirect('/'); $this->response->redirect('/');
} else { } else {
$this->flash->message('error', "Invalid credentials"); $this->flash->message('error', "Invalid credentials");
@ -81,7 +82,13 @@ class AuthController extends ControllerBase
else { else {
$result = $this->auth->loginOauth($data); $result = $this->auth->loginOauth($data);
if ($result === false) { if (!$result->isValid()) {
if ($result->getCode() == Result::FAILURE_ACCOUNT_SUSPENDED) {
$this->flash->message('error', 'Failed to authenticate.');
$this->response->redirect('/login');
return;
}
if (User::findFirstByEmail($data->getEmail())) { if (User::findFirstByEmail($data->getEmail())) {
$this->flash->error('The email address is already in use.'); $this->flash->error('The email address is already in use.');
@ -98,6 +105,7 @@ class AuthController extends ControllerBase
$this->response->redirect('/'); $this->response->redirect('/');
} }
} catch(\Exception $e) { } catch(\Exception $e) {
throw $e;
$this->flash->message('error', 'Failed to authenticate.'); $this->flash->message('error', 'Failed to authenticate.');
if ($this->auth->getUser()) { if ($this->auth->getUser()) {
$this->response->redirect('/settings'); $this->response->redirect('/settings');