Merge branch 'main' into feature/jwt-change

Author: SecondeJK

tests/OpenTokTest/OpenTokTest.php

@@ -742,31 +742,53 @@ public function testFailsWhenGeneratingTokenUsingInvalidRole(): void
         $token = $this->opentok->generateToken('SESSIONID', array('role' => 'notarole'), true);
     }
 
-    public function testWillCreateJwt(): void
+    public function testWillCreateLegacyT1WhenRequested(): void
     {
-        $openTok = new OpenTok('my-api-key', 'my-super-long-and-cool-api-secret');
-        $token = $openTok->generateToken('some-token-value');
+        $openTok = new OpenTok('12345678', '0123456789abcdef0123456789abcdef0123456789');
+        $token = $openTok->generateToken('1_MX4xMjM0NTY3OH4-VGh1IEZlYiAyNyAwNDozODozMSBQU1QgMjAxNH4wLjI0NDgyMjI', [], true);
 
-        $config = Configuration::forSymmetricSigner(
-            new \Lcobucci\JWT\Signer\Hmac\Sha256(),
-            \Lcobucci\JWT\Signer\Key\InMemory::plainText('my-super-long-and-cool-api-secret')
-        );
-
-        $token = $config->parser()->parse($token);
-        $this->assertInstanceOf(Plain::class, $token);
+        $this->assertEquals('T1', substr($token, 0, 2));
+    }
 
-        $this->assertTrue($config->validator()->validate($token, new \Lcobucci\JWT\Validation\Constraint\SignedWith(
-            $config->signer(),
-            $config->signingKey()
-        )));
+    public function testWillCreateLegacyT1DirectlyToBypassExpBug(): void
+    {
+        $openTok = new OpenTok('12345678', '0123456789abcdef0123456789abcdef0123456789');
+        $token = $openTok->generateToken('1_MX4xMjM0NTY3OH4-VGh1IEZlYiAyNyAwNDozODozMSBQU1QgMjAxNH4wLjI0NDgyMjI', []);
 
-        $this->assertEquals('my-api-key', $token->claims()->get('iss'));
-        $this->assertEquals('some-token-value', $token->claims()->get('session_id'));
-        $this->assertEquals('publisher', $token->claims()->get('role'));
-        $this->assertEquals('project', $token->claims()->get('ist'));
-        $this->assertEquals('session.connect', $token->claims()->get('scope'));
+        $this->assertEquals('T1', substr($token, 0, 2));
     }
 
+    /**
+     * Makes sure that a JWT is generated for the client-side token
+     * 
+     * Currently disabled due to the backend requiring an `exp` claim, which was
+     * not required on T1s. Uncomment when the backend is fixed. - CRT
+     */
+    // public function testWillCreateJwt(): void
+    // {
+    //     $openTok = new OpenTok('my-api-key', 'my-super-long-and-cool-api-secret');
+    //     $token = $openTok->generateToken('some-token-value');
+
+    //     $config = Configuration::forSymmetricSigner(
+    //         new \Lcobucci\JWT\Signer\Hmac\Sha256(),
+    //         \Lcobucci\JWT\Signer\Key\InMemory::plainText('my-super-long-and-cool-api-secret')
+    //     );
+
+    //     $token = $config->parser()->parse($token);
+    //     $this->assertInstanceOf(Plain::class, $token);
+
+    //     $this->assertTrue($config->validator()->validate($token, new \Lcobucci\JWT\Validation\Constraint\SignedWith(
+    //         $config->signer(),
+    //         $config->signingKey()
+    //     )));
+
+    //     $this->assertEquals('my-api-key', $token->claims()->get('iss'));
+    //     $this->assertEquals('some-token-value', $token->claims()->get('session_id'));
+    //     $this->assertEquals('publisher', $token->claims()->get('role'));
+    //     $this->assertEquals('project', $token->claims()->get('ist'));
+    //     $this->assertEquals('session.connect', $token->claims()->get('scope'));
+    // }
+
     public function testStartsArchive(): void
     {
         // Arrange