Merge pull request #60 from wedevBr/feature/AttachmentHeaders

Feature/attachment headers
wedevBr · Mar 25, 2024 · ed1f7e1 · ed1f7e1
2 parents 7c64b75 + cd543ed
commit ed1f7e1
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 18 deletions.
diff --git a/src/Common/CelcoinBaseApi.php b/src/Common/CelcoinBaseApi.php
@@ -77,10 +77,8 @@ public function get(string $endpoint, array|string|null $query = null, $response
     {
         $token = $this->getToken() ?? $this->auth->getToken();
         $request = Http::withToken($token)
-            ->withHeaders([
-                'accept' => 'application/json',
-                'content-type' => 'application/json',
-            ]);
+            ->asJson()
+            ->acceptJson();
 
         if ($this->mtlsCert && $this->mtlsKey && $this->mtlsPassphrase) {
             $request = $this->setRequestMtls($request);
@@ -99,10 +97,8 @@ public function post(string $endpoint, array $body = [], Attachable $attachment
     {
         $token = $this->getToken() ?? $this->auth->getToken();
         $request = Http::withToken($token)
-            ->withHeaders([
-                'accept' => 'application/json',
-                'content-type' => 'application/json'
-            ]);
+            ->asJson()
+            ->acceptJson();
 
         if ($this->mtlsCert && $this->mtlsKey && $this->mtlsPassphrase) {
             $request = $this->setRequestMtls($request);
@@ -115,7 +111,12 @@ public function post(string $endpoint, array $body = [], Attachable $attachment
         }
 
         if ($attachment) {
-            $request->attach($attachment->getField(), $attachment->getContents(), $attachment->getFileName());
+            $request->attach(
+                $attachment->getField(),
+                $attachment->getContents(),
+                $attachment->getFileName(),
+                $attachment->getHeaders()
+            );
         }
 
         return $request->post($this->getFinalUrl($endpoint), $body)
@@ -133,10 +134,8 @@ public function put(
     {
         $token = $this->getToken() ?? $this->auth->getToken();
         $request = Http::withToken($token)
-            ->withHeaders([
-                'accept' => 'application/json',
-                'content-type' => 'application/json',
-            ]);
+            ->asJson()
+            ->acceptJson();
 
         if ($this->mtlsCert && $this->mtlsKey && $this->mtlsPassphrase) {
             $request = $this->setRequestMtls($request);
@@ -159,11 +158,9 @@ public function patch(
         $body_format = $asJson ? 'json' : 'form_params';
         $token = $this->getToken() ?? $this->auth->getToken();
         $request = Http::withToken($token)
-            ->bodyFormat($body_format)
-            ->withHeaders([
-                'accept' => 'application/json',
-                'content-type' => 'application/json',
-            ]);
+            ->asJson()
+            ->acceptJson()
+            ->bodyFormat($body_format);
 
         if ($this->mtlsCert && $this->mtlsKey && $this->mtlsPassphrase) {
             $request = $this->setRequestMtls($request);

diff --git a/src/Interfaces/Attachable.php b/src/Interfaces/Attachable.php
@@ -9,4 +9,6 @@ public function getField(): string;
     public function getContents();
 
     public function getFileName();
+
+    public function getHeaders(): array;
 }
diff --git a/src/Types/KYC/KycDocument.php b/src/Types/KYC/KycDocument.php
@@ -40,4 +40,9 @@ public function getField(): string
     {
         return $this->field;
     }
+
+    public function getHeaders(): array
+    {
+        return ['Content-Type' => $this->file->getMimeType()];
+    }
 }