diff options
| author | transtrike <transtrike@gmail.com> | 2020-12-18 10:12:07 +0200 |
|---|---|---|
| committer | transtrike <transtrike@gmail.com> | 2020-12-18 10:12:07 +0200 |
| commit | c50dd1608bff971cd052b375a3c2e618bc98f1c2 (patch) | |
| tree | 0b9903a1ae284048569c9aa97c5e994e85ead894 /src/DevHive.Services/Services/UserService.cs | |
| parent | 12408f43a7a954042358196ee080439aa7aed700 (diff) | |
| parent | 7acec816fe021db4a3922b70ce9b3f50e7600c79 (diff) | |
| download | DevHive-c50dd1608bff971cd052b375a3c2e618bc98f1c2.tar DevHive-c50dd1608bff971cd052b375a3c2e618bc98f1c2.tar.gz DevHive-c50dd1608bff971cd052b375a3c2e618bc98f1c2.zip | |
Merge branch 'dev' of github.com:Team-Kaleidoscope/DevHive into dev
Diffstat (limited to 'src/DevHive.Services/Services/UserService.cs')
| -rw-r--r-- | src/DevHive.Services/Services/UserService.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/DevHive.Services/Services/UserService.cs b/src/DevHive.Services/Services/UserService.cs index 134a142..d3c0d0d 100644 --- a/src/DevHive.Services/Services/UserService.cs +++ b/src/DevHive.Services/Services/UserService.cs @@ -40,7 +40,7 @@ namespace DevHive.Services.Services if (user.PasswordHash != GeneratePasswordHash(loginModel.Password)) throw new ArgumentException("Incorrect password!"); - return new TokenModel(WriteJWTSecurityToken(user.UserName, user.PasswordHash, user.Roles)); + return new TokenModel(WriteJWTSecurityToken(user.UserName, user.Roles)); } public async Task<TokenModel> RegisterUser(RegisterServiceModel registerModel) @@ -64,7 +64,7 @@ namespace DevHive.Services.Services await this._userRepository.AddAsync(user); - return new TokenModel(WriteJWTSecurityToken(user.UserName, user.PasswordHash, user.Roles)); + return new TokenModel(WriteJWTSecurityToken(user.UserName, user.Roles)); } public async Task<UserServiceModel> GetUserById(Guid id) @@ -110,14 +110,13 @@ namespace DevHive.Services.Services return string.Join(string.Empty, SHA512.HashData(Encoding.ASCII.GetBytes(password))); } - private string WriteJWTSecurityToken(string userName, string passwordHash, IList<Role> roles) + private string WriteJWTSecurityToken(string userName, IList<Role> roles) { byte[] signingKey = Encoding.ASCII.GetBytes(_jwtOptions.Secret); List<Claim> claims = new() { new Claim(ClaimTypes.Name, userName), - new Claim(ClaimTypes.Hash, passwordHash) }; foreach(var role in roles) |