Made user nullable

Author: MackenzieMolloy

app/Contracts/Repository/ApiKeyRepositoryInterface.php

@@ -15,7 +15,7 @@ public function getAccountKeys(User $user): Collection;
     /**
      * Get all the application API keys that exist.
      */
-    public function getApplicationKeys(): Collection;
+    public function getApplicationKeys(?User $user = null): Collection;
 
     /**
      * Delete an account API key from the panel for a specific user.
@@ -25,5 +25,5 @@ public function deleteAccountKey(User $user, string $identifier): int;
     /**
      * Delete an application API key from the panel.
      */
-    public function deleteApplicationKey(string $identifier): int;
+    public function deleteApplicationKey(?User $user = null, string $identifier): int;
 }

app/Http/Controllers/Admin/ApiController.php

@@ -78,7 +78,7 @@ public function store(StoreApplicationApiKeyRequest $request): RedirectResponse
      */
     public function delete(Request $request, string $identifier): Response
     {
-        $this->repository->deleteApplicationKey($identifier);
+        $this->repository->deleteApplicationKey(null, $identifier);
 
         return response('', 204);
     }

app/Http/Controllers/Admin/NodeAutoDeployController.php

@@ -32,7 +32,7 @@ public function __construct(
     public function __invoke(Request $request, Node $node): JsonResponse
     {
         /** @var ApiKey|null $key */
-        $key = $this->repository->getApplicationKeys()
+        $key = $this->repository->getApplicationKeys($request->user())
             ->filter(function (ApiKey $key) {
                 if ($key->user->id != $request->user()->id) return false;
                 foreach ($key->getAttributes() as $permission => $value) {

app/Repositories/Eloquent/ApiKeyRepository.php

@@ -28,14 +28,33 @@ public function getAccountKeys(User $user): Collection
     }
 
     /**
-     * Get all the application API keys that exist.
+     * Get all the application API keys. If a user is provided, filter by that user.
      */
-    public function getApplicationKeys(): Collection
+    public function getApplicationKeys(?User $user = null): Collection
     {
-        return $this->getBuilder()
+        $instance = $this->getBuilder()->where('key_type', ApiKey::TYPE_APPLICATION);
+    
+        if ($user) {
+            $instance->where('user_id', $user->id);
+        }
+    
+        return $instance->get($this->getColumns());
+    }
+    
+    /**
+     * Delete an application API key. If a user is provided, ensure it belongs to them.
+     */
+    public function deleteApplicationKey(?User $user = null, string $identifier): int
+    {
+        $query = $this->getBuilder()
             ->where('key_type', ApiKey::TYPE_APPLICATION)
-            ->with('user')
-            ->get($this->getColumns());
+            ->where('identifier', $identifier);
+    
+        if ($user) {
+            $query->where('user_id', $user->id);
+        }
+    
+        return $query->delete();
     }
 
     /**