Improve developer experience of keys endpoints

src/Appwrite/Platform/Modules/Project/Http/Project/Keys/Create.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Project\Http\Project\Keys\Standard;
+namespace Appwrite\Platform\Modules\Project\Http\Project\Keys;
 
 use Appwrite\Event\Event as QueueEvent;
 use Appwrite\Extend\Exception;
@@ -30,17 +30,16 @@ class Create extends Base
 
     public static function getName()
     {
-        return 'createStandardProjectKey';
+        return 'createProjectKey';
     }
 
     public function __construct()
     {
         $this
             ->setHttpMethod(Action::HTTP_REQUEST_METHOD_POST)
-            ->setHttpPath('/v1/project/keys/standard')
-            ->httpAlias('/v1/project/keys')
+            ->setHttpPath('/v1/project/keys')
             ->httpAlias('/v1/projects/:projectId/keys')
-            ->desc('Create standard project key')
+            ->desc('Create project key')
             ->groups(['api', 'project'])
             ->label('scope', 'keys.write')
             ->label('event', 'keys.[keyId].create')
@@ -49,9 +48,9 @@ class Create extends Base
             ->label('sdk', new Method(
                 namespace: 'project',
                 group: 'keys',
-                name: 'createStandardKey',
+                name: 'createKey',
                 description: <<<EOT
-                Create a new standard API key. It's recommended to have multiple API keys with strict scopes for separate functions within your project.
+                Create a new API key. It's recommended to have multiple API keys with strict scopes for separate functions within your project.
                 
                 You can also create an ephemeral API key if you need a short-lived key instead.
                 EOT,

src/Appwrite/Platform/Modules/Project/Http/Project/Keys/Ephemeral/Create.php

@@ -59,7 +59,7 @@ class Create extends Base
                 ],
             ))
             ->param('scopes', [], new ArrayList(new WhiteList(array_keys(Config::getParam('projectScopes')), true), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Key scopes list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' scopes are allowed.', optional: false)
-            ->param('duration', 900, new Range(1, 3600), 'Time in seconds before ephemeral key expires. Default duration is 900 seconds, and maximum is 3600 seconds.', true)
+            ->param('duration', null, new Range(1, 3600), 'Time in seconds before ephemeral key expires. Default duration is 900 seconds, and maximum is 3600 seconds.', optional: false)
             ->inject('response')
             ->inject('queueForEvents')
             ->inject('project')

src/Appwrite/Platform/Modules/Project/Services/Http.php

@@ -5,10 +5,10 @@ namespace Appwrite\Platform\Modules\Project\Services;
 use Appwrite\Platform\Modules\Project\Http\Init;
 use Appwrite\Platform\Modules\Project\Http\Project\AuthMethods\Update as UpdateAuthMethod;
 use Appwrite\Platform\Modules\Project\Http\Project\Delete as DeleteProject;
+use Appwrite\Platform\Modules\Project\Http\Project\Keys\Create as CreateKey;
 use Appwrite\Platform\Modules\Project\Http\Project\Keys\Delete as DeleteKey;
 use Appwrite\Platform\Modules\Project\Http\Project\Keys\Ephemeral\Create as CreateEphemeralKey;
 use Appwrite\Platform\Modules\Project\Http\Project\Keys\Get as GetKey;
-use Appwrite\Platform\Modules\Project\Http\Project\Keys\Standard\Create as CreateStandardKey;
 use Appwrite\Platform\Modules\Project\Http\Project\Keys\Update as UpdateKey;
 use Appwrite\Platform\Modules\Project\Http\Project\Keys\XList as ListKeys;
 use Appwrite\Platform\Modules\Project\Http\Project\Labels\Update as UpdateProjectLabels;
@@ -131,7 +131,7 @@ class Http extends Service
         $this->addAction(UpdateVariable::getName(), new UpdateVariable());
 
         // Keys
-        $this->addAction(CreateStandardKey::getName(), new CreateStandardKey());
+        $this->addAction(CreateKey::getName(), new CreateKey());
         $this->addAction(CreateEphemeralKey::getName(), new CreateEphemeralKey());
         $this->addAction(ListKeys::getName(), new ListKeys());
         $this->addAction(GetKey::getName(), new GetKey());

tests/e2e/Services/Project/KeysBase.php

@@ -245,8 +245,11 @@ trait KeysBase
 
     public function testCreateEphemeralKey(): void
     {
+        $duration = 900;
+
         $key = $this->createEphemeralKey(
             ['users.read', 'users.write'],
+            $duration,
         );
 
         $this->assertSame(201, $key['headers']['status-code']);
@@ -271,12 +274,11 @@ trait KeysBase
         $this->assertNotEmpty($payload['projectId']);
         $this->assertSame(['users.read', 'users.write'], $payload['scopes']);
 
-        // Verify default duration (900 seconds)
         $expireDt = new \DateTime($key['body']['expire']);
         $now = new \DateTime();
         $diff = $expireDt->getTimestamp() - $now->getTimestamp();
-        $this->assertGreaterThanOrEqual(890, $diff);
-        $this->assertLessThanOrEqual(910, $diff);
+        $this->assertGreaterThanOrEqual($duration - 10, $diff);
+        $this->assertLessThanOrEqual($duration + 10, $diff);
     }
 
     public function testCreateEphemeralKeyWithDuration(): void
@@ -302,6 +304,7 @@ trait KeysBase
     {
         $key = $this->createEphemeralKey(
             [],
+            900,
         );
 
         $this->assertSame(201, $key['headers']['status-code']);
@@ -312,17 +315,27 @@ trait KeysBase
     {
         $response = $this->createEphemeralKey(
             ['users.read'],
-            null,
+            900,
             false
         );
 
         $this->assertSame(401, $response['headers']['status-code']);
     }
 
+    public function testCreateEphemeralKeyMissingDuration(): void
+    {
+        $response = $this->createEphemeralKey(
+            ['users.read'],
+        );
+
+        $this->assertSame(400, $response['headers']['status-code']);
+    }
+
     public function testCreateEphemeralKeyInvalidScope(): void
     {
         $response = $this->createEphemeralKey(
             ['invalid.scope'],
+            900,
         );
 
         $this->assertSame(400, $response['headers']['status-code']);