Merge pull request #348 from EasyPost/webhook_fixtures

fix: webhook fixture, addCreditCard params
EasyPost · Aug 16, 2024 · b469f50 · b469f50
2 parents 7ab2a17 + feee9f4
commit b469f50
Show file tree

Hide file tree

Showing 152 changed files with 7,436 additions and 7,127 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## Next Release
+
+- Fixes an issue with how query params were sent when using the `addCreditCard` function
+
 ## v7.4.1 (2024-08-09)
 
 - Fix parameters for retrieving next page of child users

diff --git a/examples b/examples
diff --git a/lib/EasyPost/Http/Requestor.php b/lib/EasyPost/Http/Requestor.php
@@ -91,41 +91,6 @@ private static function encodeObjects(mixed $data): array|string
         }
     }
 
-    /**
-     * URL Encodes data for GET requests.
-     *
-     * @param mixed $arr
-     * @param string|null $prefix
-     * @return string
-     */
-    public static function urlEncode(mixed $arr, ?string $prefix = null): string
-    {
-        if (!is_array($arr)) {
-            return $arr;
-        }
-
-        $r = [];
-        foreach ($arr as $k => $v) {
-            if (is_null($v)) {
-                continue;
-            }
-
-            if (isset($prefix)) {
-                $k = $prefix . '[' . $k . ']';
-            } else {
-                $k = $prefix . '[]';
-            }
-
-            if (is_array($v)) {
-                $r[] = self::urlEncode($v, $k);
-            } else {
-                $r[] = urlencode($k) . '=' . urlencode($v);
-            }
-        }
-
-        return implode('&', $r);
-    }
-
     /**
      * Make a request to the EasyPost API.
      *

diff --git a/lib/EasyPost/Service/ReferralCustomerService.php b/lib/EasyPost/Service/ReferralCustomerService.php
@@ -162,11 +162,11 @@ private function createStripeToken(
             ]
         ];
 
-        $formEncodedParams = Requestor::urlEncode($creditCardDetails);
-        $url = "https://api.stripe.com/v1/tokens?$formEncodedParams";
+        $url = 'https://api.stripe.com/v1/tokens';
 
         $guzzleClient = new Client();
 
+        $requestOptions['query'] = $creditCardDetails;
         $requestOptions['headers'] = $headers;
         $requestOptions['http_errors'] = false;
 

diff --git a/test/EasyPost/BetaReferralCustomerTest.php b/test/EasyPost/BetaReferralCustomerTest.php
@@ -44,7 +44,7 @@ public function testAddPaymentMethod(): void
                 'primary'
             );
         } catch (ApiException $error) {
-            $this->assertEquals('Invalid Payment Gateway Reference.', $error->getMessage());
+            $this->assertEquals('Invalid connect integration.', $error->getMessage());
         }
     }
 

diff --git a/test/EasyPost/Fixture.php b/test/EasyPost/Fixture.php
@@ -55,11 +55,6 @@ public static function reportDate(): string
         return '2022-04-09';
     }
 
-    public static function webhookUrl(): string
-    {
-        return self::readFixtureData()['webhook_url'];
-    }
-
     /**
      * @return array<mixed>
      */
