Fix exception handling for DL routes

code16 · Oct 12, 2023 · cb576b8 · cb576b8
1 parent f1fdd74
commit cb576b8
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 18 deletions.
diff --git a/packages/form/src/components/fields/upload/Upload.vue b/packages/form/src/components/fields/upload/Upload.vue
@@ -220,7 +220,7 @@
                         </template>
                         <template v-if="value?.path">
                             <a class="text-sm text-primary-700 underline"
-                                :href="route('code16.sharp.api.download.show', {
+                                :href="route('code16.sharp.download.show', {
                                     entityKey: form.entityKey,
                                     instanceId: form.instanceId,
                                     disk: value.disk,

diff --git a/src/Exceptions/Auth/SharpAuthorizationException.php b/src/Exceptions/Auth/SharpAuthorizationException.php
@@ -3,8 +3,6 @@
 namespace Code16\Sharp\Exceptions\Auth;
 
 use Code16\Sharp\Exceptions\SharpException;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
 
 class SharpAuthorizationException extends SharpException
 {

diff --git a/src/Http/Middleware/Api/HandleSharpApiErrors.php b/src/Http/Middleware/Api/HandleSharpApiErrors.php
@@ -3,12 +3,7 @@
 namespace Code16\Sharp\Http\Middleware\Api;
 
 use Closure;
-use Code16\Sharp\Exceptions\Auth\SharpAuthorizationException;
-use Code16\Sharp\Exceptions\EntityList\SharpInvalidEntityStateException;
-use Code16\Sharp\Exceptions\Form\SharpApplicativeException;
-use Code16\Sharp\Exceptions\Form\SharpFormFieldValidationException;
 use Code16\Sharp\Exceptions\SharpException;
-use Code16\Sharp\Exceptions\SharpInvalidEntityKeyException;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Validation\ValidationException;

diff --git a/src/Http/Middleware/HandleSharpErrors.php b/src/Http/Middleware/HandleSharpErrors.php
@@ -7,14 +7,12 @@
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
+use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class HandleSharpErrors
 {
     public function handle(Request $request, Closure $next)
     {
-        /**
-         * @var \Illuminate\Http\Response $response
-         */
         $response = $next($request);
 
         if($response->exception instanceof ValidationException) {
@@ -26,6 +24,7 @@ public function handle(Request $request, Closure $next)
                 new SharpException(
                     $response->exception->getMessage(),
                     match(true) {
+                        $response->exception instanceof HttpException => $response->getStatusCode(),
                         $response->exception instanceof ModelNotFoundException => 404,
                         default => 500
                     },

diff --git a/src/routes.php b/src/routes.php
@@ -77,9 +77,6 @@
     Route::get('/search', [ApiSearchController::class, 'index'])
         ->name('code16.sharp.api.search.index');
 
-    Route::get('/download/{entityKey}/{instanceId?}', [DownloadController::class, 'show'])
-        ->name('code16.sharp.api.download.show');
-
     Route::post('/files/{entityKey}/{instanceId?}', [ApiFilesController::class, 'show'])
         ->name('code16.sharp.api.files.show');
 
@@ -134,6 +131,9 @@
     Route::get('/s-show/{entityKey}', [SingleShowController::class, 'show'])
         ->name('code16.sharp.single-show');
 
+    Route::get('/download/{entityKey}/{instanceId?}', [DownloadController::class, 'show'])
+        ->name('code16.sharp.download.show');
+
     Route::group([
         'prefix' => '/{uri}',
         'where' => ['uri' => '(s-list|s-show)/.*'],

diff --git a/tests/Http/Api/DownloadControllerTest.php b/tests/Http/Api/DownloadControllerTest.php
@@ -22,7 +22,7 @@
 
     $response = $this
         ->get(
-            route('code16.sharp.api.download.show', [
+            route('code16.sharp.download.show', [
                 'entityKey' => 'person',
                 'instanceId' => 1,
                 'disk' => 'local',
@@ -41,7 +41,7 @@
 
     $response = $this
         ->get(
-            route('code16.sharp.api.download.show', [
+            route('code16.sharp.download.show', [
                 'entityKey' => 'person',
                 'instanceId' => 1,
                 'disk' => 'local',
@@ -61,7 +61,7 @@
             url('/sharp/s-list/person/s-form/person/1'),
         )
         ->get(
-            route('code16.sharp.api.download.show', [
+            route('code16.sharp.download.show', [
                 'entityKey' => 'person',
                 'instanceId' => 1,
                 'fileName' => 'test.jpg',
@@ -77,7 +77,7 @@
 
     $this
         ->get(
-            route('code16.sharp.api.download.show', [
+            route('code16.sharp.download.show', [
                 'entityKey' => 'person',
                 'instanceId' => 1,
                 'disk' => 'local',