Move NI and Verify to Basic (#529)

Vonage · Jan 9, 2025 · 911bed0 · 911bed0
1 parent 97c41bd
commit 911bed0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/src/Insights/ClientFactory.php b/src/Insights/ClientFactory.php
@@ -6,6 +6,7 @@
 
 use Psr\Container\ContainerInterface;
 use Vonage\Client\APIResource;
+use Vonage\Client\Credentials\Handler\BasicHandler;
 use Vonage\Client\Credentials\Handler\BasicQueryHandler;
 
 class ClientFactory
@@ -15,7 +16,7 @@ public function __invoke(ContainerInterface $container): Client
         /** @var APIResource $api */
         $api = $container->make(APIResource::class);
         $api->setIsHAL(false);
-        $api->setAuthHandlers(new BasicQueryHandler());
+        $api->setAuthHandlers(new BasicHandler());
 
         return new Client($api);
     }

diff --git a/src/Verify/ClientFactory.php b/src/Verify/ClientFactory.php
@@ -6,6 +6,7 @@
 
 use Psr\Container\ContainerInterface;
 use Vonage\Client\APIResource;
+use Vonage\Client\Credentials\Handler\BasicHandler;
 use Vonage\Client\Credentials\Handler\TokenBodyHandler;
 
 class ClientFactory
@@ -18,7 +19,7 @@ public function __invoke(ContainerInterface $container): Client
             ->setIsHAL(false)
             ->setBaseUri('/verify')
             ->setErrorsOn200(true)
-            ->setAuthHandlers(new TokenBodyHandler())
+            ->setAuthHandlers(new BasicHandler())
             ->setExceptionErrorHandler(new ExceptionErrorHandler());
 
         return new Client($api);

diff --git a/test/Insights/ClientTest.php b/test/Insights/ClientTest.php
@@ -52,6 +52,7 @@ public function setUp(): void
         $this->api = new APIResource();
         $this->api->setIsHAL(false);
         $this->api->setClient($this->vonageClient->reveal());
+        $this->api->setAuthHandlers(new Client\Credentials\Handler\BasicHandler());
 
         $this->insightsClient = new InsightsClient($this->api);
     }

diff --git a/test/Verify/ClientTest.php b/test/Verify/ClientTest.php
@@ -51,22 +51,23 @@ public function setUp(): void
             ->setIsHAL(false)
             ->setBaseUri('/verify')
             ->setErrorsOn200(true)
-            ->setAuthHandlers(new Client\Credentials\Handler\TokenBodyHandler())
+            ->setAuthHandlers(new Client\Credentials\Handler\BasicHandler())
             ->setClient($this->vonageClient->reveal())
             ->setExceptionErrorHandler(new ExceptionErrorHandler());
 
         $this->client = new VerifyClient($api);
     }
 
-    public function testUsesCorrectAuthInBody(): void
+    public function testUsesCorrectAuth(): void
     {
         $this->vonageClient->send(
             Argument::that(
                 function (RequestInterface $request) {
-                    $this->assertRequestJsonBodyContains('api_key', 'abc', $request);
-                    $this->assertRequestJsonBodyContains('api_secret', 'def', $request);
                     $this->assertRequestMatchesUrl('https://api.nexmo.com/verify/psd2/json', $request);
-
+                    $this->assertEquals(
+                        'Basic ',
+                        mb_substr($request->getHeaders()['Authorization'][0], 0, 6)
+                    );
                     return true;
                 }
             )