Skip to content

A free open source IT asset/license management system

Fixed tests

snipe03116f5ecec2
diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index 741adb8091..50c33f34ad 100644
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -633,6 +633,7 @@ class UsersController extends Controller
$this->authorize('delete', $user);
if (auth()->user()->can('canEditAuthFields', $user) && auth()->user()->can('editableOnDemo')) {
+
if ($user->delete()) {
// Remove the user's avatar if they have one
diff --git a/app/Http/Controllers/Users/BulkUsersController.php b/app/Http/Controllers/Users/BulkUsersController.php
index 0269f3fd0c..ee5831d270 100644
--- a/app/Http/Controllers/Users/BulkUsersController.php
+++ b/app/Http/Controllers/Users/BulkUsersController.php
@@ -312,7 +312,9 @@ class BulkUsersController extends Controller
foreach ($users as $user) {
$user->accessories()->sync([]);
if ($request->input('delete_user')=='1') {
- $user->delete();
+ if (auth()->user()->can('canEditAuthFields', $user) && auth()->user()->can('editableOnDemo')) {
+ $user->delete();
+ }
}
}
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index 114100f288..02aa53f44d 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -128,7 +128,7 @@ class AuthServiceProvider extends ServiceProvider
if ($item instanceof User) {
// if they can only edit users, deny them if the user is admin or superadmin
- if (($user->hasAccess('users.edit')) && (!$user->isAdmin()) && (!$user->isAdmin())) {
+ if (!$user->isAdmin()) {
if ($item->isAdmin() || $item->isSuperUser()) {
return false;
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 5e5ed9accb..92abfee787 100755
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -30,7 +30,7 @@
</style>
<div class="row">
- <div class="col-md-6 col-md-offset-3">
+ <div class="col-md-8 col-md-offset-2">
<form class="form-horizontal" method="post" autocomplete="off"
action="{{ (isset($user->id)) ? route('users.update', ['user' => $user->id]) : route('users.store') }}"
enctype="multipart/form-data" id="userForm">
diff --git a/tests/Feature/Users/Api/DeleteUsersTest.php b/tests/Feature/Users/Api/DeleteUsersTest.php
index a2e43f04bc..c3fd263123 100644
--- a/tests/Feature/Users/Api/DeleteUsersTest.php
+++ b/tests/Feature/Users/Api/DeleteUsersTest.php
@@ -152,4 +152,40 @@ class DeleteUsersTest extends TestCase implements TestsFullMultipleCompaniesSupp
$this->assertSoftDeleted($user);
}
+
+ public function testAdminCannotDeleteSuperUser()
+ {
+ $superuser = User::factory()->superuser()->create();
+ $admin = User::factory()->admin()->create();
+
+ $this->actingAsForApi($admin)
+ ->deleteJson(route('api.users.destroy', $superuser))
+ ->assertOk()
+ ->assertStatusMessageIs('error');
+
+ }
+
+ public function testUserCannotDeleteAdminUser()
+ {
+ $user = User::factory()->deleteUsers()->create();
+ $admin = User::factory()->admin()->create();
+
+ $this->actingAsForApi($user)
+ ->deleteJson(route('api.users.destroy', $admin))
+ ->assertOk()
+ ->assertStatusMessageIs('error');
+
+ }
+
+ public function testUserCannotDeleteSuperUser()
+ {
+ $user = User::factory()->deleteUsers()->create();
+ $superuser = User::factory()->superuser()->create();
+
+ $this->actingAsForApi($user)
+ ->deleteJson(route('api.users.destroy', $superuser))
+ ->assertOk()
+ ->assertStatusMessageIs('error');
+
+ }
}
diff --git a/tests/Feature/Users/Ui/BulkActions/BulkDeleteUsersTest.php b/tests/Feature/Users/Ui/BulkActions/BulkDeleteUsersTest.php
index 60b41ce613..c64d167df0 100644
--- a/tests/Feature/Users/Ui/BulkActions/BulkDeleteUsersTest.php
+++ b/tests/Feature/Users/Ui/BulkActions/BulkDeleteUsersTest.php
@@ -67,6 +67,42 @@ class BulkDeleteUsersTest extends TestCase
$this->assertNotSoftDeleted($actor);
}
+ public function test_user_cannot_perform_bulk_actions_on_admin()
+ {
+ $actor = User::factory()->editUsers()->create();
+ $admin = User::factory()->admin()->create();
+
+ $this->actingAs($actor)
+ ->post(route('users/bulksave'), [
+ 'ids' => [
+ $admin->id,
+ ],
+ 'delete_user' => '1',
+ ])
+ ->assertRedirect(route('users.index'))
+ ->assertSessionHas('success', trans('general.bulk_checkin_delete_success'));
+
+ $this->assertNotSoftDeleted($admin);
+ }
+
+ public function test_admin_cannot_perform_bulk_actions_on_superadmin()
+ {
+ $admin = User::factory()->admin()->create();
+ $superadmin = User::factory()->superuser()->create();
+
+ $this->actingAs($admin)
+ ->post(route('users/bulksave'), [
+ 'ids' => [
+ $superadmin->id,
+ ],
+ 'delete_user' => '1',
+ ])
+ ->assertRedirect(route('users.index'))
+ ->assertSessionHas('success', trans('general.bulk_checkin_delete_success'));
+
+ $this->assertNotSoftDeleted($superadmin);
+ }
+
public function test_accessories_can_be_bulk_checked_in()
{
[$accessoryA, $accessoryB] = Accessory::factory()->count(2)->create();
@@ -205,7 +241,7 @@ class BulkDeleteUsersTest extends TestCase
{
[$userA, $userB, $userC] = User::factory()->count(3)->create();
- $this->actingAs(User::factory()->editUsers()->create())
+ $this->actingAs(User::factory()->admin()->create())
->post(route('users/bulksave'), [
'ids' => [
$userA->id,
diff --git a/tests/Feature/Users/Ui/IndexUsersTest.php b/tests/Feature/Users/Ui/IndexUsersTest.php
index 020abdbcd9..5704db22c5 100644
--- a/tests/Feature/Users/Ui/IndexUsersTest.php
+++ b/tests/Feature/Users/Ui/IndexUsersTest.php
@@ -7,6 +7,13 @@ use Tests\TestCase;
class IndexUsersTest extends TestCase
{
+ public function testRequiresPermission()
+ {
+ $this->actingAsForApi(User::factory()->create())
+ ->get(route('users.index'))
+ ->assertForbidden();
+ }
+
public function testPageRenders()
{
$this->actingAs(User::factory()->viewUsers()->create())