fix: run node auth middleware before everything else

ptah-sh · Jul 5, 2024 · 3602de0 · 3602de0
1 parent baa93ec
commit 3602de0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/api-nodes/Http/Middleware/AgentTokenAuth.php b/api-nodes/Http/Middleware/AgentTokenAuth.php
@@ -24,9 +24,13 @@ public function handle(Request $request, Closure $next): Response
         $token = $request->header(self::AUTH_HEADER);
 
         if (!$token) {
+            if ($request->bearerToken()) {
+                return $next($request);
+            }
+
             return response()->json([
                 'message' => 'Unauthorized'
-            ], 401);
+            ], 403);
         }
 
         $node = Node::withoutGlobalScope(TeamScope::class)->with('team')->whereAgentToken($token)->firstOrFail();

diff --git a/bootstrap/app.php b/bootstrap/app.php
@@ -1,5 +1,6 @@
 <?php
 
+use ApiNodes\Http\Middleware\AgentTokenAuth;
 use App\Http\Middleware\HandleInertiaRequests;
 use App\Jobs\CheckAgentUpdates;
 use Illuminate\Console\Scheduling\Schedule;
@@ -21,6 +22,9 @@
         $middleware->trustProxies('*');
 
         $middleware
+            ->api(prepend: [
+                AgentTokenAuth::class,
+            ])
             ->web(append: [
                 HandleInertiaRequests::class,
                 AddLinkHeadersForPreloadedAssets::class,

diff --git a/routes/api.php b/routes/api.php
@@ -7,7 +7,7 @@
 use App\Api\Controllers\ServiceController;
 use Illuminate\Support\Facades\Route;
 
-Route::group(['prefix' => '/_nodes/v1', 'middleware' => [AgentTokenAuth::class]], function () {
+Route::group(['prefix' => '/_nodes/v1'], function () {
     Route::group(['prefix' => '/events'], function () {
         Route::post('/started', [EventController::class, 'started']);
     });