From 0972c4e34021f96b3900f25eedc424d4975af375 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 10 Jul 2025 13:06:22 +0100 Subject: [PATCH] Re-added /hardware/ as viable route for API file uploads Signed-off-by: snipe --- app/Http/Controllers/Api/UploadedFilesController.php | 3 +++ routes/api.php | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Api/UploadedFilesController.php b/app/Http/Controllers/Api/UploadedFilesController.php index 12dbfd6ec8..ed7a716dcf 100644 --- a/app/Http/Controllers/Api/UploadedFilesController.php +++ b/app/Http/Controllers/Api/UploadedFilesController.php @@ -33,6 +33,7 @@ class UploadedFilesController extends Controller 'assets' => Asset::class, 'components' => Component::class, 'consumables' => Consumable::class, + 'hardware' => Asset::class, 'licenses' => License::class, 'locations' => Location::class, 'models' => AssetModel::class, @@ -44,6 +45,7 @@ class UploadedFilesController extends Controller 'assets' => 'private_uploads/assets/', 'components' => 'private_uploads/components/', 'consumables' => 'private_uploads/consumables/', + 'hardware' => 'private_uploads/assets/', 'licenses' => 'private_uploads/licenses/', 'locations' => 'private_uploads/locations/', 'models' => 'private_uploads/assetmodels/', @@ -55,6 +57,7 @@ class UploadedFilesController extends Controller 'assets' => 'asset', 'components' => 'component', 'consumables' => 'consumable', + 'hardware' => 'asset', 'licenses' => 'license', 'locations' => 'location', 'models' => 'model', diff --git a/routes/api.php b/routes/api.php index 389e9f45dd..eeb644d13a 100644 --- a/routes/api.php +++ b/routes/api.php @@ -1314,7 +1314,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'api-throttle:api']], fu 'index' ] )->name('api.files.index') - ->where(['object_type' => 'assets|models|users|locations|accessories|consumables|licenses|components']); + ->where(['object_type' => 'assets|hardware|models|users|locations|accessories|consumables|licenses|components']); // Get a file Route::get('{object_type}/{id}/files/{file_id}', @@ -1323,7 +1323,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'api-throttle:api']], fu 'show' ] )->name('api.files.show') - ->where(['object_type' => 'assets|models|users|locations|accessories|consumables|licenses|components']); + ->where(['object_type' => 'assets|hardware|models|users|locations|accessories|consumables|licenses|components']); // Upload files(s) Route::post('{object_type}/{id}/files', @@ -1332,7 +1332,7 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'api-throttle:api']], fu 'store' ] )->name('api.files.store') - ->where(['object_type' => 'assets|models|users|locations|accessories|consumables|licenses|components']); + ->where(['object_type' => 'assets|hardware|models|users|locations|accessories|consumables|licenses|components']); // Delete files(s) Route::delete('{object_type}/{id}/files/{file_id}/delete', @@ -1341,6 +1341,6 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'api-throttle:api']], fu 'destroy' ] )->name('api.files.destroy') - ->where(['object_type' => 'assets|models|users|locations|accessories|consumables|licenses|components']); + ->where(['object_type' => 'assets|hardware|models|users|locations|accessories|consumables|licenses|components']); }); // end API routes