Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[User Management] Fix empty permission array. #558

Merged
merged 2 commits into from
Nov 18, 2024
Merged

[User Management] Fix empty permission array. #558

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09884e1
Fix empty permission array.
martineiber Nov 18, 2024
bf3cc46
Apply php-cs-fixer changes
martineiber Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/User/Hydrator/UserHydrator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ classes: $user->getClasses(),
lastLogin: $user->getLastLogin(),
memorizeTabs: $user->getMemorizeTabs(),
parentId: $user->getParentId(),
permissions: $user->getPermissions(),
permissions: $this->sanitizePermissions($user->getPermissions()),
roles: $user->getRoles(),
twoFactorAuthenticationEnabled:
$user->getTwoFactorAuthentication('enabled') || $user->getTwoFactorAuthentication('secret'),
Expand Down Expand Up @@ -108,4 +108,11 @@ private function getContentLanguages(UserInterface $user): array

return explode(',', $contentLanguagesString);
}

// In some cases, the permissions array contains and array with empty strings as values
// This method removes those empty strings
private function sanitizePermissions(array $permissions): array
{
return array_filter($permissions, fn ($permission) => $permission !== '');
}
}
Loading