WIP, close to working test but no end to end test

Author: SecondeJK

sample/Archiving/README.md

@@ -19,7 +19,7 @@ Next, input your own API Key and API Secret into the `run-demo` script file:
 
 ```
   export API_KEY=0000000
-  export API_SECRET=abcdef1234567890abcdef01234567890abcdef
+  export API_SECRET=b60d0b2568f3ea9731bd9d3f71be263ce19f802f
 ```
 
 Finally, start the PHP CLI development server (requires PHP >= 5.4) using the `run-demo` script

src/OpenTok/Archive.php

@@ -144,8 +144,6 @@ public function __construct($archiveData, $options = array())
 
         $this->client = isset($client) ? $client : new Client();
         if (!$this->client->isConfigured()) {
-            Validators::validateApiKey($apiKey);
-            Validators::validateApiSecret($apiSecret);
             Validators::validateApiUrl($apiUrl);
 
             $this->client->configure($apiKey, $apiSecret, $apiUrl);

src/OpenTok/ArchiveList.php

@@ -49,8 +49,6 @@ public function __construct($archiveListData, $options = array())
 
         $this->client = isset($client) ? $client : new Client();
         if (!$this->client->isConfigured()) {
-            Validators::validateApiKey($apiKey);
-            Validators::validateApiSecret($apiSecret);
             Validators::validateApiUrl($apiUrl);
 
             $this->client->configure($apiKey, $apiSecret, $apiUrl);

src/OpenTok/Broadcast.php

@@ -147,8 +147,6 @@ public function __construct($broadcastData, $options = array())
         $this->client = $options['client'] ?? new Client();
 
         if (!$this->client->isConfigured()) {
-            Validators::validateApiKey($options['apiKey']);
-            Validators::validateApiSecret($options['apiSecret']);
             Validators::validateApiUrl($options['apiUrl']);
 
             $this->client->configure($options['apiKey'], $options['apiSecret'], $options['apiUrl']);

src/OpenTok/OpenTok.php

@@ -25,6 +25,9 @@
 * and the API secret for your <a href="https://tokbox.com/account">OpenTok Video API account</a>. Do not
 * publicly share your API secret. You will use it with the OpenTok() constructor (only on your web
 * server) to create OpenTok sessions.
+*
+* If you set api_key to a VONAGE_APPLICATION_ID and api_secret to a VONAGE_PRIVATE_KEY_PATH, the SDK
+* will hit Vonage Video with Vonage Auth instead.
 * <p>
 * Be sure to include the entire OpenTok server SDK on your web server.
 */
@@ -37,24 +40,25 @@ class OpenTok
     /** @internal */
     private $client;
 
+    /**
+     * @var bool
+     * Override to determine whether to hit Vonage servers with Vonage Auth in requests
+     */
+    private $vonage = false;
+
     /**
      * @var array
      * @internal
-     * Options that can override the defaults. Additionally, you can set the keys
-     * application_id & private_key_path to strings that will then override the default
-     * OpenTok Client behaviour when making requests to the Vonage Video API.
      */
     public $options;
 
     /** @internal */
     public function __construct($apiKey, $apiSecret, $options = array())
     {
-        $validateKeys = true;
-        Validators::validateVonageJwtArguments($options);
         $apiUrl = 'https://api.opentok.com';
 
-        if (array_key_exists('application_id', $options) && array_key_exists('private_key_path', $options)) {
-            $validateKeys = false;
+        if (Validators::isVonageKeypair($apiKey, $apiSecret)) {
+            $this->vonage = true;
             $apiUrl = 'https://video.api.vonage.com';
         }
 
@@ -63,20 +67,12 @@ public function __construct($apiKey, $apiSecret, $options = array())
             'apiUrl' => $apiUrl,
             'client' => null,
             'timeout' => null, // In the future we should set this to 2
-            'application_id' => null,
-            'private_key_path' => null,
         );
 
         $this->options = array_merge($defaults, array_intersect_key($options, $defaults));
 
         list($apiUrl, $client, $timeout) = array_values($this->options);
 
-        // validate arguments
-        if ($validateKeys) {
-            Validators::validateApiKey($apiKey);
-            Validators::validateApiSecret($apiSecret);
-        }
-
         Validators::validateApiUrl($apiUrl);
         Validators::validateClient($client);
         Validators::validateDefaultTimeout($timeout);
@@ -138,9 +134,6 @@ public function __construct($apiKey, $apiSecret, $options = array())
      * @param bool $legacy By default, OpenTok uses SHA256 JWTs for authentication. Switching
      * legacy to true will create a T1 token for backwards compatibility.
      *
-     * Optionally, you can set $vonage to true and it will generate a Vonage Video token if you are using
-     * the shim behaviour.
-     *
      * @return string The token string.
      */
     public function generateToken(string $sessionId, array $payload = array(), bool $legacy = false): string

src/OpenTok/Util/Client.php

@@ -47,8 +47,6 @@ class Client
 
     protected $apiKey;
     protected $apiSecret;
-    protected $applicationId = null;
-    protected $privateKeyPath = null;
     protected $configured = false;
 
     /**
@@ -67,14 +65,6 @@ public function configure($apiKey, $apiSecret, $apiUrl, $options = array())
         $this->apiKey = $apiKey;
         $this->apiSecret = $apiSecret;
 
-        if (array_key_exists('application_id', $options) || array_key_exists('private_key_path', $options)) {
-            if (!is_null($options['application_id']) && !is_null($options['private_key_path'])) {
-                $this->applicationId = $options['application_id'];
-                $this->privateKeyPath = $options['private_key_path'];
-                $apiUrl = 'https://video.api.vonage.com';
-            }
-        }
-
         if (isset($this->options['client'])) {
             $this->client = $options['client'];
         } else {
@@ -135,11 +125,8 @@ public function isConfigured()
 
     private function createAuthHeader()
     {
-        if (!is_null($this->applicationId) && !is_null($this->privateKeyPath)) {
-            $projectRoot = dirname(__DIR__, 3); // Adjust the number of dirname() calls if necessary to match your
-            // project structure.
-            $privateKeyFullPath = $projectRoot . DIRECTORY_SEPARATOR . $this->privateKeyPath;
-            $tokenGenerator = new TokenGenerator($this->applicationId, file_get_contents($privateKeyFullPath));
+        if (Validators::isVonageKeypair($this->apiKey, $this->apiSecret)) {
+            $tokenGenerator = new TokenGenerator($this->apiKey, file_get_contents($this->apiSecret));
             return $tokenGenerator->generate();
         }
 

src/OpenTok/Util/Validators.php

@@ -13,6 +13,7 @@
 use OpenTok\Exception\InvalidArgumentException;
 use JohnStevenson\JsonWorks\Document;
 use JohnStevenson\JsonWorks\Utils as JsonUtils;
+use RuntimeException;
 
 /**
 * @internal
@@ -25,31 +26,44 @@ class Validators
 
     public const STREAM_MODES = ['auto', 'manual'];
 
-    public static function validateApiKey($apiKey)
+    public static function isVonageKeypair($apiKey, $apiSecret): bool
     {
-        if (!(is_string($apiKey) || is_int($apiKey))) {
-            throw new InvalidArgumentException(
-                'The apiKey was not a string nor an integer: ' . print_r($apiKey, true)
-            );
+        if (!is_string($apiKey) || !is_string($apiSecret)) {
+            throw new InvalidArgumentException("API Key and API Secret must be strings.");
+        }
+
+        $isOpenTokKey = preg_match('/^\d+$/', $apiKey);
+        $isOpenTokSecret = preg_match('/^[a-f0-9]{40}$/i', $apiSecret);
+
+        if ($isOpenTokKey && $isOpenTokSecret) {
+            return false;
+        }
+
+        $isVonageApplicationId = preg_match('/^[a-f0-9\-]{36}$/i', $apiKey);
+        $isVonagePrivateKey = self::isValidPrivateKey($apiSecret);
+
+        if ($isVonageApplicationId && $isVonagePrivateKey) {
+            return true;
         }
+
+        // Mixed formats or invalid formats - throw an exception
+        throw new InvalidArgumentException("Invalid Vonage Keypair credentials provided.");
     }
 
-    public static function validateVonageJwtArguments(array $options)
+    private static function isValidPrivateKey(string $filePath): bool
     {
-        if (!isset($data['application_id']) && !isset($data['private_key_path'])) {
-            return;
+        if (!file_exists($filePath) || !is_readable($filePath)) {
+            throw new InvalidArgumentException("Private key file does not exist or is not readable.");
         }
 
-        if (isset($data['application_id']) && isset($data['private_key_path'])) {
-            if (is_string($data['application_id']) && is_string($data['private_key_path'])) {
-                return;
-            };
+        $keyContents = file_get_contents($filePath);
+
+        if ($keyContents === false) {
+            throw new RuntimeException("Failed to read private key file.");
         }
 
-        // If one key is present but not the other, validation fails
-        throw new InvalidArgumentException(
-            'You are attempting to use the Vonage Video API. Both application_id and private key paths must be in options and both strings.'
-        );
+        // Check if it contains a valid private RSA key header
+        return (bool) preg_match('/^-----BEGIN PRIVATE KEY-----[\s\S]+-----END PRIVATE KEY-----$/m', trim($keyContents));
     }
 
     public static function validateForceMuteAllOptions(array $options)
@@ -74,13 +88,6 @@ public static function validateForceMuteAllOptions(array $options)
         }
     }
 
-    public static function validateApiSecret($apiSecret)
-    {
-        if (!(is_string($apiSecret))) {
-            throw new InvalidArgumentException('The apiSecret was not a string: ' . print_r($apiSecret, true));
-        }
-    }
-
     public static function validateApiUrl($apiUrl)
     {
         if (!(is_string($apiUrl) && filter_var($apiUrl, FILTER_VALIDATE_URL))) {

tests/OpenTokTest/ArchiveTest.php

@@ -62,7 +62,7 @@ public function setupArchives($streamMode)
     private function setupOTWithMocks($mocks)
     {
         $this->API_KEY = defined('API_KEY') ? API_KEY : '12345678';
-        $this->API_SECRET = defined('API_SECRET') ? API_SECRET : '0123456789abcdef0123456789abcdef0123456789';
+        $this->API_SECRET = defined('API_SECRET') ? API_SECRET : 'b60d0b2568f3ea9731bd9d3f71be263ce19f802f';
 
         if (is_array($mocks)) {
             $responses = TestHelpers::mocksToResponses($mocks, self::$mockBasePath);

tests/OpenTokTest/BroadcastTest.php

@@ -69,7 +69,7 @@ public function setupBroadcasts($streamMode)
     private function setupOTWithMocks($mocks)
     {
         $this->API_KEY = defined('API_KEY') ? API_KEY : '12345678';
-        $this->API_SECRET = defined('API_SECRET') ? API_SECRET : '0123456789abcdef0123456789abcdef0123456789';
+        $this->API_SECRET = defined('API_SECRET') ? API_SECRET : 'b60d0b2568f3ea9731bd9d3f71be263ce19f802f';
 
         if (is_array($mocks)) {
             $responses = TestHelpers::mocksToResponses($mocks, self::$mockBasePath);
@@ -98,39 +98,6 @@ private function setupOTWithMocks($mocks)
         $handlerStack->push($history);
     }
 
-    public function testCannotCreateBroadcastWithAddInvalidApiKey(): void
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('The apiKey was not a string nor an integer: ');
-
-        $broadcastObject = new Broadcast($this->broadcastData, [
-            'apiKey' => new Client()
-        ]);
-    }
-
-    public function testCannotCreateBroadcastWithInvalidApiSecret(): void
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('The apiSecret was not a string: OpenTok\Util\Client Object');
-
-        $broadcastObject = new Broadcast($this->broadcastData, [
-            'apiKey' => 'test',
-            'apiSecret' => new Client()
-        ]);
-    }
-
-    public function testCannotCreateBroadcastWithInvalidApiUrl(): void
-    {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('The optional apiUrl was not a string: ');
-
-        $broadcastObject = new Broadcast($this->broadcastData, [
-            'apiKey' => 'validKey',
-            'apiSecret' => 'validSecret',
-            'apiUrl' => 'test'
-        ]);
-    }
-
     private function setupOT()
     {
         return $this->setupOTWithMocks([]);