fix: reuse T1 token until JWT expiration issue is fixed

opentok · Dec 17, 2024 · cbd7690 · cbd7690
1 parent 7b2b297
commit cbd7690
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/OpenTok/OpenTok.cs b/OpenTok/OpenTok.cs
@@ -404,6 +404,7 @@ public async Task<Session> CreateSessionAsync(string location = "", MediaMode me
         /// <returns></returns>
         public string GenerateToken(string sessionId, Role role = Role.PUBLISHER, double expireTime = 0, string data = null, List<string> initialLayoutClassList = null)
         {
+            return this.GenerateT1Token(sessionId, role, expireTime, data, initialLayoutClassList);
             if (String.IsNullOrEmpty(sessionId))
             {
                 throw new OpenTokArgumentException("Session id cannot be empty or null");

diff --git a/OpenTok/Session.cs b/OpenTok/Session.cs
@@ -196,16 +196,17 @@ public string GenerateT1Token(Role role = Role.PUBLISHER, double expireTime = 0,
         public string GenerateToken(Role role = Role.PUBLISHER, double expireTime = 0, string data = null, List<string> initialLayoutClassList = null) =>
             !string.IsNullOrEmpty(this.ApplicationId)
         ? new TokenGenerator().GenerateSessionToken(this.ApplicationId, this.PrivateKey, this.Id)
-        : new TokenGenerator().GenerateSessionToken(new TokenData()
-            {
-                ApiSecret = this.ApiSecret,
-                Role = role,
-                ApiKey = this.ApiKey.ToString(),
-                Data = data,
-                SessionId = this.Id,
-                ExpireTime = expireTime,
-                InitialLayoutClasses = initialLayoutClassList ?? Enumerable.Empty<string>(),
-            });
+        : this.GenerateT1Token(role, expireTime, data, initialLayoutClassList);
+        // : new TokenGenerator().GenerateSessionToken(new TokenData()
+        //     {
+        //         ApiSecret = this.ApiSecret,
+        //         Role = role,
+        //         ApiKey = this.ApiKey.ToString(),
+        //         Data = data,
+        //         SessionId = this.Id,
+        //         ExpireTime = expireTime,
+        //         InitialLayoutClasses = initialLayoutClassList ?? Enumerable.Empty<string>(),
+        //     });
 
         private string BuildTokenString(string dataString)
         {

diff --git a/OpenTokTest/TokenTests.cs b/OpenTokTest/TokenTests.cs
@@ -133,7 +133,7 @@ public class TokenTests
         private const string SessionId = "1_MX4xMjM0NTZ-flNhdCBNYXIgMTUgMTQ6NDI6MjMgUERUIDIwMTR-MC40OTAxMzAyNX4";
         private readonly OpenTok sut = new(ApiKey, ApiSecret);
 
-        [Fact]
+        [Fact(Skip = "Until GA.")]
         public void GenerateToken_ShouldReturnTokenWithDefaultValues()
         {
             var token = sut.GenerateToken(SessionId);
@@ -151,14 +151,14 @@ public void GenerateToken_ShouldReturnTokenWithDefaultValues()
             claims.ContainsKey("initial_layout_class_list").Should().BeFalse();
         }
 
-        [Fact]
+        [Fact(Skip = "Until GA.")]
         public void GenerateToken_ShouldSetData()
         {
             var token = sut.GenerateToken(SessionId, data: "Some data.");
             ExtractClaims(token)["connection_data"].Should().Be("Some data.");
         }
 
-        [Fact]
+        [Fact(Skip = "Until GA.")]
         public void GenerateToken_ShouldSetExpireTime()
         {
             var expireTime = new DateTimeOffset(DateTime.UtcNow.AddSeconds(30)).ToUnixTimeSeconds();
@@ -167,7 +167,7 @@ public void GenerateToken_ShouldSetExpireTime()
             claims["exp"].Should().Be(expireTime.ToString(CultureInfo.InvariantCulture));
         }
 
-        [Fact]
+        [Fact(Skip = "Until GA.")]
         public void GenerateToken_ShouldSetInitialLayoutClass()
         {
             var list = new List<string> {"focus", "hello"};
@@ -176,7 +176,7 @@ public void GenerateToken_ShouldSetInitialLayoutClass()
             claims["initial_layout_list"].Should().Be("focus hello");
         }
 
-        [Theory]
+        [Theory(Skip = "Until GA.")]
         [InlineData(Role.SUBSCRIBER, "subscriber")]
         [InlineData(Role.PUBLISHER, "publisher")]
         [InlineData(Role.MODERATOR, "moderator")]