feat: allow setting content type on command

src/Http/Command.php

@@ -20,27 +20,14 @@ public function __construct(
         /** @var Representation|Collection|array<mixed>|null */
         private readonly Representation|Collection|array|null $payload = null,
         private readonly ?Criteria $criteria = null,
-        private readonly ?ContentType $contentType = null,
+        private readonly ContentType $contentType = ContentType::JSON,
     ) {}
 
     public function getMethod(): Method
     {
         return $this->method;
     }
 
-    public function getContentType(): ContentType
-    {
-        if ($this->contentType !== null) {
-            return $this->contentType;
-        }
-
-        if (is_array($this->payload)) {
-            return ContentType::FORM_DATA;
-        }
-
-        return ContentType::JSON;
-    }
-
     public function getPath(): string
     {
         $placeholders = array_map(
@@ -75,4 +62,9 @@ public function getQuery(): string
 
         return '?' . http_build_query($this->criteria->jsonSerialize());
     }
+
+    public function getContentType(): ContentType
+    {
+        return $this->contentType;
+    }
 }

src/Http/CommandExecutor.php

@@ -20,23 +20,15 @@ public function __construct(
 
     public function executeCommand(Command $command): void
     {
-        $contentType = $command->getContentType();
-        $payload = $command->getPayload();
-
-        $options = [
-            'headers' => [
-                'Content-Type' => $contentType->value,
+        $options = match ($command->getContentType()) {
+            ContentType::JSON => [
+                'body' => $this->serializer->serialize($command->getPayload()),
+                'headers' => [
+                    'Content-Type' => $command->getContentType()->value,
+                ]
             ],
-        ];
-
-        switch ($contentType) {
-            case ContentType::JSON:
-                $options['body'] = $this->serializer->serialize($payload);
-                break;
-            case ContentType::FORM_DATA:
-                $options['form_params'] = $payload;
-                break;
-        }
+            ContentType::FORM_PARAMS => ['form_params' => $command->getPayload()],
+        };
 
         $this->client->request(
             $command->getMethod()->value,

src/Http/ContentType.php

@@ -10,5 +10,5 @@
 enum ContentType: string
 {
     case JSON = 'application/json';
-    case FORM_DATA = 'application/x-www-form-urlencoded';
+    case FORM_PARAMS = 'application/x-www-form-urlencoded';
 }

src/Resource/Organizations.php

@@ -6,6 +6,7 @@
 
 use Fschmtt\Keycloak\Collection\OrganizationCollection;
 use Fschmtt\Keycloak\Http\Command;
+use Fschmtt\Keycloak\Http\ContentType;
 use Fschmtt\Keycloak\Http\Criteria;
 use Fschmtt\Keycloak\Http\Method;
 use Fschmtt\Keycloak\Http\Query;
@@ -71,6 +72,7 @@ public function inviteUser(string $realm, string $id, string $email, string $fir
                     'firstName' => $firstName,
                     'lastName' => $lastName,
                 ],
+                contentType: ContentType::FORM_PARAMS,
             ),
         );
     }

src/Resource/Users.php

@@ -220,7 +220,6 @@ public function executeActionsEmail(string $realm, string $userId, ?array $actio
                 ],
                 $actions,
                 $criteria,
-                ContentType::JSON,
             ),
         );
     }

tests/Integration/Resource/UsersTest.php

@@ -189,6 +189,26 @@ public function testGetUserCredentials(): void
         static::assertNull($user);
     }
 
+    public function testExecuteActionsEmail(): void
+    {
+        $users = $this->getKeycloak()->users();
+        $username = Uuid::uuid4()->toString();
+
+        $users->create('master', new User(
+            username: $username,
+        ));
+
+        $user = $this->searchUserByUsername($username);
+        static::assertInstanceOf(User::class, $user);
+
+        $users->executeActionsEmail('master', $user->getId(), ['UPDATE_PASSWORD']);
+
+        $users->delete('master', $user->getId());
+
+        $user = $this->searchUserByUsername($username);
+        static::assertNull($user);
+    }
+
     private function searchUserByUsername(string $username, string $realm = 'master'): ?User
     {
         /** @var User|null $user */

tests/Unit/Http/CommandExecutorTest.php

@@ -7,6 +7,7 @@
 use Fschmtt\Keycloak\Http\Client;
 use Fschmtt\Keycloak\Http\Command;
 use Fschmtt\Keycloak\Http\CommandExecutor;
+use Fschmtt\Keycloak\Http\ContentType;
 use Fschmtt\Keycloak\Http\Method;
 use Fschmtt\Keycloak\Json\JsonEncoder;
 use Fschmtt\Keycloak\Serializer\Serializer;
@@ -30,7 +31,7 @@ public function testCallsClientWithoutBodyIfCommandHasNoRepresentation(): void
                     'body' => null,
                     'headers' => [
                         'Content-Type' => 'application/json',
-                    ],
+                    ]
                 ],
             );
 
@@ -43,7 +44,7 @@ public function testCallsClientWithoutBodyIfCommandHasNoRepresentation(): void
         );
     }
 
-    public function testCallsClientWithBodyIfCommandHasRepresentation(): void
+    public function testCallsClientWithJsonIfCommandHasRepresentation(): void
     {
         $command = new Command(
             '/path/to/resource',
@@ -101,13 +102,14 @@ public function testCallsClientWithBodyIfCommandHasCollection(): void
         $executor->executeCommand($command);
     }
 
-    public function testCallsClientWithFormParamsIfCommandHasArrayPayload(): void
+    public function testCallsClientWithFormParamsIfCommandFormParamContentType(): void
     {
         $command = new Command(
             '/path/to/resource',
             Method::PUT,
             [],
             $payload = ['UPDATE_PASSWORD', 'VERIFY_EMAIL'],
+            contentType: ContentType::FORM_PARAMS,
         );
 
         $client = $this->createMock(Client::class);
@@ -118,9 +120,6 @@ public function testCallsClientWithFormParamsIfCommandHasArrayPayload(): void
                 '/path/to/resource',
                 [
                     'form_params' => $payload,
-                    'headers' => [
-                        'Content-Type' => 'application/x-www-form-urlencoded',
-                    ],
                 ],
             );
 

tests/Unit/Resource/OrganizationsTest.php

@@ -7,6 +7,7 @@
 use Fschmtt\Keycloak\Collection\OrganizationCollection;
 use Fschmtt\Keycloak\Http\Command;
 use Fschmtt\Keycloak\Http\CommandExecutor;
+use Fschmtt\Keycloak\Http\ContentType;
 use Fschmtt\Keycloak\Http\Method;
 use Fschmtt\Keycloak\Http\Query;
 use Fschmtt\Keycloak\Http\QueryExecutor;
@@ -148,6 +149,7 @@ public function testInviteUser(): void
                 'firstName' => 'first name',
                 'lastName' => 'last name',
             ],
+            contentType: ContentType::FORM_PARAMS,
         );
 
         $commandExecutor = $this->createMock(CommandExecutor::class);

tests/Unit/Resource/UsersTest.php

@@ -411,7 +411,6 @@ public function testExecuteActionsEmail(): void
                 'realm' => 'test-realm',
                 'userId' => 'test-user-id',
             ],
-            contentType: ContentType::JSON,
         );
 
         $commandExecutor = $this->createMock(CommandExecutor::class);