Merge pull request #13 from TomHAnderson/feature/api-problem

Use ApiSkeletons\Laravel\ApiProblem

Author: TomHAnderson

composer.json

@@ -21,7 +21,8 @@
     ],
     "require": {
         "php": "^8.0",
-        "laravel-doctrine/orm": "^1.6"
+        "laravel-doctrine/orm": "^1.6",
+        "api-skeletons/laravel-api-problem": "^1.0.1"
     },
     "require-dev": {
         "doctrine/coding-standard": "^9.0",

src/Http/Middleware/AuthorizeApiKey.php

@@ -4,11 +4,11 @@
 
 namespace ApiSkeletons\Laravel\Doctrine\ApiKey\Http\Middleware;
 
+use ApiSkeletons\Laravel\ApiProblem\Facades\ApiProblem;
 use ApiSkeletons\Laravel\Doctrine\ApiKey\Service\ApiKeyService;
 use Closure;
 use Illuminate\Http\Request;
 
-use function response;
 use function substr;
 
 class AuthorizeApiKey
@@ -26,15 +26,11 @@ public function __construct(ApiKeyService $apiKeyService)
     public function handle(Request $request, Closure $next, ?string $scope = null): mixed
     {
         $header = $request->header('Authorization');
-        // Remove Bearer from key prefix
         if (! $header) {
-            return response([
-                'errors' => [
-                    ['message' => 'Unauthorized'],
-                ],
-            ], 401);
+            return ApiProblem::response('Missing the Authorization header', 401);
         }
 
+        // Remove Bearer from key prefix
         $key = substr($header, 7);
 
         $apiKey = $this->apiKeyService->isActive($key);
@@ -55,10 +51,6 @@ public function handle(Request $request, Closure $next, ?string $scope = null):
             }
         }
 
-        return response([
-            'errors' => [
-                ['message' => 'Unauthorized'],
-            ],
-        ], 401);
+        return ApiProblem::response('Invalid ApiKey', 401);
     }
 }

test/TestCase.php

@@ -15,6 +15,7 @@ protected function getPackageProviders($app)
         return [
             \LaravelDoctrine\ORM\DoctrineServiceProvider::class,
             \ApiSkeletons\Laravel\Doctrine\ApiKey\ServiceProvider::class,
+            \ApiSkeletons\Laravel\ApiProblem\ServiceProvider::class,
         ];
     }