fix: added usertypeid and user type to jwt token.

PERUSTARS/PERUSTARS/IdentityAndAccountManagement/Application/Commands/Handlers/GenerateJwtTokenCommandHandler.cs

@@ -34,14 +34,18 @@ public async Task<string> Handle(GenerateJwtTokenCommand request, CancellationTo
                 {
                 new Claim(ClaimTypes.Sid, request.User.UserId.ToString()),
                 new Claim(ClaimTypes.Email, request.User.Email),
-                new Claim(ClaimTypes.Name, request.User.FirstName + " " + request.User.LastName)
+                new Claim(ClaimTypes.Name, request.User.FirstName + " " + request.User.LastName),
+                new Claim(ClaimTypes.Role, request.User.Artist != null ? "Artist" : (request.User.Hobbyist != null ? "Hobbyist" : "")),
+                new Claim(ClaimTypes.NameIdentifier, request.User.Artist != null ? request.User.Artist.ArtistId.ToString() : (request.User.Hobbyist != null ? request.User.Hobbyist.HobbyistId.ToString() : ""))
             }),
                 Expires = DateTime.UtcNow.AddHours(4),
                 SigningCredentials = new SigningCredentials(
                     new SymmetricSecurityKey(key),
                     SecurityAlgorithms.HmacSha512Signature)
             };
             var tokenHandler = new JwtSecurityTokenHandler();
+            tokenHandler.InboundClaimTypeMap.Clear();
+            tokenHandler.InboundClaimTypeMap.Add("nameid", "usertypeid");
             var token = tokenHandler.CreateToken(tokenDescriptor);
             var tokenStr = tokenHandler.WriteToken(token);
 

PERUSTARS/PERUSTARS/IdentityAndAccountManagement/Application/Commands/Handlers/LogInUserCommandHandler.cs

@@ -48,16 +48,14 @@ public async Task<AuthenticateResponse> Handle(LogInUserCommand request, Cancell
                 {
                     Token = null,
                     Message = "Username or password is incorrect.",
-                    UserType = null
                 };
             }
             var generateTokenCommand = new GenerateJwtTokenCommand { User = user };
             var jwtToken = await _generateJwtTokenHandler.Handle(generateTokenCommand, cancellationToken);
 
             var response = new AuthenticateResponse {
                 Token = jwtToken,
-                Message = "User logged in successfully",
-                UserType = user.Artist != null ? "Artist" : (user.Hobbyist != null ? "Hobbyist" : null)
+                Message = "User logged in successfully"
             };
             UserLoggedInEvent userLoggedInEvent = new UserLoggedInEvent();
             await _publisher.Publish(userLoggedInEvent);

PERUSTARS/PERUSTARS/IdentityAndAccountManagement/Interfaces/REST/Resources/AuthenticateResponse.cs

@@ -4,7 +4,6 @@ public class AuthenticateResponse
     {
         public string? Token { get; set; }
         public string Message { get; set; }
-        public string? UserType { get; set; }
     }
 }
 

PERUSTARS/PERUSTARS/bin/Debug/net5.0/PERUSTARS.runtimeconfig.dev.json

@@ -1,9 +1,8 @@
 {
   "runtimeOptions": {
     "additionalProbingPaths": [
-      "C:\\Users\\HP\\.dotnet\\store\\|arch|\\|tfm|",
-      "C:\\Users\\HP\\.nuget\\packages",
-      "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
+      "C:\\Users\\Mauricio\\.dotnet\\store\\|arch|\\|tfm|",
+      "C:\\Users\\Mauricio\\.nuget\\packages"
     ]
   }
 }