Refactors JWT creation

waldekmastykarz · Sep 25, 2024 · 391cb1b · 391cb1b
1 parent c8c6309
commit 391cb1b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 44 deletions.
diff --git a/dev-proxy/Jwt/Jwt.cs b/dev-proxy/Jwt/Jwt.cs
diff --git a/dev-proxy/Jwt/JwtCreatorOptions.cs b/dev-proxy/Jwt/JwtCreatorOptions.cs
@@ -27,7 +27,7 @@ public static JwtCreatorOptions Create(JwtOptions options)
             Scopes = options.Scopes ?? [],
             Claims = options.Claims ?? [],
             NotBefore = DateTime.UtcNow,
-            ExpiresOn = DateTime.UtcNow.AddMinutes(options.ValidFor == 0 ? 60 : options.ValidFor)
+            ExpiresOn = DateTime.UtcNow.AddMinutes(options.ValidFor ?? 60)
         };
     }
 }
diff --git a/dev-proxy/Jwt/JwtOptions.cs b/dev-proxy/Jwt/JwtOptions.cs
@@ -11,5 +11,5 @@ public class JwtOptions
     public IEnumerable<string>? Roles { get; set; }
     public IEnumerable<string>? Scopes { get; set; }
     public Dictionary<string, string>? Claims { get; set; }
-    public double ValidFor { get; set; }
+    public double? ValidFor { get; set; }
 }
diff --git a/dev-proxy/Jwt/JwtTokenGenerator.cs b/dev-proxy/Jwt/JwtTokenGenerator.cs
@@ -18,16 +18,6 @@ internal static string CreateToken(JwtOptions jwtOptions)
         );
 
         var jwtToken = jwtIssuer.CreateSecurityToken(options);
-
-        var jwt = Jwt.Create(
-            options.Scheme,
-            jwtToken,
-            new JwtSecurityTokenHandler().WriteToken(jwtToken),
-            options.Scopes,
-            options.Roles,
-            options.Claims
-        );
-
-        return jwt.Token;
+        return new JwtSecurityTokenHandler().WriteToken(jwtToken);
     }
 }