Parse headers + handle raw JSON data

Author: jasonmccreary

app/Models/Request.php

@@ -2,6 +2,8 @@
 
 namespace App\Models;
 
+use Illuminate\Support\Str;
+
 class Request
 {
     private string $url;
@@ -12,6 +14,8 @@ class Request
 
     private array $data = [];
 
+    private bool $jsonData = false;
+
     private bool $multipartFormData = false;
 
     private function __construct($url, $method)
@@ -25,12 +29,27 @@ public static function create(array $data): self
         $request = new self($data['url'], $data['method']);
 
         if (!empty($data['headers'])) {
-            $request->headers = $data['headers'];
+            $request->headers = collect($data['headers'])
+                ->mapWithKeys(function ($header) {
+                    [$key, $value] = explode(':', $header, 2);
+
+                    return [trim($key) => self::convertDataType(trim($value))];
+                })
+                ->all();
         }
 
         if (!empty($data['data'])) {
-            // TODO: handle JSON payload
-            parse_str(implode('&', $data['data']), $request->data);
+            if (count($data['data']) === 1 && Str::startsWith($data['data'][0], '{')) {
+                $request->data = $data['data'];
+                $request->jsonData = true;
+            } else {
+                parse_str(implode('&', $data['data']), $request->data);
+                array_walk_recursive($request->data, function (&$value) {
+                    if (is_string($value)) {
+                        $value = self::convertDataType($value);
+                    }
+                });
+            }
         }
 
         if (!empty($data['fields'])) {
@@ -51,6 +70,11 @@ public function headers(): array
         return $this->headers;
     }
 
+    public function isJsonData(): bool
+    {
+        return $this->jsonData;
+    }
+
     public function method(): string
     {
         return $this->method;
@@ -61,8 +85,13 @@ public function url(): string
         return $this->url;
     }
 
-    public function isMultipartFormData()
+    public function isMultipartFormData(): bool
     {
         return $this->multipartFormData;
     }
+
+    private static function convertDataType(string $value)
+    {
+        return preg_match('/^[1-9]\d*$/', $value) ? intval($value) : $value;
+    }
 }

app/Support/HttpCall.php

@@ -21,6 +21,11 @@ private static function generateOptions(Request $request): string
     {
         $options = [];
 
+        if (!empty($request->data()) && $request->method() !== 'GET') {
+            $options[] = $request->isJsonData() ? 'withBody(\'' . $request->data()[0] . '\')'
+                : 'asForm()';
+        }
+
         if ($request->headers()) {
             // TODO: what about headers that have Http helper methods, for example: `acceptJson`
             $options[] = 'withHeaders(' . self::prettyPrintArray($request->headers()) . ')';
@@ -35,7 +40,7 @@ private static function generateOptions(Request $request): string
 
     private static function generateRequest(Request $request): string
     {
-        if (empty($request->data())) {
+        if (empty($request->data()) || $request->isJsonData()) {
             return "'" . $request->url() . "'";
         }
 

tests/Feature/Console/Commands/CurlCommandTest.php

@@ -26,6 +26,8 @@ public function curlCommandFixtures()
             'GET request' => ['basic-get'],
             'POST request' => ['basic-post'],
             'POST request with multiple data' => ['post-with-multiple-data'],
+            'POST request with JSON data' => ['post-json'],
+            'GET request with headers' => ['with-headers'],
         ];
     }
 }

tests/fixtures/basic-post.out

@@ -1,3 +1,4 @@
-Http::post('https://example.com', [
-    'foo' => 'bar',
-]);
+Http::asForm()
+    ->post('https://example.com', [
+        'foo' => 'bar',
+    ]);

tests/fixtures/post-json.in

@@ -0,0 +1 @@
+curl -X POST -d '{"foo":"bar"}' https://example.com

tests/fixtures/post-json.out

@@ -0,0 +1,2 @@
+Http::withBody('{"foo":"bar"}')
+    ->post('https://example.com');

tests/fixtures/post-with-multiple-data.out

@@ -1,5 +1,6 @@
-Http::post('https://example.com', [
-    'foo' => 'bar',
-    'rho' => [1, 2],
-    'baz' => 'qui',
-]);
+Http::asForm()
+    ->post('https://example.com', [
+        'foo' => 'bar',
+        'rho' => [1, 2],
+        'baz' => 'qui',
+    ]);

tests/fixtures/with-headers.in

@@ -0,0 +1 @@
+curl -H "X-Header-One: 1" -H 'X-Header-Two: 2' https://example.com

tests/fixtures/with-headers.out

@@ -0,0 +1,5 @@
+Http::withHeaders([
+        'X-Header-One' => 1,
+        'X-Header-Two' => 2,
+    ])
+    ->get('https://example.com');