diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-06-24 09:49:45 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-06-24 09:49:45 +0300 |
| commit | 5095a1dd5f65a7659083cae6dfccb34007720ee9 (patch) | |
| tree | 62b46d5b437c0d9236827ec46357dd1b1b18c946 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService | |
| parent | 121c706c24da22e48b0e4d4dacc7ade8fef757bb (diff) | |
| parent | c6b1a719bac638a647dc2e4af51ad888c9f5039d (diff) | |
| download | Tango-5095a1dd5f65a7659083cae6dfccb34007720ee9.tar.gz Tango-5095a1dd5f65a7659083cae6dfccb34007720ee9.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs index 907dcf757..9b03cda30 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs @@ -58,7 +58,8 @@ namespace Tango.MachineStudio.UpdateService db.UsersRoles.ToList(); db.RolesPermissions.ToList(); - var user = db.Users.SingleOrDefault(x => x.Email.ToLower() == request.Email.ToLower() && x.Password == request.Password); + String hash = User.GetPasswordHash(request.Password); + var user = db.Users.SingleOrDefault(x => x.Email.ToLower() == request.Email.ToLower() && x.Password == hash); if (user != null && user.HasPermission(Permissions.RunMachineStudio)) { @@ -107,7 +108,9 @@ namespace Tango.MachineStudio.UpdateService db.UsersRoles.ToList(); db.RolesPermissions.ToList(); - var user = db.Users.SingleOrDefault(x => x.Email.ToLower() == request.Email.ToLower() && x.Password == request.Password); + String hash = User.GetPasswordHash(request.Password); + + var user = db.Users.SingleOrDefault(x => x.Email.ToLower() == request.Email.ToLower() && x.Password == hash); if (user != null && user.HasPermission(Permissions.PublishMachineStudioVersion)) { |