From e46bfcf0d9ef6e927b2922c63dacde9442fe82d3 Mon Sep 17 00:00:00 2001
From: transtrike <transtrike@gmail.com>
Date: Wed, 16 Dec 2020 17:56:39 +0200
Subject: Register now returns token, instead of requiring the user to login

---
 src/DevHive.Services/Services/UserService.cs  | 4 ++--
 src/DevHive.Web/Controllers/UserController.cs | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

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
-- 
cgit v1.2.3