A free open source IT asset/license management system
Switched to use actions for normalizing payload
snipe2a601ae483ee
diff --git a/app/Actions/Permissions/NormalizePermissionsPayloadAction.php b/app/Actions/Permissions/NormalizePermissionsPayloadAction.phpnew file mode 100644index 0000000000..fcc3541515--- /dev/null+++ b/app/Actions/Permissions/NormalizePermissionsPayloadAction.php@@ -0,0 +1,31 @@+<?php++namespace App\Actions\Permissions;++final class NormalizePermissionsPayloadAction+{+ /**+ * Normalize permissions payloads from request/model to a consistent associative array.+ *+ * @return array<string, mixed>+ */+ public static function run(mixed $permissions): array+ {+ if (is_string($permissions)) {+ $decoded = json_decode($permissions, true);++ return is_array($decoded) ? $decoded : [];+ }++ if (is_array($permissions)) {+ return $permissions;+ }++ if ($permissions instanceof \stdClass) {+ return (array) $permissions;+ }++ return [];+ }+}+diff --git a/app/Actions/Permissions/PreserveUnauthorizedPrivilegedPermissionsAction.php b/app/Actions/Permissions/PreserveUnauthorizedPrivilegedPermissionsAction.phpnew file mode 100644index 0000000000..f7256cd416--- /dev/null+++ b/app/Actions/Permissions/PreserveUnauthorizedPrivilegedPermissionsAction.php@@ -0,0 +1,37 @@+<?php++namespace App\Actions\Permissions;++use App\Models\User;++final class PreserveUnauthorizedPrivilegedPermissionsAction+{+ /**+ * Preserve privileged permission keys unless the authenticated user may manage them.+ *+ * @param array<string, mixed> $requestedPermissions+ * @param array<string, mixed> $originalPermissions+ * @return array<string, mixed>+ */+ public static function run(array $requestedPermissions, User $authenticatedUser, array $originalPermissions = []): array+ {+ if (! $authenticatedUser->isSuperUser()) {+ if (array_key_exists('superuser', $originalPermissions)) {+ $requestedPermissions['superuser'] = $originalPermissions['superuser'];+ } else {+ unset($requestedPermissions['superuser']);+ }+ }++ if ((! $authenticatedUser->isAdmin()) && (! $authenticatedUser->isSuperUser())) {+ if (array_key_exists('admin', $originalPermissions)) {+ $requestedPermissions['admin'] = $originalPermissions['admin'];+ } else {+ unset($requestedPermissions['admin']);+ }+ }++ return $requestedPermissions;+ }+}+