Skip to content
Merged
Changes from all commits
Commits
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
29 changes: 24 additions & 5 deletions src/Middleware/RoleOrPermissionMiddleware.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ public function handle($request, Closure $next, $roleOrPermission, $guard = null
throw UnauthorizedException::missingTraitHasRoles($user);
}

$rolesOrPermissions = is_array($roleOrPermission)
? $roleOrPermission
: explode('|', $roleOrPermission);
$rolesOrPermissions = explode('|', self::parseRoleOrPermissionToString($roleOrPermission));

if (! $user->canAny($rolesOrPermissions) && ! $user->hasAnyRole($rolesOrPermissions)) {
throw UnauthorizedException::forRolesOrPermissions($rolesOrPermissions);
Expand All @@ -42,15 +40,36 @@ public function handle($request, Closure $next, $roleOrPermission, $guard = null
/**
* Specify the role or permission and guard for the middleware.
*
* @param array|string $roleOrPermission
* @param array|string|\BackedEnum $roleOrPermission
* @param string|null $guard
* @return string
*/
public static function using($roleOrPermission, $guard = null)
{
$roleOrPermissionString = is_string($roleOrPermission) ? $roleOrPermission : implode('|', $roleOrPermission);
$roleOrPermissionString = self::parseRoleOrPermissionToString($roleOrPermission);
$args = is_null($guard) ? $roleOrPermissionString : "$roleOrPermissionString,$guard";

return static::class.':'.$args;
}

/**
* Convert array or string of roles/permissions to string representation.
*
* @return string
*/
protected static function parseRoleOrPermissionToString(array|string|\BackedEnum $roleOrPermission)
{
// Convert Enum to its value if an Enum is passed
if ($roleOrPermission instanceof \BackedEnum) {
$roleOrPermission = $roleOrPermission->value;
}

if (is_array($roleOrPermission)) {
$roleOrPermission = array_map(fn ($r) => $r instanceof \BackedEnum ? $r->value : $r, $roleOrPermission);

return implode('|', $roleOrPermission);
}

return (string) $roleOrPermission;
}
}