@@ -156,7 +151,7 @@ public static function oneCallBuyShipment(): array
      */
     public static function basicPickup(): array
     {
-        $pickupDate = '2023-11-24';
+        $pickupDate = '2024-08-18';
 
         $pickupData = self::readFixtureData()['pickups']['basic'];
         $pickupData['min_datetime'] = $pickupDate;
@@ -206,7 +201,25 @@ public static function eventBytes(): mixed
         $eventBytesFilepath = file("$currentDir/examples/official/fixtures/event-body.json");
         $data = $eventBytesFilepath[0];
 
-        return mb_convert_encoding(json_encode(json_decode($data, true)), 'UTF-8', mb_list_encodings());
+        return mb_convert_encoding(json_encode(
+            json_decode($data, true),
+            JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE
+        ), 'UTF-8');
+    }
+
+    public static function webhookHmacSignature(): string
+    {
+        return self::readFixtureData()['webhook_hmac_signature'];
+    }
+
+    public static function webhookSecret(): string
+    {
+        return self::readFixtureData()['webhook_secret'];
+    }
+
+    public static function webhookUrl(): string
+    {
+        return self::readFixtureData()['webhook_url'];
     }
 
     /**
@@ -234,15 +247,15 @@ public static function rmaFormOtions(): array
      */
     public static function plannedShipDate(): string
     {
-        return '2024-07-16';
+        return '2024-08-16';
     }
 
     /**
      * @return string
      */
     public static function desiredDeliveryDate(): string
     {
-        return '2024-07-16';
+        return '2024-08-18';
     }
 
     /**

diff --git a/test/EasyPost/OrderTest.php b/test/EasyPost/OrderTest.php
@@ -128,13 +128,13 @@ public function testLowestRate(): void
         // Test lowest rate with no filters
         $lowestRate = $order->lowestRate();
         $this->assertEquals('GroundAdvantage', $lowestRate['service']);
-        $this->assertEquals('11.33', $lowestRate['rate']);
+        $this->assertEquals('11.40', $lowestRate['rate']);
         $this->assertEquals('USPS', $lowestRate['carrier']);
 
         // Test lowest rate with service filter (this rate is higher than the lowest but should filter)
         $lowestRate = $order->lowestRate([], ['Priority']);
         $this->assertEquals('Priority', $lowestRate['service']);
-        $this->assertEquals('13.79', $lowestRate['rate']);
+        $this->assertEquals('14.48', $lowestRate['rate']);
         $this->assertEquals('USPS', $lowestRate['carrier']);
 
         // Test lowest rate with carrier filter (should error due to bad carrier)

diff --git a/test/EasyPost/ReferralCustomerTest.php b/test/EasyPost/ReferralCustomerTest.php
@@ -132,7 +132,7 @@ public function testReferralAddCreditCard(): void
             Fixture::creditCardDetails()['cvc']
         );
 
-        $this->assertStringMatchesFormat('card_%s', $creditCard->id);
+        $this->assertStringMatchesFormat('pm_%s', $creditCard->id);
         $this->assertEquals('6170', $creditCard->last4);
     }
 }
diff --git a/test/EasyPost/ShipmentTest.php b/test/EasyPost/ShipmentTest.php
@@ -356,7 +356,7 @@ public function testLowestRate(): void
         // Test lowestRate with service filter (this rate is higher than the lowest but should filter)
         $lowestRate = $shipment->lowestRate([], ['Priority']);
         $this->assertEquals('Priority', $lowestRate['service']);
-        $this->assertEquals('6.95', $lowestRate['rate']);
+        $this->assertEquals('6.90', $lowestRate['rate']);
         $this->assertEquals('USPS', $lowestRate['carrier']);
 
         // Test lowestRate with carrier filter (should error due to bad carrier)

diff --git a/test/EasyPost/WebhookTest.php b/test/EasyPost/WebhookTest.php
@@ -129,15 +129,14 @@ public function testDelete(): void
      */
     public function testValidateWebhook(): void
     {
-        $webhookSecret = 'sécret';
-        $expectedHmacSignature = 'hmac-sha256-hex=e93977c8ccb20363d51a62b3fe1fc402b7829be1152da9e88cf9e8d07115a46b';
         $headers = [
-            'X-Hmac-Signature' => $expectedHmacSignature
+            'X-Hmac-Signature' => Fixture::webhookHmacSignature()
         ];
 
-        $webhookBody = Util::validateWebhook(Fixture::eventBytes(), $headers, $webhookSecret);
+        $webhookBody = Util::validateWebhook(Fixture::eventBytes(), $headers, Fixture::webhookSecret());
 
-        $this->assertEquals('batch.created', $webhookBody->description);
+        $this->assertEquals('tracker.updated', $webhookBody->description);
+        $this->assertEquals(614.4, $webhookBody->result->weight); // Ensure we convert floats properly
     }
 
     /**

diff --git a/test/cassettes/addresses/all.yml b/test/cassettes/addresses/all.yml