implemented generic Key to IdentityUser

Author: paulomonteirodev

src/NetDevPack.Identity/Jwt/JwtBuilder.cs

@@ -10,7 +10,9 @@
 
 namespace NetDevPack.Identity.Jwt
 {
-    public class JwtBuilder<TIdentityUser> where TIdentityUser : IdentityUser
+    public class JwtBuilder<TIdentityUser, TKey> 
+        where TIdentityUser : IdentityUser<TKey>
+        where TKey : IEquatable<TKey>
     {
         private UserManager<TIdentityUser> _userManager;
         private AppJwtSettings _appJwtSettings;
@@ -19,19 +21,19 @@ public class JwtBuilder<TIdentityUser> where TIdentityUser : IdentityUser
         private ICollection<Claim> _jwtClaims;
         private ClaimsIdentity _identityClaims;
 
-        public JwtBuilder<TIdentityUser> WithUserManager(UserManager<TIdentityUser> userManager)
+        public JwtBuilder<TIdentityUser, TKey> WithUserManager(UserManager<TIdentityUser> userManager)
         {
             _userManager = userManager ?? throw new ArgumentException(nameof(userManager));
             return this;
         }
 
-        public JwtBuilder<TIdentityUser> WithJwtSettings(AppJwtSettings appJwtSettings)
+        public JwtBuilder<TIdentityUser, TKey> WithJwtSettings(AppJwtSettings appJwtSettings)
         {
             _appJwtSettings = appJwtSettings ?? throw new ArgumentException(nameof(appJwtSettings));
             return this;
         }
 
-        public JwtBuilder<TIdentityUser> WithEmail(string email)
+        public JwtBuilder<TIdentityUser, TKey> WithEmail(string email)
         {
             if (string.IsNullOrEmpty(email)) throw new ArgumentException(nameof(email));
 
@@ -43,9 +45,9 @@ public JwtBuilder<TIdentityUser> WithEmail(string email)
             return this;
         }
 
-        public JwtBuilder<TIdentityUser> WithJwtClaims()
+        public JwtBuilder<TIdentityUser, TKey> WithJwtClaims()
         {
-            _jwtClaims.Add(new Claim(JwtRegisteredClaimNames.Sub, _user.Id));
+            _jwtClaims.Add(new Claim(JwtRegisteredClaimNames.Sub, _user.Id.ToString()));
             _jwtClaims.Add(new Claim(JwtRegisteredClaimNames.Email, _user.Email));
             _jwtClaims.Add(new Claim(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString()));
             _jwtClaims.Add(new Claim(JwtRegisteredClaimNames.Nbf, ToUnixEpochDate(DateTime.UtcNow).ToString()));
@@ -56,15 +58,15 @@ public JwtBuilder<TIdentityUser> WithJwtClaims()
             return this;
         }
 
-        public JwtBuilder<TIdentityUser> WithUserClaims()
+        public JwtBuilder<TIdentityUser, TKey> WithUserClaims()
         {
             _userClaims = _userManager.GetClaimsAsync(_user).Result;
             _identityClaims.AddClaims(_userClaims);
 
             return this;
         }
 
-        public JwtBuilder<TIdentityUser> WithUserRoles()
+        public JwtBuilder<TIdentityUser, TKey> WithUserRoles()
         {
             var userRoles = _userManager.GetRolesAsync(_user).Result;
             userRoles.ToList().ForEach(r => _identityClaims.AddClaim(new Claim("role", r)));
@@ -89,13 +91,13 @@ public string BuildToken()
             return tokenHandler.WriteToken(token);
         }
 
-        public UserResponse BuildUserResponse()
+        public UserResponse<TKey> BuildUserResponse()
         {
-            var user = new UserResponse
+            var user = new UserResponse<TKey>
             {
                 AccessToken = BuildToken(),
                 ExpiresIn = TimeSpan.FromHours(_appJwtSettings.Expiration).TotalSeconds,
-                UserToken = new UserToken
+                UserToken = new UserToken<TKey>
                 {
                     Id = _user.Id,
                     Email = _user.Email,
@@ -111,7 +113,7 @@ private static long ToUnixEpochDate(DateTime date)
                 .TotalSeconds);
     }
 
-    public sealed class JwtBuilder : JwtBuilder<IdentityUser>
+    public sealed class JwtBuilder<TKey> : JwtBuilder<IdentityUser<TKey>, TKey> where TKey : IEquatable<TKey>
     {
 
     }

src/NetDevPack.Identity/Jwt/Model/UserResponse.cs

@@ -1,9 +1,9 @@
 namespace NetDevPack.Identity.Jwt.Model
 {
-    public class UserResponse
+    public class UserResponse<TKey>
     {
         public string AccessToken { get; set; }
         public double ExpiresIn { get; set; }
-        public UserToken UserToken { get; set; }
+        public UserToken<TKey> UserToken { get; set; }
     }
 }

src/NetDevPack.Identity/Jwt/Model/UserToken.cs

@@ -2,9 +2,9 @@
 
 namespace NetDevPack.Identity.Jwt.Model
 {
-    public class UserToken
+    public class UserToken<T>
     {
-        public string Id { get; set; }
+        public T Id { get; set; }
         public string Email { get; set; }
         public IEnumerable<UserClaim> Claims { get; set; }
     }