Skip to content

A free open source IT asset/license management system

Implement the new actions in the controllers

snipec764605d0722
diff --git a/app/Http/Controllers/Api/GroupsController.php b/app/Http/Controllers/Api/GroupsController.php
index f3b65561f0..ace5c36c54 100644
--- a/app/Http/Controllers/Api/GroupsController.php
+++ b/app/Http/Controllers/Api/GroupsController.php
@@ -2,6 +2,7 @@
namespace App\Http\Controllers\Api;
+use App\Actions\Permissions\NormalizePermissionsPayloadAction;
use App\Helpers\Helper;
use App\Http\Controllers\Controller;
use App\Http\Requests\FilterRequest;
@@ -77,14 +78,18 @@ class GroupsController extends Controller
{
$this->authorize('superadmin');
$group = new Group;
- // Get all the available permissions
- $permissions = json_encode(config('permissions'));
- $groupPermissions = Helper::selectedPermissionsArray($permissions, $permissions);
+ $defaultPermissions = Helper::selectedPermissionsArray(config('permissions'), config('permissions'));
+
+ $requestedPermissions = $request->has('permissions')
+ ? NormalizePermissionsPayloadAction::run($request->input('permissions'))
+ : $defaultPermissions;
$group->name = $request->input('name');
$group->created_by = auth()->id();
$group->notes = $request->input('notes');
- $group->permissions = json_encode($request->input('permissions', $groupPermissions));
+ $group->permissions = json_encode(
+ Helper::selectedPermissionsArray(config('permissions'), $requestedPermissions)
+ );
if ($group->save()) {
return response()->json(Helper::formatStandardApiResponse('success', (new GroupsTransformer)->transformGroup($group), trans('admin/groups/message.success.create')));
@@ -124,9 +129,23 @@ class GroupsController extends Controller
$this->authorize('superadmin');
$group = Group::findOrFail($id);
- $group->name = $request->input('name');
- $group->notes = $request->input('notes');
- $group->permissions = $request->input('permissions'); // Todo - some JSON validation stuff here
+ if ($request->has('name')) {
+ $group->name = $request->input('name');
+ }
+
+ if ($request->has('notes')) {
+ $group->notes = $request->input('notes');
+ }
+
+ // Preserve existing permissions when omitted from PATCH/PUT payload.
+ if ($request->has('permissions')) {
+ $group->permissions = json_encode(
+ Helper::selectedPermissionsArray(
+ config('permissions'),
+ NormalizePermissionsPayloadAction::run($request->input('permissions'))
+ )
+ );
+ }
if ($group->save()) {
return response()->json(Helper::formatStandardApiResponse('success', (new GroupsTransformer)->transformGroup($group), trans('admin/groups/message.success.update')));
diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index 357a3c4a03..489699e944 100644
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -2,6 +2,8 @@
namespace App\Http\Controllers\Api;
+use App\Actions\Permissions\NormalizePermissionsPayloadAction;
+use App\Actions\Permissions\PreserveUnauthorizedPrivilegedPermissionsAction;
use App\Helpers\Helper;
use App\Http\Controllers\Controller;
use App\Http\Requests\DeleteUserRequest;
@@ -436,27 +438,17 @@ class UsersController extends Controller
{
$this->authorize('create', User::class);
+ $authenticatedUser = auth()->user();
$user = new User;
$user->fill($request->all());
$user->company_id = Company::getIdForCurrentUser($request->input('company_id'));
$user->created_by = auth()->id();
if ($request->has('permissions')) {
- $permissions_array = $request->input('permissions');
-
- if (! auth()->user()->isSuperUser()) {
- if ((is_array($permissions_array)) && (array_key_exists('superuser', $permissions_array))) {
- unset($permissions_array['superuser']);
- }
- }
-
- if (! auth()->user()->isAdmin()) {
- if ((is_array($permissions_array)) && (array_key_exists('admin', $permissions_array))) {
- unset($permissions_array['admin']);
- }
- }
-
- $user->permissions = $permissions_array;
+ $user->permissions = json_encode(PreserveUnauthorizedPrivilegedPermissionsAction::run(
+ requestedPermissions: NormalizePermissionsPayloadAction::run($request->input('permissions')),
+ authenticatedUser: $authenticatedUser,
+ ));
}
//
@@ -535,6 +527,8 @@ class UsersController extends Controller
{
$this->authorize('update', $user);
+ $authenticatedUser = auth()->user();
+
/**
* This is a janky hack to prevent people from changing admin demo user data on the public demo.
* The $ids 1 and 2 are special since they are seeded as superadmins in the demo seeder.
@@ -570,32 +564,12 @@ class UsersController extends Controller
}
if ($request->has('permissions')) {
-
- $permissions_array = $this->normalizePermissionsPayload($request->input('permissions'));
- $orig_permissions_array = $this->normalizePermissionsPayload($user->decodePermissions());
-
- // Strip out the individual superuser permission if the API user isn't a superadmin.
- // If the target user did not already have a superuser key, remove any injected value.
- if (! auth()->user()->isSuperUser()) {
- if (array_key_exists('superuser', $orig_permissions_array)) {
- $permissions_array['superuser'] = $orig_permissions_array['superuser'];
- } else {
- unset($permissions_array['superuser']);
- }
- }
-
- // Strip out the individual admin permission if the API user isn't an admin.
- // If the target user did not already have an admin key, remove any injected value.
- if ((! auth()->user()->isAdmin()) && (! auth()->user()->isSuperUser())) {
- if (array_key_exists('admin', $orig_permissions_array)) {
- $permissions_array['admin'] = $orig_permissions_array['admin'];
- } else {
- unset($permissions_array['admin']);
- }
- }
-
// This is going to update the whole thing, not just what was passed.
- $user->permissions = $permissions_array;
+ $user->permissions = json_encode(PreserveUnauthorizedPrivilegedPermissionsAction::run(
+ requestedPermissions: NormalizePermissionsPayloadAction::run($request->input('permissions')),
+ authenticatedUser: $authenticatedUser,
+ originalPermissions: NormalizePermissionsPayloadAction::run($user->decodePermissions()),
+ ));
}
}
@@ -977,28 +951,4 @@ class UsersController extends Controller
return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
}
-
- /**
- * Normalize permissions payloads from request/model to a consistent associative array.
- *
- * @return array<string, mixed>
- */
- private function normalizePermissionsPayload(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/Http/Controllers/GroupsController.php b/app/Http/Controllers/GroupsController.php
index 9e5587d5da..5a77209f93 100755
--- a/app/Http/Controllers/GroupsController.php
+++ b/app/Http/Controllers/GroupsController.php
@@ -2,6 +2,7 @@
namespace App\Http\Controllers;
+use App\Actions\Permissions\NormalizePermissionsPayloadAction;
use App\Helpers\Helper;
use App\Models\Group;
use App\Models\User;
@@ -79,14 +80,12 @@ class GroupsController extends Controller
// create a new group instance
$group = new Group;
$group->name = $request->input('name');
-
- if ($request->filled('permission')) {
- $group->permissions = json_encode($request->array('permission'));
- } else {
- $group->permissions = null;
- }
-
- $group->permissions = json_encode($request->input('permission'));
+ $group->permissions = json_encode(
+ Helper::selectedPermissionsArray(
+ config('permissions'),
+ NormalizePermissionsPayloadAction::run($request->input('permission'))
+ )
+ );
$group->created_by = auth()->id();
$group->notes = $request->input('notes');
@@ -166,15 +165,22 @@ class GroupsController extends Controller
*/
public function update(Request $request, Group $group): RedirectResponse
{
- $group->name = $request->input('name');
+ if ($request->has('name')) {
+ $group->name = $request->input('name');
+ }
- if ($request->filled('permission')) {
- $group->permissions = json_encode($request->array('permission'));
- } else {
- $group->permissions = null;
+ if ($request->has('permission')) {
+ $group->permissions = json_encode(
+ Helper::selectedPermissionsArray(
+ config('permissions'),
+ NormalizePermissionsPayloadAction::run($request->input('permission'))
+ )
+ );
}
- $group->notes = $request->input('notes');
+ if ($request->has('notes')) {
+ $group->notes = $request->input('notes');
+ }
if (! config('app.lock_passwords')) {
if ($group->save()) {
diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php
index 7c4e1bce6b..84a86e6c3b 100755
--- a/app/Http/Controllers/Users/UsersController.php
+++ b/app/Http/Controllers/Users/UsersController.php
@@ -2,6 +2,8 @@
namespace App\Http\Controllers\Users;
+use App\Actions\Permissions\NormalizePermissionsPayloadAction;
+use App\Actions\Permissions\PreserveUnauthorizedPrivilegedPermissionsAction;
use App\Helpers\Helper;
use App\Http\Controllers\Controller;
use App\Http\Requests\DeleteUserRequest;
@@ -97,6 +99,8 @@ class UsersController extends Controller
public function store(SaveUserRequest $request)
{
$this->authorize('create', User::class);
+
+ $authenticatedUser = auth()->user();
$user = new User;
// Username, email, and password need to be handled specially because the need to respect config values on an edit.
$user->email = trim($request->input('email'));
@@ -130,26 +134,10 @@ class UsersController extends Controller
$user->end_date = $request->input('end_date', null);
$user->autoassign_licenses = $request->input('autoassign_licenses', 0);
- // Strip out the superuser permission if the user isn't a superadmin
- $permissions_array = $request->input('permission');
-
- // Strip out the individual superuser permission if the API user isn't a superadmin
- if (! auth()->user()->isSuperUser()) {
-
- if ((is_array($permissions_array)) && (array_key_exists('superuser', $permissions_array))) {
- unset($permissions_array['superuser']);
- }
- }
-
- // Strip out the individual admin permission if the API user isn't an admin
- if (! auth()->user()->isAdmin()) {
-
- if ((is_array($permissions_array)) && (array_key_exists('admin', $permissions_array))) {
- unset($permissions_array['admin']);
- }
- }
-
- $user->permissions = json_encode($permissions_array);
+ $user->permissions = json_encode(PreserveUnauthorizedPrivilegedPermissionsAction::run(
+ requestedPermissions: NormalizePermissionsPayloadAction::run($request->input('permission')),
+ authenticatedUser: $authenticatedUser,
+ ));
// we have to invoke the form request here to handle image uploads
app(ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
@@ -255,6 +243,8 @@ class UsersController extends Controller
{
$this->authorize('update', $user);
+ $authenticatedUser = auth()->user();
+
// This is a janky hack to prevent people from changing admin demo user data on the public demo.
// The $ids 1 and 2 are special since they are seeded as superadmins in the demo seeder.
// Thanks, jerks. You are why we can't have nice things. - snipe
@@ -271,21 +261,7 @@ class UsersController extends Controller
$this->authorize('update', $user);
- // Figure out of this user was an admin before this edit
- $orig_permissions_array = $user->decodePermissions();
- $orig_superuser = '0';
- $orig_admin = '0';
- if (is_array($orig_permissions_array)) {
- if (array_key_exists('superuser', $orig_permissions_array)) {
- $orig_superuser = $orig_permissions_array['superuser'];
- }
- }
-
- if (is_array($orig_permissions_array)) {
- if (array_key_exists('admin', $orig_permissions_array)) {
- $orig_admin = $orig_permissions_array['admin'];
- }
- }
+ $orig_permissions_array = NormalizePermissionsPayloadAction::run($user->decodePermissions());
// Update the user fields
@@ -335,23 +311,14 @@ class UsersController extends Controller
$user->password = bcrypt($request->input('password'));
}
- $permissions_array = $request->input('permission');
-
- // Strip out the superuser permission if the user isn't a superadmin
- if (! auth()->user()->isSuperUser()) {
- unset($permissions_array['superuser']);
- $permissions_array['superuser'] = $orig_superuser;
- }
-
- if ((! auth()->user()->isSuperUser()) && (! auth()->user()->isAdmin())) {
- unset($permissions_array['admin']);
- $permissions_array['admin'] = $orig_admin;
- }
-
- $user->permissions = json_encode($permissions_array);
+ $user->permissions = json_encode(PreserveUnauthorizedPrivilegedPermissionsAction::run(
+ requestedPermissions: NormalizePermissionsPayloadAction::run($request->input('permission')),
+ authenticatedUser: $authenticatedUser,
+ originalPermissions: $orig_permissions_array,
+ ));
// Only save groups if the user is a superuser
- if (auth()->user()->isSuperUser()) {
+ if (($request->has('groups')) && (auth()->user()->isSuperUser())) {
$user->groups()->sync($request->input('groups'));
}
}