add the status "deleted" to the user table #529
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: bidi <[email protected]>
Signed-off-by: bidi <[email protected]>
Signed-off-by: bidi <[email protected]>
alexmerlin
requested changes
Dec 11, 2024
There was a problem hiding this comment.
- With these modifications, trying to authenticate with a deleted account (I know it's an edge-case, but we need to handle it properly) will throw this message:
User account must be activated first.
In order to fix this, we should modify config/autoload/authentication.global.php and make sure that status is not Deleted, but we cannot add a(nother) rule for status because we already have one that checks if user is Pending.
One solution would be to modify src/User/src/Adapter/AuthenticationAdapter.php and add after if (null === $identityClass) the following:
$methodName = 'isDeleted';
$this->checkMethod($identityClass, $methodName);
if ($identityClass->$methodName()) {
return new Result(
Result::FAILURE_IDENTITY_NOT_FOUND,
null,
[Message::ACCOUNT_NOT_FOUND]
);
}UserService->find*methods must make sure that they do not return deleted users.
For example:
public function findByUuid(string $uuid): ?User
{
return $this->userRepository->findByUuid($uuid);
}would become:
public function findByUuid(string $uuid): ?User
{
$user = $this->userRepository->findByUuid($uuid);
if (! $user instanceof User) {
return null;
}
if ($user->isDeleted()) {
return null;
}
return $user;
}Similar approach for the other find* methods.
- Not being restricted anymore by a boolean field in the database, we can also simplify usage of
User::IS_DELETEDandUser::IS_DELETED_*
Signed-off-by: bidi <[email protected]>
Signed-off-by: bidi <[email protected]>
alexmerlin
requested changes
Dec 16, 2024
Signed-off-by: bidi <[email protected]>
alexmerlin
approved these changes
Dec 16, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.