From f880b6e8c343f47d6cb00a5c0096716c3db8d8e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 8 Apr 2026 10:52:20 +0200
Subject: [PATCH] Fix failing tests

---
 src/Appwrite/Utopia/Request/Filters/V21.php              | 9 +++++++++
 tests/e2e/Services/Projects/ProjectsBase.php             | 1 +
 .../e2e/Services/Projects/ProjectsConsoleClientTest.php  | 6 +++---
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/Appwrite/Utopia/Request/Filters/V21.php b/src/Appwrite/Utopia/Request/Filters/V21.php
index 60ab49255e..357f00cfdc 100644
--- a/src/Appwrite/Utopia/Request/Filters/V21.php
+++ b/src/Appwrite/Utopia/Request/Filters/V21.php
@@ -71,6 +71,9 @@ class V21 extends Filter
             case 'webhooks.create':
                 $content = $this->fillWebhookid($content);
                 break;
+            case 'project.createKey':
+                $content = $this->fillKeyId($content);
+                break;
             case 'project.createVariable':
                 $content = $this->fillVariableId($content);
                 break;
@@ -122,6 +125,12 @@ class V21 extends Filter
         return $content;
     }
 
+    protected function fillKeyId(array $content): array
+    {
+        $content['keyId'] = $content['keyId'] ?? 'unique()';
+        return $content;
+    }
+
     protected function fillVariableId(array $content): array
     {
         $content['variableId'] = $content['variableId'] ?? 'unique()';
diff --git a/tests/e2e/Services/Projects/ProjectsBase.php b/tests/e2e/Services/Projects/ProjectsBase.php
index 01e86a86ba..d42c5feda3 100644
--- a/tests/e2e/Services/Projects/ProjectsBase.php
+++ b/tests/e2e/Services/Projects/ProjectsBase.php
@@ -120,6 +120,7 @@ trait ProjectsBase
         $response = $this->client->call(Client::METHOD_POST, '/projects/' . $id . '/keys', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-response-format' => '1.8.0',
         ], $this->getHeaders()), [
             'name' => 'Key Test',
             'scopes' => ['teams.read', 'teams.write'],
diff --git a/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php b/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
index c6040690a7..e0f94b64cc 100644
--- a/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
+++ b/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
@@ -3161,7 +3161,7 @@ class ProjectsConsoleClientTest extends Scope
         $response = $this->client->call(Client::METHOD_POST, '/projects/' . $id . '/keys', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
-            'x-appwrite-response-format' => '1.9.0',
+            'x-appwrite-response-format' => '1.8.0',
         ], $this->getHeaders()), [
             'name' => 'Key Custom',
             'scopes' => ['teams.read', 'teams.write'],
@@ -3247,7 +3247,7 @@ class ProjectsConsoleClientTest extends Scope
         $response = $this->client->call(Client::METHOD_POST, '/projects/' . $id . '/keys', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
-            'x-appwrite-response-format' => '1.9.0',
+            'x-appwrite-response-format' => '1.8.0',
         ], $this->getHeaders()), [
             'name' => 'Key Test 2',
             'scopes' => ['users.read'],
@@ -3623,7 +3623,7 @@ class ProjectsConsoleClientTest extends Scope
         $response = $this->client->call(Client::METHOD_POST, '/projects/' . $id . '/keys', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
-            'x-appwrite-response-format' => '1.9.0',
+            'x-appwrite-response-format' => '1.8.0',
         ], $this->getHeaders()), [
             'name' => 'Key For Deletion',
             'scopes' => ['teams.read', 'teams.write'],