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

Browse Source
This commit is contained in:
Dave M. 2023-02-01 18:04:32 +00:00
commit 4664a8779a
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Entity/User.php
View File

@ -57,7 +57,7 @@ class User {
public function __toString() : string
{
return $this->fullname();
return "{$this->firstName} {$this->lastName}";
}
public function setPassword($password) : self
@ -67,9 +67,9 @@ class User {
return $this->hashPassword();
}
public function hashPassword() : self
public function hashPassword(? string $password = null) : self
{
$this->password = password_hash($this->password, PASSWORD_DEFAULT);
$this->password = password_hash($password ?: $this->password, PASSWORD_DEFAULT);
return $this;
}

6
src/Lib/Authenticate.php
View File

@ -35,8 +35,8 @@ class Authenticate {
public function rememberMe(\Ulmus\Repository $repository) : ? User
{
$logUser = function(int $id) use ($repository) {
if ( null === ( $user = $repository->loadFromPk($id) ) ) {
$logUser = function(? int $id) use ($repository) {
if ( $id === null || null === ( $user = $repository->loadFromPk($id) ) ) {
throw new \Exception("User not found.");
}
@ -123,7 +123,9 @@ class Authenticate {
$this->cookie->delete('user.id');
}
if (isset($this->user)) {
$this->user->logged = false;
}
return $this;
}