Update the HTTP client to reflect the upstream B/C break

Author: mbabker

src/Twilio/Http/LaravelHttpClient.php

@@ -3,6 +3,7 @@
 namespace BabDev\Twilio\Twilio\Http;
 
 use Illuminate\Http\Client\Factory;
+use Twilio\AuthStrategy\AuthStrategy;
 use Twilio\Exceptions\HttpException;
 use Twilio\Http\Client;
 use Twilio\Http\Response;
@@ -25,11 +26,14 @@ public function request(
         string $user = null,
         string $password = null,
         int $timeout = null,
+        ?AuthStrategy $authStrategy = null,
     ): Response {
         $request = $this->httpFactory->asForm();
 
         if ($user && $password) {
             $request->withBasicAuth($user, $password);
+        } elseif ($authStrategy instanceof AuthStrategy) {
+            $request->withHeader('Authorization', $authStrategy->getAuthString());
         }
 
         $request->withHeaders($headers);

tests/Twilio/Http/LaravelHttpClientTest.php

@@ -7,6 +7,7 @@
 use Illuminate\Http\Client\Request;
 use Illuminate\Http\Client\Response;
 use Orchestra\Testbench\TestCase;
+use Twilio\AuthStrategy\BasicAuthStrategy;
 use Twilio\Exceptions\HttpException;
 
 final class LaravelHttpClientTest extends TestCase
@@ -23,11 +24,9 @@ public function testARequestCanBeSentToTheTwilioApiWithoutCredentials(): void
 
         /** @var Factory $factory */
         $factory = $this->app->make(Factory::class);
-        $factory->fake(
-            [
-                $url => $factory->response('', 200, []),
-            ]
-        );
+        $factory->fake([
+            $url => $factory->response('', 200, []),
+        ]);
 
         (new LaravelHttpClient($factory))->request(
             'POST',
@@ -37,9 +36,11 @@ public function testARequestCanBeSentToTheTwilioApiWithoutCredentials(): void
             $headers
         );
 
-        $factory->assertSent(static fn(Request $request, Response $response): bool => !$request->hasHeader('Authorization')
+        $factory->assertSent(
+            static fn(Request $request, Response $response): bool => !$request->hasHeader('Authorization')
                 && $request->url() === $url
-                && $request->data() === $messageData);
+                && $request->data() === $messageData
+        );
     }
 
     public function testARequestCanBeSentToTheTwilioApiWithCredentials(): void
@@ -54,11 +55,9 @@ public function testARequestCanBeSentToTheTwilioApiWithCredentials(): void
 
         /** @var Factory $factory */
         $factory = $this->app->make(Factory::class);
-        $factory->fake(
-            [
-                $url => $factory->response('', 200, []),
-            ]
-        );
+        $factory->fake([
+            $url => $factory->response('', 200, []),
+        ]);
 
         (new LaravelHttpClient($factory))->request(
             'POST',
@@ -70,9 +69,46 @@ public function testARequestCanBeSentToTheTwilioApiWithCredentials(): void
             'password'
         );
 
-        $factory->assertSent(static fn(Request $request, Response $response): bool => $request->hasHeader('Authorization')
+        $factory->assertSent(
+            static fn(Request $request, Response $response): bool => $request->hasHeader('Authorization')
                 && $request->url() === $url
-                && $request->data() === $messageData);
+                && $request->data() === $messageData
+        );
+    }
+
+    public function testARequestCanBeSentToTheTwilioApiWithAuthStrategy(): void
+    {
+        $url         = 'https://api.twilio.com/2010-04-01/Accounts/SID/Messages.json';
+        $headers     = [];
+        $messageData = [
+            'From' => '+16512432364',
+            'To'   => '+18003285920',
+            'Body' => 'Test Message',
+        ];
+
+        /** @var Factory $factory */
+        $factory = $this->app->make(Factory::class);
+        $factory->fake([
+            $url => $factory->response('', 200, []),
+        ]);
+
+        (new LaravelHttpClient($factory))->request(
+            'POST',
+            $url,
+            [],
+            $messageData,
+            $headers,
+            null,
+            null,
+            null,
+            new BasicAuthStrategy('username', 'password'),
+        );
+
+        $factory->assertSent(
+            static fn(Request $request, Response $response): bool => $request->hasHeader('Authorization')
+                && $request->url() === $url
+                && $request->data() === $messageData
+        );
     }
 
     public function testAnExceptionIsThrownWhenThereIsAnErrorPerformingTheRequest(): void
@@ -89,13 +125,11 @@ public function testAnExceptionIsThrownWhenThereIsAnErrorPerformingTheRequest():
 
         /** @var Factory $factory */
         $factory = $this->app->make(Factory::class);
-        $factory->fake(
-            [
-                $url => static function (): void {
-                    throw new \RuntimeException('Testing');
-                },
-            ]
-        );
+        $factory->fake([
+            $url => static function (): void {
+                throw new \RuntimeException('Testing');
+            },
+        ]);
 
         (new LaravelHttpClient($factory))->request(
             'POST',