mcndave
/
ulmus-user
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.mcnd.ca/mcndave/ulmus-user

This commit is contained in:
Dave M. 2022-10-12 18:18:49 +00:00
parent 015f0c70b1 267fe5cadd
commit 10ad77d607
2 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Entity/User.php
View File

@ -22,7 +22,7 @@ class User {
public ? string $lastName;
/**
* @Field("size" => 150)
* @Field("size" => 255)
*/
public string $email;

26
src/Lib/Authenticate.php
View File

@ -30,15 +30,13 @@ class Authenticate {
) {
$this->session = $session;
$this->cookie = $cookie;
$this->authenticationEvent = $authenticationEvent ?: function(bool $authenticated, string $message, ? User $user, array $data = []) : bool {return false;} ;
$this->authenticationEvent = $authenticationEvent ?: function(bool $authenticated, string $message, ? User $user, array $data = []) : ? bool {return null;} ;
}
public function rememberMe(\Ulmus\Repository $repository) : ? User
{
$logUser = function(int $id) use ($repository) {
if ( null === ( $user = $repository->loadFromPk($id) ) ) {
$this->logout();
$logUser = function(? int $id) use ($repository) {
if ( $id === null || null === ( $user = $repository->loadFromPk($id) ) ) {
throw new \Exception("User not found.");
}
@ -63,7 +61,7 @@ class Authenticate {
$this->session->destroy();
}
public function authenticate(\Ulmus\Repository $repository, array $userLogin, ? string $password) : User
public function authenticate(\Ulmus\Repository $repository, array $userLogin, string $password) : User
{
foreach($userLogin as $field => $value) {
$repository->or($field, $value);
@ -78,7 +76,14 @@ class Authenticate {
}
}
if ( $this->user->isLoaded() && ( call_user_func_array($this->authenticationEvent, [ false, 'verifyPassword', $this->user, [ 'password' => $password ] ]) || $this->user->verifyPassword($password) ) ) {
if ( ! $this->user->isLoaded() ) {
call_user_func_array($this->authenticationEvent, [ false, 'userNotFound', $this->user, [ 'user_login' => $userLogin, 'password' => $password ] ]);
}
if ($this->user->isLoaded()) {
$response = call_user_func_array($this->authenticationEvent, [ false, 'verifyPassword', $this->user, [ 'password' => $password ] ]);
if ( $response !== null ? $response : $this->user->verifyPassword($password) ) {
$this->user->logged = true;
if ( $this->session ) {
@ -96,6 +101,11 @@ class Authenticate {
call_user_func_array($this->authenticationEvent, [ false, 'invalidPassword', $this->user ]);
}
}
if ( ! $this->user->isLoaded() ) {
call_user_func_array($this->authenticationEvent, [ false, 'authenticationFailed', $this->user, [ 'user_login' => $userLogin, 'password' => $password ] ]);
}
return $this->user;
}
@ -113,7 +123,7 @@ class Authenticate {
$this->cookie->delete('user.id');
}
$this->user && $this->user->logged = false;
$this->user->logged = false;
return $this;
}