aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortranstrike <transtrike@gmail.com>2020-12-16 17:56:39 +0200
committertranstrike <transtrike@gmail.com>2020-12-16 17:56:39 +0200
commite46bfcf0d9ef6e927b2922c63dacde9442fe82d3 (patch)
tree2e66ffd1ae55152d5995c4e4c78de817af9fd874
parent534f3012d19b8a8a114153c11e7f8109577ac6e9 (diff)
downloadDevHive-e46bfcf0d9ef6e927b2922c63dacde9442fe82d3.tar
DevHive-e46bfcf0d9ef6e927b2922c63dacde9442fe82d3.tar.gz
DevHive-e46bfcf0d9ef6e927b2922c63dacde9442fe82d3.zip
Register now returns token, instead of requiring the user to login
-rw-r--r--src/DevHive.Services/Services/UserService.cs4
-rw-r--r--src/DevHive.Web/Controllers/UserController.cs6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/DevHive.Services/Services/UserService.cs b/src/DevHive.Services/Services/UserService.cs
index 1e81837..05a48b3 100644
--- a/src/DevHive.Services/Services/UserService.cs
+++ b/src/DevHive.Services/Services/UserService.cs
@@ -40,7 +40,7 @@ namespace DevHive.Services.Services
return new TokenServiceModel(WriteJWTSecurityToken(user.Role));
}
- public async Task<UserServiceModel> RegisterUser(RegisterServiceModel registerModel)
+ public async Task<TokenServiceModel> RegisterUser(RegisterServiceModel registerModel)
{
if (await this._userRepository.DoesUsernameExist(registerModel.UserName))
throw new ArgumentException("Username already exists!");
@@ -54,7 +54,7 @@ namespace DevHive.Services.Services
await this._userRepository.AddAsync(user);
- return this._userMapper.Map<UserServiceModel>(user);
+ return new TokenServiceModel(WriteJWTSecurityToken(user.Role));
}
public async Task<UserServiceModel> GetUserById(Guid id)
diff --git a/src/DevHive.Web/Controllers/UserController.cs b/src/DevHive.Web/Controllers/UserController.cs
index 44828e0..f952355 100644
--- a/src/DevHive.Web/Controllers/UserController.cs
+++ b/src/DevHive.Web/Controllers/UserController.cs
@@ -43,10 +43,10 @@ namespace DevHive.Web.Controllers
{
RegisterServiceModel registerServiceModel = this._userMapper.Map<RegisterServiceModel>(registerModel);
- UserServiceModel userServiceModel = await this._userService.RegisterUser(registerServiceModel);
- UserWebModel userWebModel = this._userMapper.Map<UserWebModel>(userServiceModel);
+ TokenServiceModel tokenServiceModel = await this._userService.RegisterUser(registerServiceModel);
+ TokenWebModel tokenWebModel = this._userMapper.Map<TokenWebModel>(tokenServiceModel);
- return new CreatedResult("Register", userWebModel);
+ return new CreatedResult("Register", tokenWebModel);
}
//Read