openinfra/openstackid
Code Issues Proposed changes

Fixed user update

Browse Source 
Change-Id: I1ff1b94c98a4917dee105fde3f7fdd48c341068b
Signed-off-by: smarcet <smarcet@gmail.com>
This commit is contained in:
smarcet 2021-02-23 10:38:13 -03:00
parent 0d20134f7f
commit 5f9fa5f6a7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/OpenId/UserService.php
View File

@ -265,7 +265,7 @@ final class UserService extends AbstractService implements IUserService
} }
} }
if(isset($payload["email"])){ if(isset($payload["email"]) && !empty($payload["email"])){
$former_user = $this->repository->getByEmailOrName(trim($payload["email"])); $former_user = $this->repository->getByEmailOrName(trim($payload["email"]));
if(!is_null($former_user) && $former_user->getId() != $id) if(!is_null($former_user) && $former_user->getId() != $id)
throw new ValidationException(sprintf("email %s already belongs to another user", $payload["email"])); throw new ValidationException(sprintf("email %s already belongs to another user", $payload["email"]));

3
app/libs/Auth/Factories/UserFactory.php
View File

@ -48,11 +48,12 @@ final class UserFactory
if(isset($payload['last_name'])) if(isset($payload['last_name']))
$user->setLastName(trim($payload['last_name'])); $user->setLastName(trim($payload['last_name']));
if(isset($payload['email'])) if(isset($payload['email']) && !empty($payload['email']))
$user->setEmail(strtolower(trim($payload['email']))); $user->setEmail(strtolower(trim($payload['email'])));
if(isset($payload['second_email'])) if(isset($payload['second_email']))
$user->setSecondEmail(strtolower(trim($payload['second_email']))); $user->setSecondEmail(strtolower(trim($payload['second_email'])));
if(isset($payload['third_email'])) if(isset($payload['third_email']))
$user->setThirdEmail(strtolower(trim($payload['third_email']))); $user->setThirdEmail(strtolower(trim($payload['third_email'])));