A free open source IT asset/license management system
Allow checking in from unfound targets
Marcus Moorecada43f34d20
diff --git a/app/Http/Controllers/Api/LicenseSeatsController.php b/app/Http/Controllers/Api/LicenseSeatsController.phpindex 19477b6d6e..bd24986c8e 100644--- a/app/Http/Controllers/Api/LicenseSeatsController.php+++ b/app/Http/Controllers/Api/LicenseSeatsController.php@@ -174,7 +174,11 @@ class LicenseSeatsController extends Controller}if ($assignmentTouched && is_null($target)){- return response()->json(Helper::formatStandardApiResponse('error', null, 'Target not found'));+ // if both asset_id and assigned_to are null then we are "checking-in"+ // a related model that does not exist (possible purged or bad data).+ if (!is_null($request->input('asset_id')) || !is_null($request->input('assigned_to'))) {+ return response()->json(Helper::formatStandardApiResponse('error', null, 'Target not found'));+ }}if ($licenseSeat->save()) {diff --git a/tests/Feature/LicenseSeats/Api/LicenseSeatUpdateTest.php b/tests/Feature/LicenseSeats/Api/LicenseSeatUpdateTest.phpindex c7f92b9023..a8839151b5 100644--- a/tests/Feature/LicenseSeats/Api/LicenseSeatUpdateTest.php+++ b/tests/Feature/LicenseSeats/Api/LicenseSeatUpdateTest.php@@ -109,12 +109,13 @@ class LicenseSeatUpdateTest extends TestCase$licenseSeat->refresh();$this->assertNull($licenseSeat->assigned_to);+ $this->assertNull($licenseSeat->asset_id);$this->assertDatabaseHas('action_logs', ['action_type' => 'checkin from','target_id' => $asset->id,'target_type' => Asset::class,- 'note' => '',+ 'note' => null,'item_type' => License::class,'item_id' => $licenseSeat->license_id,'quantity' => 1,@@ -150,20 +151,13 @@ class LicenseSeatUpdateTest extends TestCase'notes' => 'Attempting to reassign an unreassignable seat',])->assertStatus(200)- ->assertStatusMessageIs('error');+ ->assertStatusMessageIs('error')+ ->assertJsonFragment([+ 'messages' => trans('admin/licenses/message.checkout.unavailable'),+ ]);$licenseSeat->refresh();- $this->assertNull($licenseSeat->asset_id);-- $this->assertDatabaseHas('action_logs', [- 'action_type' => 'checkin from',- 'target_id' => $user->id,- 'target_type' => User::class,- 'note' => 'Attempting to reassign an unreassignable seat',- 'item_type' => License::class,- 'item_id' => $licenseSeat->license_id,- 'quantity' => 1,- ]);+ $this->assertEquals($user->id, $licenseSeat->assigned_to);}/**************************************************************************@@ -333,12 +327,12 @@ class LicenseSeatUpdateTest extends TestCasepublic function test_license_seat_checked_out_to_purged_asset_can_be_checked_in_when_updating(){- $asset = Asset::factory()->create();- $licenseSeat = LicenseSeat::factory()->assignedToAsset($asset)->create(['asset_id' => 100000]);+ $licenseSeat = LicenseSeat::factory()->create(['asset_id' => 100000]);$this->actingAsForApi(User::factory()->checkoutLicenses()->create())->patchJson($this->route($licenseSeat), ['asset_id' => null,+ 'assigned_to' => null,'notes' => 'Checking in the seat',])->assertStatus(200)@@ -350,8 +344,10 @@ class LicenseSeatUpdateTest extends TestCase$this->assertDatabaseHas('action_logs', ['action_type' => 'checkin from',- 'target_id' => $asset->id,- 'target_type' => Asset::class,+ // this will be null and not 100000+ // because the asset is not in the system+ 'target_id' => null,+ 'target_type' => null,'note' => 'Checking in the seat','item_type' => License::class,'item_id' => $licenseSeat->license_id,@@ -361,11 +357,12 @@ class LicenseSeatUpdateTest extends TestCasepublic function test_license_seat_checked_out_to_purged_user_can_be_checked_in_when_updating(){- $user = User::factory()->create();- $licenseSeat = LicenseSeat::factory()->unreassignable()->assignedToUser($user)->create(['assigned_to' => 100000]);+ $licenseSeat = LicenseSeat::factory()->unreassignable()->create(['assigned_to' => 100000]);$this->actingAsForApi(User::factory()->checkoutLicenses()->create())->patchJson($this->route($licenseSeat), [+ // purposefully leaving asset_id off here+ // because it is a realistic scenario.'assigned_to' => null,'notes' => 'Checking in the seat',])@@ -378,8 +375,10 @@ class LicenseSeatUpdateTest extends TestCase$this->assertDatabaseHas('action_logs', ['action_type' => 'checkin from',- 'target_id' => $user->id,- 'target_type' => User::class,+ // this will be null and not 100000+ // because the user is not in the system+ 'target_id' => null,+ 'target_type' => null,'note' => 'Checking in the seat','item_type' => License::class,'item_id' => $licenseSeat->license_id,diff --git a/tests/Support/CustomTestMacros.php b/tests/Support/CustomTestMacros.phpindex ae24f738cf..be9a527f4c 100644--- a/tests/Support/CustomTestMacros.php+++ b/tests/Support/CustomTestMacros.php@@ -112,8 +112,6 @@ trait CustomTestMacrosfunction (array|string $keys) {Assert::assertArrayHasKey('messages', $this, 'Response did not contain any messages');- Assert::assertIsArray($this['messages'], '"messages" not an array so specific message existence cannot be checked.');-if (is_string($keys)) {$keys = [$keys];}