From 98c36c4cc34c3e227c4dc148a54747df0a6321da Mon Sep 17 00:00:00 2001
From: MartinOscar <40749467+rmartinoscar@users.noreply.github.com>
Date: Sat, 15 Mar 2025 19:42:43 +0100
Subject: [PATCH] Fix revamp api_keys migration (#987)

---
 app/Models/ApiKey.php                                         | 4 ++--
 .../2024_11_04_185326_revamp_api_keys_permissions.php         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Models/ApiKey.php b/app/Models/ApiKey.php
index 36d13d1af..297ab76f3 100644
--- a/app/Models/ApiKey.php
+++ b/app/Models/ApiKey.php
@@ -18,8 +18,8 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
  * @property int $key_type
  * @property string $identifier
  * @property string $token
- * @property string[] $permissions
- * @property string[] $allowed_ips
+ * @property string[]|null $permissions
+ * @property string[]|null $allowed_ips
  * @property string|null $memo
  * @property \Illuminate\Support\Carbon|null $last_used_at
  * @property \Illuminate\Support\Carbon|null $expires_at
diff --git a/database/migrations/2024_11_04_185326_revamp_api_keys_permissions.php b/database/migrations/2024_11_04_185326_revamp_api_keys_permissions.php
index 9c44d3d72..c1147f9d6 100644
--- a/database/migrations/2024_11_04_185326_revamp_api_keys_permissions.php
+++ b/database/migrations/2024_11_04_185326_revamp_api_keys_permissions.php
@@ -22,7 +22,7 @@ return new class extends Migration
     public function up(): void
     {
         Schema::table('api_keys', function (Blueprint $table) {
-            $table->json('permissions');
+            $table->json('permissions')->nullable();
         });
 
         foreach (ApiKey::all() as $apiKey) {
@@ -72,7 +72,7 @@ return new class extends Migration
             $table->unsignedTinyInteger('r_mounts')->default(0);
         });
 
-        foreach (ApiKey::query() as $apiKey) {
+        foreach (ApiKey::all() as $apiKey) {
             DB::table('api_keys')
                 ->where('id', $apiKey->id)
                 ->update([