wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

show login error

Browse source
This commit is contained in:
Christoph Wurst 2016-05-04 09:05:03 +02:00 committed by Thomas Müller
parent a9b500c03b
commit 3ffa7d986a
No known key found for this signature in database
GPG key ID: A943788A3BBEC44C
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
core/Controller/LoginController.php
View file

@ -106,6 +106,7 @@ class LoginController extends Controller {
}
$parameters = array();
$id = $this->session->getId();
$loginMessages = $this->session->get('loginMessages');
$errors = [];
$messages = [];
@ -167,16 +168,23 @@ class LoginController extends Controller {
*/
public function tryLogin($user, $password, $redirect_url) {
// TODO: Add all the insane error handling
$loginResult = $this->userManager->checkPassword($user, $password) === false;
if ($loginResult) {
$loginResult = $this->userManager->checkPassword($user, $password) !== false;
if (!$loginResult) {
$users = $this->userManager->getByEmail($user);
// we only allow login by email if unique
if (count($users) === 1) {
$loginResult = $this->userManager->checkPassword($users[0]->getUID(), $password);
}
}
if ($loginResult) {
return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm'));
if (!$loginResult) {
$id = $this->session->getId();
$this->session->set('loginMessages', [
[],
['invalidpassword']
]);
// Read current user and append if possible
$args = !is_null($user) ? ['user' => $user] : [];
return new RedirectResponse($this->urlGenerator->linkToRoute('core.login.showLoginForm', $args));
}
$this->userSession->createSessionToken($this->request, $user, $password);
if (!is_null($redirect_url) && $this->userSession->isLoggedIn()) {
@ -187,7 +195,6 @@ class LoginController extends Controller {
return new RedirectResponse($location);
}
}
// TODO: Show invalid login warning
return new RedirectResponse($this->urlGenerator->linkTo('files', 'index'));
}