Merge pull request #365 from opentok/fix-auth-shim

fix: Wrapped Vonage auth validators in try/catch

Author: dragonmantank

src/OpenTok/OpenTok.php

@@ -52,8 +52,12 @@ public function __construct($apiKey, $apiSecret, $options = [])
     {
         $apiUrl = 'https://api.opentok.com';
 
-        if (Validators::isVonageKeypair($apiKey, $apiSecret)) {
-            $apiUrl = 'https://video.api.vonage.com';
+        try {
+            if (Validators::isVonageKeypair($apiKey, $apiSecret)) {
+                $apiUrl = 'https://video.api.vonage.com';
+            }
+        } catch (InvalidArgumentException) {
+            // Not a Vonage Keypair, continue
         }
 
         // unpack optional arguments (merging with default values) into named variables
@@ -1405,4 +1409,9 @@ private function signString(string $string, $secret): string
     {
         return hash_hmac("sha1", $string, (string) $secret);
     }
+
+    public function getClient(): Client
+    {
+        return $this->client;
+    }
 }

src/OpenTok/Util/Client.php

@@ -23,6 +23,7 @@
 use GuzzleHttp\Exception\ServerException;
 use OpenTok\Exception\BroadcastException;
 use GuzzleHttp\Exception\RequestException;
+use InvalidArgumentException;
 use OpenTok\Exception\ArchiveDomainException;
 use OpenTok\Exception\AuthenticationException;
 use OpenTok\Exception\BroadcastDomainException;
@@ -123,9 +124,18 @@ public function isConfigured()
 
     private function createAuthHeader(): string
     {
-        if (Validators::isVonageKeypair($this->apiKey, $this->apiSecret)) {
-            $tokenGenerator = new TokenGenerator($this->apiKey, file_get_contents($this->apiSecret));
-            return $tokenGenerator->generate();
+        try {
+            if (Validators::isVonageKeypair($this->apiKey, $this->apiSecret)) {
+                $secret = $this->apiSecret;
+                if (file_exists($this->apiSecret)) {
+                    $secret = file_get_contents($this->apiSecret);
+                }
+
+                $tokenGenerator = new TokenGenerator($this->apiKey, $secret);
+                return $tokenGenerator->generate();
+            }
+        } catch (InvalidArgumentException) {
+            // Do nothing, fall back to legacy token generation
         }
 
         $token = [
@@ -1084,4 +1094,14 @@ private function isDebug(): bool
     {
         return defined('OPENTOK_DEBUG');
     }
+
+    public function getApiKey(): string
+    {
+        return $this->apiKey;
+    }
+
+    public function getApiSecret(): string
+    {
+        return $this->apiSecret;
+    }
 }

tests/OpenTokTest/OpenTokTest.php

@@ -3419,4 +3419,24 @@ public function testConnectAudioStreamWithInvalidBidirectionalThrows(): void
 
         $this->opentok->connectAudio('9999', 'wrwetg', $badPayload);
     }
+
+    public function testCanCreateClientWithOpenTokCreds(): void
+    {
+        $client = new OpenTok('12345678', 'b60d0b2568f3ea9731bd9d3f71be263ce19f802f');
+        $this->assertInstanceOf(OpenTok::class, $client);
+    }
+
+    public function testCanCreateClientWithOpenTokCredsWithIntKey(): void
+    {
+        $client = new OpenTok(12345678, 'b60d0b2568f3ea9731bd9d3f71be263ce19f802f');
+        $this->assertInstanceOf(OpenTok::class, $client);
+    }
+
+    public function testCanCreateClientWithVonageCreds(): void
+    {
+        $key = file_get_contents(__DIR__ . '/test.key');
+        $client = new OpenTok('1ab38a10-ed9d-4e2b-8b14-95e52d76a13c', $key);
+        $this->assertInstanceOf(OpenTok::class, $client);
+        $this->assertEquals($client->getClient()->getApiSecret(), $key);
+    }
 }