Merge pull request #3 from 77web/fix/actual-api-access

Fixed for actual api access
77web · Nov 13, 2023 · 92769fd · 92769fd
2 parents d7358ac + c157b1d
commit 92769fd
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 14 deletions.
diff --git a/src/Campaign/CreateCampaignRequest.php b/src/Campaign/CreateCampaignRequest.php
@@ -7,9 +7,9 @@
 readonly class CreateCampaignRequest
 {
     /**
-     * @param array<int>    $listIds
-     * @param array<int>    $segmentIds
-     * @param array<string> $categories
+     * @param null|array<int>    $listIds
+     * @param null|array<int>    $segmentIds
+     * @param null|array<string> $categories
      */
     public function __construct(
         public string $title,
@@ -18,10 +18,10 @@ public function __construct(
         public int $suppressionGroupId,
         public string|null $htmlContent = null,
         public string|null $plainContent = null,
-        public string $customUnsubscribeUrl = '',
-        public array $listIds = [],
-        public array $segmentIds = [],
-        public array $categories = [],
+        public string|null $customUnsubscribeUrl = null,
+        public array|null $listIds = null,
+        public array|null $segmentIds = null,
+        public array|null $categories = null,
         public string|null $ipPool = null,
     ) {
     }

diff --git a/src/Client.php b/src/Client.php
@@ -30,7 +30,7 @@ public function createContactList(
         CreateContactListRequest $request,
     ): CreateContactListResponse {
         return $this->requester->post(
-            '/contactdb/lists',
+            'contactdb/lists',
             $request,
             CreateContactListResponse::class,
         );
@@ -43,7 +43,7 @@ public function createContactList(
     public function createRecipients(CreateRecipientsRequest $request): CreateRecipientsResponse
     {
         return $this->requester->post(
-            '/contactdb/recipients',
+            'contactdb/recipients',
             $request,
             CreateRecipientsResponse::class,
         );
@@ -58,7 +58,7 @@ public function addMultipleRecipientsToContactList(
         AddMultipleRecipientsRequest $request,
     ): AddMultipleRecipientsResponse {
         return $this->requester->post(
-            sprintf('/contactdb/lists/%d/recipients', $listId),
+            sprintf('contactdb/lists/%d/recipients', $listId),
             $request,
             AddMultipleRecipientsResponse::class,
         );
@@ -71,7 +71,7 @@ public function addMultipleRecipientsToContactList(
     public function createCampaign(CreateCampaignRequest $request): CreateCampaignResponse
     {
         return $this->requester->post(
-            '/campaigns',
+            'campaigns',
             $request,
             CreateCampaignResponse::class,
         );
@@ -84,7 +84,7 @@ public function createCampaign(CreateCampaignRequest $request): CreateCampaignRe
     public function sendCampaign(int $campaignId, SendCampaignRequest $request): SendCampaignResponse
     {
         return $this->requester->post(
-            sprintf('/campaigns/%d/schedules/now', $campaignId),
+            sprintf('campaigns/%d/schedules/now', $campaignId),
             $request,
             SendCampaignResponse::class,
         );

diff --git a/src/SendgridApiRequester.php b/src/SendgridApiRequester.php
@@ -22,7 +22,7 @@ public function __construct(
         SerializerInterface|null $serializer = null,
     ) {
         $this->httpClient = $httpClient ?? new HttpClient([
-            'base_uri' => 'https://api.sendgrid.com/v3',
+            'base_uri' => 'https://api.sendgrid.com/v3/',
             'headers' => [
                 'Authorization' => sprintf('Bearer %s', $apiKey),
             ],
@@ -110,7 +110,12 @@ private function mutate(string $method, string $path, object $request, string $r
             throw new SendgridApiServerException($e->getMessage(), code: $e->getCode(), previous: $e);
         }
 
-        $result = $this->serializer->deserialize($response->getBody()->getContents(), $responseClass, 'json');
+        $responseJson = $response->getBody()->getContents();
+        if ($responseJson === '') {
+            $responseJson = '{}';
+        }
+
+        $result = $this->serializer->deserialize($responseJson, $responseClass, 'json');
         \assert(\is_object($result) && $result instanceof $responseClass);
 
         return $result;

diff --git a/src/SerializerFactory.php b/src/SerializerFactory.php
@@ -8,6 +8,7 @@
 use Symfony\Component\PropertyInfo\PropertyInfoExtractor;
 use Symfony\Component\Serializer\Encoder\JsonEncoder;
 use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter;
+use Symfony\Component\Serializer\Normalizer\AbstractObjectNormalizer;
 use Symfony\Component\Serializer\Normalizer\ArrayDenormalizer;
 use Symfony\Component\Serializer\Normalizer\BackedEnumNormalizer;
 use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
@@ -34,6 +35,9 @@ public function create(): SerializerInterface
                         listExtractors: [$reflectionExtractor],
                         typeExtractors: [$reflectionExtractor],
                     ),
+                    defaultContext: [
+                        AbstractObjectNormalizer::SKIP_NULL_VALUES => true,
+                    ],
                 ),
             ],
             [