Update the verifier to verify signed requests genenerated by the updated payload

Author: Jaspaul

src/Requests/Payload.php

@@ -82,13 +82,28 @@ protected function generateFromIlluminateRequest(IlluminateRequest $request) : s
         $id = $this->request->headers->get('X-SIGNED-ID', '');
         $timestamp = $this->request->headers->get('X-SIGNED-TIMESTAMP', '');
 
+        $string = json_decode((string) $this->request->getContent());
+
+        if (is_null($string)) {
+            return json_encode([
+                'id' => (string) $id,
+                'method' => strtoupper($this->request->getMethod()),
+                'timestamp' => $timestamp,
+                'uri' => rtrim((string) $this->request->fullUrl(), '/'),
+                'content' => (string) $this->request->getContent()
+            ], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+        }
+
         return json_encode([
-            'id' => (string) $id,
+            'id' => (string)$id,
             'method' => strtoupper($this->request->getMethod()),
             'timestamp' => $timestamp,
-            'uri' => (string) $this->request->fullUrl(),
-            'content' => $this->request->getContent()
-        ], JSON_UNESCAPED_SLASHES);
+            'uri' => rtrim((string) $this->request->fullUrl(), '/'),
+            'content' => json_encode(
+                json_decode((string) $this->request->getContent()),
+                JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE
+            )
+        ], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
     }
 
     /**

src/Requests/Verifier.php

@@ -142,7 +142,7 @@ public function getContent($asResource = false)
         json_decode($content);
 
         if (json_last_error() == JSON_ERROR_NONE) {
-            return json_encode(json_decode($content), JSON_UNESCAPED_SLASHES);
+            return json_encode(json_decode($content), JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
         }
 
         return $content;

tests/ClientTest.php

@@ -241,4 +241,50 @@ public function it_generates_a_signature_with_a_complex_json_payload_after_strip
             ]
         );
     }
+
+    /**
+     * @test
+     */
+    public function it_generates_a_signature_with_a_simple_json_get_payload()
+    {
+        Carbon::setTestNow('2001-01-01 00:00:00');
+        $this->expectUuid4('303103f5-3dca-4704-96ad-860717769ec9');
+
+        $uri = 'https://localhost';
+
+        $this->handler->expects('GET', $uri)
+            ->inspectRequest(function ($request) use ($uri) {
+                $this->assertTrue($request->hasHeader('Algorithm'));
+                $this->assertTrue($request->hasHeader('Signature'));
+                $this->assertSame(
+                    '939ada016b60aa267980a73f62e6dc583b03b35a2abf0dea5b054871d6c6a306',
+                    $request->getHeader('Signature')[0]
+                );
+            });
+
+        $this->client->get($uri, ['json' => ['payload' => 'payload']]);
+    }
+
+    /**
+     * @test
+     */
+    public function it_generates_a_signature_with_a_simple_get_payload()
+    {
+        Carbon::setTestNow('2001-01-01 00:00:00');
+        $this->expectUuid4('303103f5-3dca-4704-96ad-860717769ec9');
+
+        $uri = 'https://localhost';
+
+        $this->handler->expects('GET', $uri)
+            ->inspectRequest(function ($request) use ($uri) {
+                $this->assertTrue($request->hasHeader('Algorithm'));
+                $this->assertTrue($request->hasHeader('Signature'));
+                $this->assertSame(
+                    '9feb58dfece796627b16f7865fc19ee6bfc5b231d49b12d83170d74d22bf9641',
+                    $request->getHeader('Signature')[0]
+                );
+            });
+
+        $this->client->get($uri, ['body' => 'payload']);
+    }
 }