From ef14a1e9b7ecbcf23fdf3e47a260b81772fc3816 Mon Sep 17 00:00:00 2001
From: Syndamia <kamen.d.mladenov@protonmail.com>
Date: Thu, 13 May 2021 15:41:39 +0300
Subject: Updated user controller models being of type UserViewModel, when they
 should be like UserWebModel

---
 ExamTemplate/Web/Controllers/AccountController.cs | 36 +++++++++++------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'ExamTemplate/Web/Controllers')

diff --git a/ExamTemplate/Web/Controllers/AccountController.cs b/ExamTemplate/Web/Controllers/AccountController.cs
index 414304f..2c2eb32 100644
--- a/ExamTemplate/Web/Controllers/AccountController.cs
+++ b/ExamTemplate/Web/Controllers/AccountController.cs
@@ -29,22 +29,22 @@ namespace ExamTemplate.Web.Controllers
 
 		[HttpPost]
 		[AllowAnonymous]
-		public async Task<IActionResult> Register(RegisterUserViewModel registerUserViewModel)
+		public async Task<IActionResult> Register(RegisterUserWebModel registerUserWebModel)
 		{
 			if (!ModelState.IsValid)
-				return View(registerUserViewModel);
+				return View(registerUserWebModel);
 
-			RegisterUserServiceModel registerUserServiceModel = this._autoMapper.Map<RegisterUserServiceModel>(registerUserViewModel);
+			RegisterUserServiceModel registerUserServiceModel = this._autoMapper.Map<RegisterUserServiceModel>(registerUserWebModel);
 
 			bool result = await this._userService.RegisterUserAsync(registerUserServiceModel);
 
 			if (result)
-				return await this.Login(new LoginUserViewModel { 
+				return await this.Login(new LoginUserWebModel { 
 						Username = registerUserServiceModel.Username,
 						Password = registerUserServiceModel.Password
 						});
 			else
-				return View(registerUserViewModel);
+				return View(registerUserWebModel);
 		}
 
 		[HttpGet]
@@ -56,19 +56,19 @@ namespace ExamTemplate.Web.Controllers
 
 		[HttpPost]
 		[AllowAnonymous]
-		public async Task<IActionResult> Login(LoginUserViewModel loginUserViewModel)
+		public async Task<IActionResult> Login(LoginUserWebModel loginUserWebModel)
 		{
 			if (!ModelState.IsValid)
-				return View(loginUserViewModel);
+				return View(loginUserWebModel);
 
-			LoginUserServiceModel loginUserServiceModel = this._autoMapper.Map<LoginUserServiceModel>(loginUserViewModel);
+			LoginUserServiceModel loginUserServiceModel = this._autoMapper.Map<LoginUserServiceModel>(loginUserWebModel);
 
 			bool result = await this._userService.LoginUserAsync(loginUserServiceModel);
 
 			if (result)
 				return RedirectToAction("Index", "Home");
 			else
-				return View(loginUserViewModel);
+				return View(loginUserWebModel);
 		}
 
 		[HttpPost]
@@ -88,9 +88,9 @@ namespace ExamTemplate.Web.Controllers
 			if (userServiceModel == default(UserServiceModel))
 				return RedirectToAction("ErrorNotFound", "Home");
 
-			UserViewModel userViewModel = this._autoMapper.Map<UserViewModel>(userServiceModel);
+			UserWebModel userWebModel = this._autoMapper.Map<UserWebModel>(userServiceModel);
 
-			return View(userViewModel);
+			return View(userWebModel);
 		}
 
 		[HttpGet]
@@ -101,31 +101,31 @@ namespace ExamTemplate.Web.Controllers
 			if (userServiceModel == default(UserServiceModel))
 				return RedirectToAction("ErrorNotFound", "Home");
 
-			EditUserViewModel editUserViewModel = this._autoMapper.Map<EditUserViewModel>(userServiceModel);
+			EditUserWebModel editUserWebModel = this._autoMapper.Map<EditUserWebModel>(userServiceModel);
 
-			return View(editUserViewModel);
+			return View(editUserWebModel);
 		}
 
 		[HttpPost]
-		public async Task<IActionResult> Edit(EditUserViewModel editUserViewModel)
+		public async Task<IActionResult> Edit(EditUserWebModel editUserWebModel)
 		{
 			if (!ModelState.IsValid)
-				return View(editUserViewModel);
+				return View(editUserWebModel);
 
 			if (!this._userService.IsSignedIn(HttpContext.User))
 				return RedirectToAction("Login");
 
 			UserServiceModel loggedInUser = await this._userService.GetUserByClaimsAsync(HttpContext.User);
 
-			UserServiceModel userServiceModel = this._autoMapper.Map<UserServiceModel>(editUserViewModel);
+			UserServiceModel userServiceModel = this._autoMapper.Map<UserServiceModel>(editUserWebModel);
 			bool result = await this._userService.EditUserAsync(HttpContext.User, userServiceModel);
 
 			if (result)
 			{
-				if (loggedInUser.Username != editUserViewModel.Username)
+				if (loggedInUser.Username != editUserWebModel.Username)
 					await this._userService.LogoutAsync();
 
-				return RedirectToAction("Profile", new { username = editUserViewModel.Username });
+				return RedirectToAction("Profile", new { username = editUserWebModel.Username });
 			}
 			else
 				return RedirectToAction("Profile", new { username = loggedInUser.Username });
-- 
cgit v1.2.3