From 92ae06962942f985822f2ba888cfabbb70f74223 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 7 May 2024 12:06:35 +0100 Subject: [PATCH 01/14] Disable button in UI if user cannot be deleted Signed-off-by: snipe --- resources/views/users/view.blade.php | 67 ++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 9 deletions(-) diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index 3dbd9ff53..7a9d0f579 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -91,7 +91,7 @@ @if ($user->managedLocations()->count() >= 0 )
  • - +
    • @endif - @can('update', $user) + @if ($user->managesUsers()->count() >= 0 ) +
  • + + + +
    • + @endif + + + @can('update', $user)
  • @@ -114,7 +126,7 @@ @@ -221,11 +233,15 @@ @can('delete', $user) @if ($user->deleted_at=='')
    -
    - {{csrf_field()}} - {{ method_field("DELETE")}} - -
    + @if ($user->isDeletable()) +
    + {{csrf_field()}} + {{ method_field("DELETE")}} + +
    + @else + + @endif
    @@ -1014,7 +1030,7 @@
    -
    +
    @include('partials.locations-bulk-actions') @@ -1046,6 +1062,39 @@
    + +
    + + @include('partials.locations-bulk-actions') + + + +
    + +
    From 2b4a536f854d830c48fa1f8730294032c6cc895c Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 7 May 2024 12:06:54 +0100 Subject: [PATCH 02/14] Added CSS for users, locations Signed-off-by: snipe --- public/css/build/app.css | 10 ++++++++++ public/css/build/overrides.css | 10 ++++++++++ public/css/dist/all.css | 20 ++++++++++++++++++++ public/mix-manifest.json | 6 +++--- resources/assets/less/overrides.less | 9 +++++++++ 5 files changed, 52 insertions(+), 3 deletions(-) diff --git a/public/css/build/app.css b/public/css/build/app.css index e527c35aa..8f90c8128 100644 --- a/public/css/build/app.css +++ b/public/css/build/app.css @@ -935,6 +935,16 @@ th.css-accessory > .th-inner::before { font-family: "Font Awesome 5 Free"; font-weight: 400; } +th.css-users > .th-inner::before { + content: "\f0c0"; + font-family: "Font Awesome 5 Free"; + font-weight: 400; +} +th.css-location > .th-inner::before { + content: "\f3c5"; + font-family: "Font Awesome 5 Free"; + font-weight: 400; +} .small-box .inner { padding-left: 15px; padding-right: 15px; diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index fe8cb67e8..b07f92576 100644 --- a/public/css/build/overrides.css +++ b/public/css/build/overrides.css @@ -568,6 +568,16 @@ th.css-accessory > .th-inner::before { font-family: "Font Awesome 5 Free"; font-weight: 400; } +th.css-users > .th-inner::before { + content: "\f0c0"; + font-family: "Font Awesome 5 Free"; + font-weight: 400; +} +th.css-location > .th-inner::before { + content: "\f3c5"; + font-family: "Font Awesome 5 Free"; + font-weight: 400; +} .small-box .inner { padding-left: 15px; padding-right: 15px; diff --git a/public/css/dist/all.css b/public/css/dist/all.css index ac39c8698..18cee0a52 100644 --- a/public/css/dist/all.css +++ b/public/css/dist/all.css @@ -22462,6 +22462,16 @@ th.css-accessory > .th-inner::before { font-family: "Font Awesome 5 Free"; font-weight: 400; } +th.css-users > .th-inner::before { + content: "\f0c0"; + font-family: "Font Awesome 5 Free"; + font-weight: 400; +} +th.css-location > .th-inner::before { + content: "\f3c5"; + font-family: "Font Awesome 5 Free"; + font-weight: 400; +} .small-box .inner { padding-left: 15px; padding-right: 15px; @@ -23740,6 +23750,16 @@ th.css-accessory > .th-inner::before { font-family: "Font Awesome 5 Free"; font-weight: 400; } +th.css-users > .th-inner::before { + content: "\f0c0"; + font-family: "Font Awesome 5 Free"; + font-weight: 400; +} +th.css-location > .th-inner::before { + content: "\f3c5"; + font-family: "Font Awesome 5 Free"; + font-weight: 400; +} .small-box .inner { padding-left: 15px; padding-right: 15px; diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 2798a8307..66a79fdf0 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,8 +1,8 @@ { "/js/build/app.js": "/js/build/app.js?id=ea5f3edebafdb29b616d23fa89106080", "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374", - "/css/build/overrides.css": "/css/build/overrides.css?id=be3c0a217bc6c0e0744f75faed784887", - "/css/build/app.css": "/css/build/app.css?id=a168b0a799aa800ee926bffa1b1a434a", + "/css/build/overrides.css": "/css/build/overrides.css?id=ae6071a2aee6a6cacdfa2a14cc27fac0", + "/css/build/app.css": "/css/build/app.css?id=941bcfefadb4f55d7edeb366b51f573b", "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=dc383f8560a8d4adb51d44fb4043e03b", "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=6f0563e726c2fe4fab4026daaa5bfdf2", "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=620b684d9dd9d3bb5fdda00a3a2467c3", @@ -18,7 +18,7 @@ "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=0a82a6ae6bb4e58fe62d162c4fb50397", "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=da6c7997d9de2f8329142399f0ce50da", "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=44bf834f2110504a793dadec132a5898", - "/css/dist/all.css": "/css/dist/all.css?id=6e9aa08b535262053b95aee495caa7df", + "/css/dist/all.css": "/css/dist/all.css?id=cb1d0d1f0f925e59cf79bdf088e09aa8", "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/css/webfonts/fa-brands-400.ttf": "/css/webfonts/fa-brands-400.ttf?id=0141634c24336be626e05c8b77d1fa27", diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index 31e85ca26..423728d5c 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -649,6 +649,15 @@ th.css-accessory > .th-inner::before content: "\f11c"; font-family: "Font Awesome 5 Free"; font-weight: 400; } +th.css-users > .th-inner::before { + content: "\f0c0"; font-family: "Font Awesome 5 Free"; font-weight: 400; +} + +th.css-location > .th-inner::before { + content: "\f3c5"; font-family: "Font Awesome 5 Free"; font-weight: 400; +} + + .small-box .inner { padding-left: 15px; padding-right: 15px; From f769e8247f2740fa6708a20a65bd0279d7e7047d Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 7 May 2024 12:07:15 +0100 Subject: [PATCH 03/14] Added ManagedUsers method, additional checks in isDeletable() Signed-off-by: snipe --- app/Models/User.php | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/app/Models/User.php b/app/Models/User.php index e535fa0fd..e30136703 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -214,10 +214,12 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo public function isDeletable() { return Gate::allows('delete', $this) - && ($this->assets()->count() === 0) - && ($this->licenses()->count() === 0) - && ($this->consumables()->count() === 0) - && ($this->accessories()->count() === 0) + && ($this->assets->count() === 0) + && ($this->licenses->count() === 0) + && ($this->consumables->count() === 0) + && ($this->accessories->count() === 0) + && ($this->managedLocations->count() === 0) + && ($this->managesUsers->count() === 0) && ($this->deleted_at == ''); } @@ -410,6 +412,19 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo return $this->belongsTo(self::class, 'manager_id')->withTrashed(); } + /** + * Establishes the user -> managed users relationship + * + * @author A. Gianotto + * @since [v6.4.1] + * @return \Illuminate\Database\Eloquent\Relations\Relation + */ + public function managesUsers() + { + return $this->hasMany(\App\Models\User::class, 'manager_id'); + } + + /** * Establishes the user -> managed locations relationship * From 410b547f3c697b4a1ac9772820b644f21b2fa5dd Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 7 May 2024 12:07:28 +0100 Subject: [PATCH 04/14] Added users and locatipon count to API Signed-off-by: snipe --- app/Http/Controllers/Api/UsersController.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index ba1a5366f..66efb030a 100644 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -76,7 +76,7 @@ class UsersController extends Controller 'users.website', ])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables', 'createdBy',) - ->withCount('assets as assets_count', 'licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count'); + ->withCount('assets as assets_count', 'licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count', 'managesUsers as manages_user_count', 'managedLocations as manages_location_count'); if ($request->filled('activated')) { @@ -187,6 +187,14 @@ class UsersController extends Controller $users->has('accessories', '=', $request->input('accessories_count')); } + if ($request->filled('manages_users_count')) { + $users->has('manages_users_count', '=', $request->input('manages_users_count')); + } + + if ($request->filled('manages_locations_count')) { + $users->has('manages_locations_count', '=', $request->input('manages_locations_count')); + } + if ($request->filled('autoassign_licenses')) { $users->where('autoassign_licenses', '=', $request->input('autoassign_licenses')); } @@ -244,6 +252,8 @@ class UsersController extends Controller 'licenses_count', 'consumables_count', 'accessories_count', + 'manages_user_count', + 'managed_locations_count', 'phone', 'address', 'city', From 482965197d513843403bd74c6cbd2965a7e729e1 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 7 May 2024 12:07:41 +0100 Subject: [PATCH 05/14] Added users, locations to presenter, transformer Signed-off-by: snipe --- app/Http/Transformers/UsersTransformer.php | 2 ++ app/Presenters/UserPresenter.php | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/app/Http/Transformers/UsersTransformer.php b/app/Http/Transformers/UsersTransformer.php index 0ebaca269..5befc8abb 100644 --- a/app/Http/Transformers/UsersTransformer.php +++ b/app/Http/Transformers/UsersTransformer.php @@ -64,6 +64,8 @@ class UsersTransformer 'licenses_count' => (int) $user->licenses_count, 'accessories_count' => (int) $user->accessories_count, 'consumables_count' => (int) $user->consumables_count, + 'manages_users_count' => (int) $user->manages_users_count, + 'manages_locations_count' => (int) $user->manages_locations_count, 'company' => ($user->company) ? ['id' => (int) $user->company->id, 'name'=> e($user->company->name)] : null, 'created_by' => ($user->createdBy) ? [ 'id' => (int) $user->createdBy->id, diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php index 4726205c7..600d6e507 100644 --- a/app/Presenters/UserPresenter.php +++ b/app/Presenters/UserPresenter.php @@ -251,6 +251,24 @@ class UserPresenter extends Presenter 'title' => 'Accessories', 'visible' => true, ], + [ + 'field' => 'manages_users_count', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'class' => 'css-users', + 'title' => 'Managed Users', + 'visible' => true, + ], + [ + 'field' => 'manages_locations_count', + 'searchable' => false, + 'sortable' => true, + 'switchable' => true, + 'class' => 'css-location', + 'title' => 'Managed Locations', + 'visible' => true, + ], [ 'field' => 'notes', 'searchable' => true, From 49dc9767b6f4078bcc2d155eb5f176c6ea79b085 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 7 May 2024 15:54:43 +0100 Subject: [PATCH 06/14] Added debugging :( Signed-off-by: snipe --- app/Http/Controllers/Api/UsersController.php | 4 ++-- app/Http/Transformers/UsersTransformer.php | 5 +++++ public/css/build/app.css | 6 ++++-- public/css/build/overrides.css | 6 ++++-- public/css/dist/all.css | 12 ++++++++---- public/mix-manifest.json | 6 +++--- resources/assets/less/overrides.less | 6 +++--- resources/views/users/view.blade.php | 4 ++-- 8 files changed, 31 insertions(+), 18 deletions(-) diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index 66efb030a..ae8def089 100644 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -75,7 +75,7 @@ class UsersController extends Controller 'users.autoassign_licenses', 'users.website', - ])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables', 'createdBy',) + ])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables', 'createdBy') ->withCount('assets as assets_count', 'licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count', 'managesUsers as manages_user_count', 'managedLocations as manages_location_count'); @@ -253,7 +253,7 @@ class UsersController extends Controller 'consumables_count', 'accessories_count', 'manages_user_count', - 'managed_locations_count', + 'manages_locations_count', 'phone', 'address', 'city', diff --git a/app/Http/Transformers/UsersTransformer.php b/app/Http/Transformers/UsersTransformer.php index 5befc8abb..5ecc2ed6d 100644 --- a/app/Http/Transformers/UsersTransformer.php +++ b/app/Http/Transformers/UsersTransformer.php @@ -21,6 +21,11 @@ class UsersTransformer public function transformUser(User $user) { + \Log::debug('users count: '.$user->manages_users_count); + \Log::debug('locations count: '.$user->manages_locations_count); + \Log::debug('users count method: '.$user->managesUsers()->count()); + \Log::debug('locations count method: '.$user->managedLocations()->count()); + \Log::debug('-----------'); $array = [ 'id' => (int) $user->id, 'avatar' => e($user->present()->gravatar), diff --git a/public/css/build/app.css b/public/css/build/app.css index 8f90c8128..b478bebbe 100644 --- a/public/css/build/app.css +++ b/public/css/build/app.css @@ -908,6 +908,7 @@ th.css-padlock > .th-inner::before { font-size: 12px; } /** +BEGIN ICON TABLE HEADERS Set the font-weight css property as 900 (For Solid), 400 (Regular or Brands), 300 (Light for pro icons). **/ th.css-barcode > .th-inner::before { @@ -938,12 +939,13 @@ th.css-accessory > .th-inner::before { th.css-users > .th-inner::before { content: "\f0c0"; font-family: "Font Awesome 5 Free"; - font-weight: 400; + font-size: 15px; } th.css-location > .th-inner::before { content: "\f3c5"; font-family: "Font Awesome 5 Free"; - font-weight: 400; + font-size: 19px; + margin-bottom: 0px; } .small-box .inner { padding-left: 15px; diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index b07f92576..38dbbea0d 100644 --- a/public/css/build/overrides.css +++ b/public/css/build/overrides.css @@ -541,6 +541,7 @@ th.css-padlock > .th-inner::before { font-size: 12px; } /** +BEGIN ICON TABLE HEADERS Set the font-weight css property as 900 (For Solid), 400 (Regular or Brands), 300 (Light for pro icons). **/ th.css-barcode > .th-inner::before { @@ -571,12 +572,13 @@ th.css-accessory > .th-inner::before { th.css-users > .th-inner::before { content: "\f0c0"; font-family: "Font Awesome 5 Free"; - font-weight: 400; + font-size: 15px; } th.css-location > .th-inner::before { content: "\f3c5"; font-family: "Font Awesome 5 Free"; - font-weight: 400; + font-size: 19px; + margin-bottom: 0px; } .small-box .inner { padding-left: 15px; diff --git a/public/css/dist/all.css b/public/css/dist/all.css index 18cee0a52..778954654 100644 --- a/public/css/dist/all.css +++ b/public/css/dist/all.css @@ -22435,6 +22435,7 @@ th.css-padlock > .th-inner::before { font-size: 12px; } /** +BEGIN ICON TABLE HEADERS Set the font-weight css property as 900 (For Solid), 400 (Regular or Brands), 300 (Light for pro icons). **/ th.css-barcode > .th-inner::before { @@ -22465,12 +22466,13 @@ th.css-accessory > .th-inner::before { th.css-users > .th-inner::before { content: "\f0c0"; font-family: "Font Awesome 5 Free"; - font-weight: 400; + font-size: 15px; } th.css-location > .th-inner::before { content: "\f3c5"; font-family: "Font Awesome 5 Free"; - font-weight: 400; + font-size: 19px; + margin-bottom: 0px; } .small-box .inner { padding-left: 15px; @@ -23723,6 +23725,7 @@ th.css-padlock > .th-inner::before { font-size: 12px; } /** +BEGIN ICON TABLE HEADERS Set the font-weight css property as 900 (For Solid), 400 (Regular or Brands), 300 (Light for pro icons). **/ th.css-barcode > .th-inner::before { @@ -23753,12 +23756,13 @@ th.css-accessory > .th-inner::before { th.css-users > .th-inner::before { content: "\f0c0"; font-family: "Font Awesome 5 Free"; - font-weight: 400; + font-size: 15px; } th.css-location > .th-inner::before { content: "\f3c5"; font-family: "Font Awesome 5 Free"; - font-weight: 400; + font-size: 19px; + margin-bottom: 0px; } .small-box .inner { padding-left: 15px; diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 66a79fdf0..f8707dfe0 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,8 +1,8 @@ { "/js/build/app.js": "/js/build/app.js?id=ea5f3edebafdb29b616d23fa89106080", "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374", - "/css/build/overrides.css": "/css/build/overrides.css?id=ae6071a2aee6a6cacdfa2a14cc27fac0", - "/css/build/app.css": "/css/build/app.css?id=941bcfefadb4f55d7edeb366b51f573b", + "/css/build/overrides.css": "/css/build/overrides.css?id=f27d47cadeee40c2b3ddd8b65ddafd65", + "/css/build/app.css": "/css/build/app.css?id=2f7abcd688deda0abb931c82c0d2a490", "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=dc383f8560a8d4adb51d44fb4043e03b", "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=6f0563e726c2fe4fab4026daaa5bfdf2", "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=620b684d9dd9d3bb5fdda00a3a2467c3", @@ -18,7 +18,7 @@ "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=0a82a6ae6bb4e58fe62d162c4fb50397", "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=da6c7997d9de2f8329142399f0ce50da", "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=44bf834f2110504a793dadec132a5898", - "/css/dist/all.css": "/css/dist/all.css?id=cb1d0d1f0f925e59cf79bdf088e09aa8", + "/css/dist/all.css": "/css/dist/all.css?id=806674878c4c4d81a426203b30d90c98", "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/css/webfonts/fa-brands-400.ttf": "/css/webfonts/fa-brands-400.ttf?id=0141634c24336be626e05c8b77d1fa27", diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index 423728d5c..b92170d16 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -621,6 +621,7 @@ th.css-padlock > .th-inner::before } /** +BEGIN ICON TABLE HEADERS Set the font-weight css property as 900 (For Solid), 400 (Regular or Brands), 300 (Light for pro icons). **/ th.css-barcode > .th-inner::before @@ -643,18 +644,17 @@ th.css-envelope > .th-inner::before content: "\f0e0"; font-family: "Font Awesome 5 Free"; font-weight: 400; } - th.css-accessory > .th-inner::before { content: "\f11c"; font-family: "Font Awesome 5 Free"; font-weight: 400; } th.css-users > .th-inner::before { - content: "\f0c0"; font-family: "Font Awesome 5 Free"; font-weight: 400; + content: "\f0c0"; font-family: "Font Awesome 5 Free"; font-size: 15px; } th.css-location > .th-inner::before { - content: "\f3c5"; font-family: "Font Awesome 5 Free"; font-weight: 400; + content: "\f3c5"; font-family: "Font Awesome 5 Free"; font-size: 19px; margin-bottom: 0px; } diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index 7a9d0f579..225670c65 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -89,7 +89,7 @@
    • - @if ($user->managedLocations()->count() >= 0 ) + @if ($user->managedLocations->count() >= 0 )
    • @endif - @if ($user->managesUsers()->count() >= 0 ) + @if ($user->managesUsers->count() >= 0 )
  • + From 386b2839e860e3e5de22154a02b804e3faf145c7 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 7 May 2024 18:59:24 +0100 Subject: [PATCH 13/14] Added tests Signed-off-by: snipe --- tests/Feature/Api/Users/UsersDeleteTest.php | 42 +++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 tests/Feature/Api/Users/UsersDeleteTest.php diff --git a/tests/Feature/Api/Users/UsersDeleteTest.php b/tests/Feature/Api/Users/UsersDeleteTest.php new file mode 100644 index 000000000..cbdba8327 --- /dev/null +++ b/tests/Feature/Api/Users/UsersDeleteTest.php @@ -0,0 +1,42 @@ +create(['first_name' => 'Manager', 'last_name' => 'McManagerson']); + User::factory()->create(['first_name' => 'Lowly', 'last_name' => 'Worker', 'manager_id' => $manager->id]); + $this->actingAs(User::factory()->deleteUsers()->create())->assertFalse($manager->isDeletable()); + } + + public function testDisallowUserDeletionIfStillManagingLocations() + { + $manager = User::factory()->create(['first_name' => 'Manager', 'last_name' => 'McManagerson']); + Location::factory()->create(['manager_id' => $manager->id]); + $this->actingAs(User::factory()->deleteUsers()->create())->assertFalse($manager->isDeletable()); + } + + public function testAllowUserDeletionIfNotManagingLocations() + { + $manager = User::factory()->create(['first_name' => 'Manager', 'last_name' => 'McManagerson']); + $this->actingAs(User::factory()->deleteUsers()->create())->assertTrue($manager->isDeletable()); + } + + public function testDisallowUserDeletionIfNoDeletePermissions() + { + $manager = User::factory()->create(['first_name' => 'Manager', 'last_name' => 'McManagerson']); + Location::factory()->create(['manager_id' => $manager->id]); + $this->actingAs(User::factory()->editUsers()->create())->assertFalse($manager->isDeletable()); + } + + +} From 8c327e6523fe170606124b823abdcbe85e92b41a Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 7 May 2024 19:16:56 +0100 Subject: [PATCH 14/14] Handle user not found properly Signed-off-by: snipe --- app/Http/Controllers/Api/UsersController.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index f2f2f28b8..0faa54124 100644 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -416,11 +416,14 @@ class UsersController extends Controller $this->authorize('view', User::class); $user = User::withCount('assets as assets_count', 'licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count', 'managesUsers as manages_users_count', 'managedLocations as manages_locations_count'); - $user = Company::scopeCompanyables($user)->find($id); - $this->authorize('view', $user); + if ($user = Company::scopeCompanyables($user)->find($id)) { + $this->authorize('view', $user); + return (new UsersTransformer)->transformUser($user); + } + + return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.user_not_found', compact('id')))); - return (new UsersTransformer)->transformUser($user); }