A free open source IT asset/license management system
Unset admin if auth user is not admin
snipe83e61ec8cd65
diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.phpindex 2b02bb8faf..9804852b1b 100644--- a/app/Http/Controllers/Api/UsersController.php+++ b/app/Http/Controllers/Api/UsersController.php@@ -450,10 +450,18 @@ class UsersController extends Controllerif ($request->has('permissions')) {$permissions_array = $request->input('permissions');- // Strip out the superuser permission if the API user isn't a superadminif (! auth()->user()->isSuperUser()) {- unset($permissions_array['superuser']);+ 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;}@@ -589,23 +597,24 @@ class UsersController extends Controller$permissions_array = $request->input('permissions');- \Log::error(print_r($permissions_array, true));// Strip out the individual superuser permission if the API user isn't a superadminif (!auth()->user()->isSuperUser()) {- if (array_key_exists('superuser', $permissions_array)) {++ 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 adminif (!auth()->user()->isAdmin()) {+if ((is_array($permissions_array)) && (array_key_exists('admin', $permissions_array))) {unset($permissions_array['admin']);}-}+$user->permissions = $permissions_array;}diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.phpindex 11f008ffea..fa273b3a28 100755--- a/app/Http/Controllers/Users/UsersController.php+++ b/app/Http/Controllers/Users/UsersController.php@@ -122,9 +122,22 @@ class UsersController extends Controller// Strip out the superuser permission if the user isn't a superadmin$permissions_array = $request->input('permission');- if (! auth()->user()->isSuperUser()) {- unset($permissions_array['superuser']);+ // 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);// we have to invoke the form request here to handle image uploads