Prioritize auth middlware (#167)

Ensure the `TEvoAuthMiddleware` is before any additional middleware so the computed X-Signature can be available to a logger middlware.
ticketevolution · Apr 4, 2022 · 4e6dfa4 · 4e6dfa4
1 parent 84de1c4
commit 4e6dfa4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 4.4.0 (April 4, 2022)
+- Ensure the `TEvoAuthMiddleware` is before any additional middleware so the computed X-Signature can be available to a logger middlware.
+
 ## 4.3.0 (March 9, 2022)
 - Add new `completeShipment()` and `updateShipment()` methods that are most often used when fulfilling mobile transfer sales.
 

diff --git a/src/Client.php b/src/Client.php
@@ -16,7 +16,7 @@ class Client
      *
      * @const string
      */
-    const VERSION = '4.3.0';
+    const VERSION = '4.4.0';
 
     /**
      * Guzzle service description
@@ -60,12 +60,11 @@ class Client
     public function __construct(array $settings = [], array $middleware = [])
     {
         $this->settings = $settings;
-        $this->middleware = $middleware;
 
         // Use the TEvoAuth middleware to handle the request signing
-        $this->middleware[] = new TEvoAuthMiddleware($this->settings['apiToken'], $this->settings['apiSecret']);
+        $this->middleware = array_merge([new TEvoAuthMiddleware($this->settings['apiToken'], $this->settings['apiSecret'])], $middleware);
 
-        // Don’t need these any more
+        // Don’t need these anymore
         unset($this->settings['apiToken'], $this->settings['apiSecret']);
 
         // TEvo API servers don't like the “Expect: 100” header so override it