feat: extend support for VideoTokenGenerator

Vonage · Dec 13, 2023 · 8716a7a · 8716a7a
1 parent 8af1d00
commit 8716a7a
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 28 deletions.
diff --git a/Vonage.Common/Exceptions/VonageAuthenticationException.cs b/Vonage.Common/Exceptions/VonageAuthenticationException.cs
@@ -24,4 +24,12 @@ public static VonageAuthenticationException FromMissingApiKeyOrSecret() =>
     /// <returns>The exception.</returns>
     public static VonageAuthenticationException FromMissingApplicationIdOrPrivateKey() =>
         new("AppId or Private Key Path missing.");
+
+    /// <summary>
+    /// Creates an exception indicating the ApplicationId or PrivateKeyPath are missing.
+    /// </summary>
+    /// <param name="failure">The failure.</param>
+    /// <returns>The exception.</returns>
+    public static VonageAuthenticationException FromError(string failure) =>
+        new(failure);
 }
diff --git a/Vonage.Common/Failures/AuthenticationFailure.cs b/Vonage.Common/Failures/AuthenticationFailure.cs
@@ -5,13 +5,17 @@
 namespace Vonage.Common.Failures;
 
 /// <inheritdoc />
-public struct AuthenticationFailure : IResultFailure
+public readonly struct AuthenticationFailure : IResultFailure
 {
+    private readonly string failure;
+
+    public AuthenticationFailure(string failure) => this.failure = failure;
+
     /// <inheritdoc />
     public Type Type => typeof(AuthenticationFailure);
 
     /// <inheritdoc />
-    public string GetFailureMessage() => VonageAuthenticationException.FromMissingApplicationIdOrPrivateKey().Message;
+    public string GetFailureMessage() => this.failure;
 
     /// <inheritdoc />
     public Exception ToException() => VonageAuthenticationException.FromMissingApplicationIdOrPrivateKey();

diff --git a/Vonage.Test.Unit/JwtTest.cs b/Vonage.Test.Unit/JwtTest.cs
@@ -17,7 +17,8 @@ public class JwtTest
         [InlineData(" ")]
         [InlineData(null)]
         public void GenerateToken_ShouldReturnAuthenticationFailure_GivenPrivateKeyIsNullOrWhitespace(string key) =>
-            new Jwt().GenerateToken(ApplicationId, key).Should().BeFailure(new AuthenticationFailure());
+            new Jwt().GenerateToken(ApplicationId, key).Should()
+                .BeFailure(new AuthenticationFailure("AppId or Private Key Path missing."));
 
         [Fact]
         public void GenerateToken_ShouldReturnSuccess_GivenCredentialsAreProvided() =>

diff --git a/Vonage.Test.Unit/Video/Authentication/VideoTokenGeneratorTest.cs b/Vonage.Test.Unit/Video/Authentication/VideoTokenGeneratorTest.cs
@@ -15,19 +15,15 @@ public class VideoTokenGeneratorTest
 
         [Fact]
         public void GenerateToken_ShouldReturnFailure_GivenTokenGenerationFails() =>
-            CreateClaims()
-                .Bind(claims =>
-                    new VideoTokenGenerator().GenerateToken(Credentials.FromAppIdAndPrivateKey("123", "random"),
-                        claims))
+            new VideoTokenGenerator().GenerateToken(Credentials.FromAppIdAndPrivateKey("123", "random"), CreateClaims())
                 .Should()
                 .BeFailure(failure =>
                     failure.GetFailureMessage().Should()
                         .Be("RsaUsingSha alg expects key to be of RSA type or Jwk type with kty='RSA'"));
 
         [Fact]
         public void GenerateToken_ShouldReturnSuccess_GivenCredentialsAreProvided() =>
-            CreateClaims()
-                .Bind(claims => new VideoTokenGenerator().GenerateToken(this.GetCredentials(), claims))
+            new VideoTokenGenerator().GenerateToken(this.GetCredentials(), CreateClaims())
                 .Should()
                 .BeSuccess(token =>
                 {

diff --git a/Vonage/Jwt.cs b/Vonage/Jwt.cs
@@ -32,9 +32,9 @@ public Result<string> GenerateToken(string applicationId, string privateKey,
         {
             return CreateToken(applicationId, privateKey);
         }
-        catch (Exception)
+        catch (Exception exception)
         {
-            return Result<string>.FromFailure(new AuthenticationFailure());
+            return Result<string>.FromFailure(new AuthenticationFailure(exception.Message));
         }
     }
 

diff --git a/Vonage/Video/Authentication/IVideoTokenGenerator.cs b/Vonage/Video/Authentication/IVideoTokenGenerator.cs
@@ -14,5 +14,5 @@ public interface IVideoTokenGenerator
     /// <param name="credentials">The application credentials.</param>
     /// <param name="claims">Additional claims for the token.</param>
     /// <returns>A success state with the token if the parsing succeeded. A failure state with an error if it failed.</returns>
-    Result<VideoToken> GenerateToken(Credentials credentials, TokenAdditionalClaims claims);
+    Result<VideoToken> GenerateToken(Credentials credentials, Result<TokenAdditionalClaims> claims);
 }
diff --git a/Vonage/Video/Authentication/VideoTokenGenerator.cs b/Vonage/Video/Authentication/VideoTokenGenerator.cs
@@ -1,6 +1,4 @@
-using System;
-using Vonage.Common.Failures;
-using Vonage.Common.Monads;
+using Vonage.Common.Monads;
 using Vonage.Request;
 
 namespace Vonage.Video.Authentication;
@@ -9,17 +7,10 @@ namespace Vonage.Video.Authentication;
 public class VideoTokenGenerator : Jwt, IVideoTokenGenerator
 {
     /// <inheritdoc />
-    public Result<VideoToken> GenerateToken(Credentials credentials, TokenAdditionalClaims claims)
-    {
-        try
-        {
-            var tokenValue = CreateTokenWithClaims(credentials.ApplicationId, credentials.ApplicationKey,
-                claims.ToDataDictionary());
-            return Result<VideoToken>.FromSuccess(new VideoToken(claims.SessionId, tokenValue));
-        }
-        catch (Exception exception)
-        {
-            return Result<VideoToken>.FromFailure(ResultFailure.FromErrorMessage(exception.Message));
-        }
-    }
+    public Result<VideoToken> GenerateToken(Credentials credentials, Result<TokenAdditionalClaims> claims) =>
+        claims.Bind(validClaim => this.BuildVideoToken(credentials, validClaim));
+
+    private Result<VideoToken> BuildVideoToken(Credentials credentials, TokenAdditionalClaims validClaim) =>
+        this.GenerateToken(credentials, validClaim.ToDataDictionary())
+            .Map(token => new VideoToken(validClaim.SessionId, token));
 }