From 534f3012d19b8a8a114153c11e7f8109577ac6e9 Mon Sep 17 00:00:00 2001
From: transtrike <transtrike@gmail.com>
Date: Wed, 16 Dec 2020 17:48:55 +0200
Subject: Fixed User Service and User Controller return types

---
 .../Configurations/Mapping/UserMappings.cs         |  2 ++
 src/DevHive.Web/Controllers/UserController.cs      | 26 ++++++++++++++++------
 .../Models/Identity/User/TokenWebModel.cs          | 12 ++++++++++
 3 files changed, 33 insertions(+), 7 deletions(-)
 create mode 100644 src/DevHive.Web/Models/Identity/User/TokenWebModel.cs

(limited to 'src/DevHive.Web')

diff --git a/src/DevHive.Web/Configurations/Mapping/UserMappings.cs b/src/DevHive.Web/Configurations/Mapping/UserMappings.cs
index 06083de..1fdfc6a 100644
--- a/src/DevHive.Web/Configurations/Mapping/UserMappings.cs
+++ b/src/DevHive.Web/Configurations/Mapping/UserMappings.cs
@@ -15,6 +15,8 @@ namespace DevHive.Web.Configurations.Mapping
 			CreateMap<UpdateUserWebModel, UpdateUserServiceModel>();
 
 			CreateMap<UserServiceModel, UserWebModel>();
+
+			CreateMap<TokenServiceModel, TokenWebModel>();
 		}
 	} 
 }
diff --git a/src/DevHive.Web/Controllers/UserController.cs b/src/DevHive.Web/Controllers/UserController.cs
index 74eccd4..44828e0 100644
--- a/src/DevHive.Web/Controllers/UserController.cs
+++ b/src/DevHive.Web/Controllers/UserController.cs
@@ -31,7 +31,10 @@ namespace DevHive.Web.Controllers
 		{
 			LoginServiceModel loginServiceModel = this._userMapper.Map<LoginServiceModel>(loginModel);
 
-			return await this._userService.LoginUser(loginServiceModel);
+			TokenServiceModel tokenServiceModel = await this._userService.LoginUser(loginServiceModel);
+			TokenWebModel tokenWebModel = this._userMapper.Map<TokenWebModel>(tokenServiceModel);
+
+			return new OkObjectResult(tokenWebModel);
 		}
 
 		[HttpPost]
@@ -40,27 +43,35 @@ namespace DevHive.Web.Controllers
 		{
 			RegisterServiceModel registerServiceModel = this._userMapper.Map<RegisterServiceModel>(registerModel);
 
-			return await this._userService.RegisterUser(registerServiceModel);
+			UserServiceModel userServiceModel = await this._userService.RegisterUser(registerServiceModel);
+			UserWebModel userWebModel = this._userMapper.Map<UserWebModel>(userServiceModel);
+
+			return new CreatedResult("Register", userWebModel);
 		}
 
 		//Read
 		[HttpGet]
 		public async Task<IActionResult> GetById(Guid id)
 		{
-			UserServiceModel serviceModel = await this._userService.GetUserById(id);
+			UserServiceModel userServiceModel = await this._userService.GetUserById(id);
+			UserWebModel userWebModel = this._userMapper.Map<UserWebModel>(userServiceModel);
 
-			return new OkObjectResult(this._userMapper.Map<UserWebModel>(serviceModel));
+			return new OkObjectResult(userWebModel);
 		}
 
 		//Update
 		[HttpPut]
-		[Authorize]
+		[Authorize(Roles = Role.DefaultRole)]
 		public async Task<IActionResult> Update(Guid id, [FromBody] UpdateUserWebModel updateModel)
 		{
 			UpdateUserServiceModel updateUserServiceModel = this._userMapper.Map<UpdateUserServiceModel>(updateModel);
 			updateUserServiceModel.Id = id;
 
-			return await this._userService.UpdateUser(updateUserServiceModel);
+			UserServiceModel userServiceModel = await this._userService.UpdateUser(updateUserServiceModel);
+			UserWebModel userWebModel = this._userMapper.Map<UserWebModel>(userServiceModel);
+
+			return new AcceptedResult("UpdateUser", userWebModel);
+
 		}
 
 		//Delete
@@ -68,7 +79,8 @@ namespace DevHive.Web.Controllers
 		[Authorize(Roles = Role.DefaultRole)]
 		public async Task<IActionResult> Delete(Guid id)
 		{
-			return await this._userService.DeleteUser(id);
+			await this._userService.DeleteUser(id);
+			return new OkResult();
 		}
 	}
 }
diff --git a/src/DevHive.Web/Models/Identity/User/TokenWebModel.cs b/src/DevHive.Web/Models/Identity/User/TokenWebModel.cs
new file mode 100644
index 0000000..154b64b
--- /dev/null
+++ b/src/DevHive.Web/Models/Identity/User/TokenWebModel.cs
@@ -0,0 +1,12 @@
+namespace DevHive.Web.Models.Identity.User
+{
+	public class TokenWebModel
+	{
+		public TokenWebModel(string token)
+		{
+			this.Token = token;
+		}
+
+		public string Token { get; set; }
+	}
+}
\ No newline at end of file
-- 
cgit v1.2.3