From 82d270a66b8ffca28e321f29b2eb90b2412ac9a7 Mon Sep 17 00:00:00 2001
From: Syndamia <kamen.d.mladenov@protonmail.com>
Date: Sat, 8 May 2021 18:10:08 +0300
Subject: Implemented authorization; Replaced Role with IdentityRole<Guid>;
 Renamed UserController to AccountController, updated links

---
 ExamTemplate/Web/Controllers/AccountController.cs | 140 ++++++++++++++++++++++
 ExamTemplate/Web/Controllers/UserController.cs    | 131 --------------------
 ExamTemplate/Web/Startup.cs                       |  31 +++--
 ExamTemplate/Web/Views/Account/Edit.cshtml        |  20 ++++
 ExamTemplate/Web/Views/Account/Login.cshtml       |  14 +++
 ExamTemplate/Web/Views/Account/Profile.cshtml     |  27 +++++
 ExamTemplate/Web/Views/Account/Register.cshtml    |  20 ++++
 ExamTemplate/Web/Views/Shared/_Navbar.cshtml      |   8 +-
 ExamTemplate/Web/Views/User/EditProfile.cshtml    |  20 ----
 ExamTemplate/Web/Views/User/Login.cshtml          |  14 ---
 ExamTemplate/Web/Views/User/Profile.cshtml        |  27 -----
 ExamTemplate/Web/Views/User/Register.cshtml       |  20 ----
 12 files changed, 245 insertions(+), 227 deletions(-)
 create mode 100644 ExamTemplate/Web/Controllers/AccountController.cs
 delete mode 100644 ExamTemplate/Web/Controllers/UserController.cs
 create mode 100644 ExamTemplate/Web/Views/Account/Edit.cshtml
 create mode 100644 ExamTemplate/Web/Views/Account/Login.cshtml
 create mode 100644 ExamTemplate/Web/Views/Account/Profile.cshtml
 create mode 100644 ExamTemplate/Web/Views/Account/Register.cshtml
 delete mode 100644 ExamTemplate/Web/Views/User/EditProfile.cshtml
 delete mode 100644 ExamTemplate/Web/Views/User/Login.cshtml
 delete mode 100644 ExamTemplate/Web/Views/User/Profile.cshtml
 delete mode 100644 ExamTemplate/Web/Views/User/Register.cshtml

(limited to 'ExamTemplate/Web')

diff --git a/ExamTemplate/Web/Controllers/AccountController.cs b/ExamTemplate/Web/Controllers/AccountController.cs
new file mode 100644
index 0000000..7fb7ab3
--- /dev/null
+++ b/ExamTemplate/Web/Controllers/AccountController.cs
@@ -0,0 +1,140 @@
+using ExamTemplate.Services;
+using Microsoft.AspNetCore.Mvc;
+using ExamTemplate.Web.Models.User;
+using AutoMapper;
+using ExamTemplate.Services.Models;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+
+namespace ExamTemplate.Web.Controllers
+{
+	[Authorize]
+	public class AccountController : Controller
+	{
+		private readonly IMapper _autoMapper;
+		private readonly UserService _userService;
+
+		public AccountController(IMapper autoMapper, UserService userService)
+		{
+			this._autoMapper = autoMapper;
+			this._userService = userService;
+		}
+
+		[HttpGet]
+		[AllowAnonymous]
+		public IActionResult Register()
+		{
+			return View();
+		}
+
+		[HttpPost]
+		[AllowAnonymous]
+		public async Task<IActionResult> Register(RegisterUserViewModel registerUserViewModel)
+		{
+			if (!ModelState.IsValid)
+				return View(registerUserViewModel);
+
+			RegisterUserServiceModel registerUserServiceModel = this._autoMapper.Map<RegisterUserServiceModel>(registerUserViewModel);
+
+			bool result = await this._userService.RegisterUserAsync(registerUserServiceModel);
+
+			if (result)
+				return RedirectToAction("Index", "Home");
+			else
+				return View();
+		}
+
+		[HttpGet]
+		[AllowAnonymous]
+		public IActionResult Login()
+		{
+			return View();
+		}
+
+		[HttpPost]
+		[AllowAnonymous]
+		public async Task<IActionResult> Login(LoginUserViewModel loginUserViewModel)
+		{
+			if (!ModelState.IsValid)
+				return View(loginUserViewModel);
+
+			LoginUserServiceModel loginUserServiceModel = this._autoMapper.Map<LoginUserServiceModel>(loginUserViewModel);
+
+			bool result = await this._userService.LoginUserAsync(loginUserServiceModel);
+
+			if (result)
+				return RedirectToAction("Index", "Home");
+			else
+				return View();
+		}
+
+		[HttpPost]
+		public async Task<IActionResult> Logout()
+		{
+			await this._userService.LogoutAsync();
+
+			return RedirectToAction("Login");
+		}
+
+		[HttpGet]
+		[AllowAnonymous]
+		public async Task<IActionResult> Profile(string username)
+		{
+			UserServiceModel userServiceModel = await this._userService.GetUserByUsernameAsync(username);
+
+			if (userServiceModel == default(UserServiceModel))
+				return RedirectToAction("Login");
+
+			UserViewModel userViewModel = this._autoMapper.Map<UserViewModel>(userServiceModel);
+
+			return View(userViewModel);
+		}
+
+		[HttpGet]
+		public async Task<IActionResult> Edit()
+		{
+			UserServiceModel userServiceModel = await this._userService.GetUserByClaimsAsync(this.HttpContext.User);
+
+			if (userServiceModel == default(UserServiceModel))
+				return RedirectToAction("Login");
+
+			EditUserViewModel editUserViewModel = this._autoMapper.Map<EditUserViewModel>(userServiceModel);
+
+			return View(editUserViewModel);
+		}
+
+		[HttpPost]
+		public async Task<IActionResult> Edit(EditUserViewModel editUserViewModel)
+		{
+			if (!await this._userService.IsAuthorizedToModify(HttpContext.User, editUserViewModel.OriginalUsername))
+				return new UnauthorizedResult();
+
+			if (!ModelState.IsValid)
+				return View(editUserViewModel);
+
+			if (!this._userService.IsSignedIn(HttpContext.User))
+				return RedirectToAction("Login");
+
+			UserServiceModel loggedInUser = await this._userService.GetUserByClaimsAsync(HttpContext.User);
+
+			EditUserServiceModel editUserServiceModel = this._autoMapper.Map<EditUserServiceModel>(editUserViewModel);
+			bool result = await this._userService.EditUserAsync(HttpContext.User, editUserServiceModel);
+
+			if (result)
+			{
+				if (loggedInUser.Username != editUserViewModel.Username)
+					await this._userService.LogoutAsync();
+
+				return RedirectToAction("Profile", new { username = editUserViewModel.Username });
+			}
+			else
+				return RedirectToAction("Profile", new { username = loggedInUser.Username });
+		}
+
+		// [HttpPost]
+		// public async Task<IActionResult> DeleteProfile(string username)
+		// {
+		// 	throw new System.NotImplementedException();
+		// }
+	}
+}
diff --git a/ExamTemplate/Web/Controllers/UserController.cs b/ExamTemplate/Web/Controllers/UserController.cs
deleted file mode 100644
index c7183ca..0000000
--- a/ExamTemplate/Web/Controllers/UserController.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-using ExamTemplate.Services;
-using Microsoft.AspNetCore.Mvc;
-using ExamTemplate.Web.Models.User;
-using AutoMapper;
-using ExamTemplate.Services.Models;
-using System.Threading.Tasks;
-
-namespace ExamTemplate.Web.Controllers
-{
-	public class UserController : Controller
-	{
-		private readonly IMapper _autoMapper;
-		private readonly UserService _userService;
-
-		public UserController(IMapper autoMapper, UserService userService)
-		{
-			this._autoMapper = autoMapper;
-			this._userService = userService;
-		}
-
-		[HttpGet]
-		[Route("/Register")]
-		public IActionResult Register()
-		{
-			return View();
-		}
-
-		[HttpPost]
-		[Route("/Register")]
-		public async Task<IActionResult> Register(RegisterUserViewModel registerUserViewModel)
-		{
-			if (!ModelState.IsValid)
-				return View(registerUserViewModel);
-
-			RegisterUserServiceModel registerUserServiceModel = this._autoMapper.Map<RegisterUserServiceModel>(registerUserViewModel);
-
-			bool result = await this._userService.RegisterUserAsync(registerUserServiceModel);
-
-			if (result)
-				return RedirectToAction("Index", "Home");
-			else
-				return View();
-		}
-
-		[HttpGet]
-		[Route("/Login")]
-		public IActionResult Login()
-		{
-			return View();
-		}
-
-		[HttpPost]
-		[Route("/Login")]
-		public async Task<IActionResult> Login(LoginUserViewModel loginUserViewModel)
-		{
-			if (!ModelState.IsValid)
-				return View(loginUserViewModel);
-
-			LoginUserServiceModel loginUserServiceModel = this._autoMapper.Map<LoginUserServiceModel>(loginUserViewModel);
-
-			bool result = await this._userService.LoginUserAsync(loginUserServiceModel);
-
-			if (result)
-				return RedirectToAction("Index", "Home");
-			else
-				return View();
-		}
-
-		[HttpPost]
-		public async Task<IActionResult> Logout()
-		{
-			await this._userService.LogoutAsync();
-
-			return RedirectToAction("Login");
-		}
-
-		[HttpGet]
-		[Route("/Profile/{username}")]
-		public async Task<IActionResult> Profile(string username)
-		{
-			UserServiceModel userServiceModel = await this._userService.GetUserByUsernameAsync(username);
-
-			if (userServiceModel == default(UserServiceModel))
-				return RedirectToAction("Login");
-
-			UserViewModel userViewModel = this._autoMapper.Map<UserViewModel>(userServiceModel);
-
-			return View(userViewModel);
-		}
-
-		[HttpGet]
-		[Route("/EditProfile")]
-		public async Task<IActionResult> EditProfile()
-		{
-			UserServiceModel userServiceModel = await this._userService.GetUserByClaimsAsync(this.HttpContext.User);
-
-			if (userServiceModel == default(UserServiceModel))
-				return RedirectToAction("Login");
-
-			EditUserViewModel editUserViewModel = this._autoMapper.Map<EditUserViewModel>(userServiceModel);
-
-			return View(editUserViewModel);
-		}
-
-		[HttpPost]
-		[Route("/EditProfile")]
-		public async Task<IActionResult> EditProfile(EditUserViewModel editUserViewModel)
-		{
-			if (!ModelState.IsValid)
-				return View(editUserViewModel);
-
-			if (!this._userService.IsSignedIn(HttpContext.User))
-				return RedirectToAction("Login");
-
-			UserServiceModel loggedInUser = await this._userService.GetUserByClaimsAsync(HttpContext.User);
-
-			EditUserServiceModel editUserServiceModel = this._autoMapper.Map<EditUserServiceModel>(editUserViewModel);
-			bool result = await this._userService.EditUserAsync(HttpContext.User, editUserServiceModel);
-
-			if (result)
-			{
-				if (loggedInUser.Username != editUserViewModel.Username)
-					await this._userService.LogoutAsync();
-
-				return RedirectToAction("Profile", new { username = editUserViewModel.Username });
-			}
-			else
-				return RedirectToAction("Profile", new { username = loggedInUser.Username });
-		}
-	}
-}
diff --git a/ExamTemplate/Web/Startup.cs b/ExamTemplate/Web/Startup.cs
index 0754bff..00d94c0 100644
--- a/ExamTemplate/Web/Startup.cs
+++ b/ExamTemplate/Web/Startup.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using ExamTemplate.Common;
 using ExamTemplate.Data;
 using ExamTemplate.Data.Models;
 using ExamTemplate.Services;
@@ -11,9 +12,8 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
-namespace Web
 {
-    public class Startup
+	public class Startup
 	{
 		public Startup(IConfiguration configuration)
 		{
@@ -41,10 +41,19 @@ namespace Web
 				options.UseNpgsql(this.Configuration.GetConnectionString("LocalDBConnection")));
 
 			// Needed for SignInManager and UserManager
-			services.AddIdentity<User, Role>()
-				.AddRoles<Role>()
+			services.AddIdentity<User, IdentityRole<Guid>>(options =>
+			{
+				options.SignIn.RequireConfirmedAccount = false;
+
+				// Password settings
+				options.Password.RequireDigit = false;
+				options.Password.RequireLowercase = false;
+				options.Password.RequireNonAlphanumeric = false;
+				options.Password.RequireUppercase = false;
+				options.Password.RequiredLength = 3;
+				options.Password.RequiredUniqueChars = 0;
+			}).AddRoles<IdentityRole<Guid>>()
 				.AddEntityFrameworkStores<TemplateContext>();
-			
 		}
 
 		// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -65,8 +74,8 @@ namespace Web
 
 			app.UseRouting();
 
-			app.UseAuthorization();
 			app.UseAuthentication();
+			app.UseAuthorization();
 
 			app.UseEndpoints(endpoints =>
 			{
@@ -85,15 +94,15 @@ namespace Web
 
 			dbContext.Database.Migrate();
 
-			var roleManager = (RoleManager<Role>)serviceScope.ServiceProvider.GetService(typeof(RoleManager<Role>));
-			if (!dbContext.Roles.Any(x => x.Name == Role.UserRole))
+			var roleManager = (RoleManager<IdentityRole<Guid>>)serviceScope.ServiceProvider.GetService(typeof(RoleManager<IdentityRole<Guid>>));
+			if (!dbContext.Roles.Any(x => x.Name == RoleConst.User))
 			{
-				Role userRole = new() { Name = Role.UserRole };
+				IdentityRole<Guid> userRole = new() { Name = RoleConst.User };
 				roleManager.CreateAsync(userRole).Wait();
 			}
-			if (!dbContext.Roles.Any(x => x.Name == Role.AdminRole))
+			if (!dbContext.Roles.Any(x => x.Name == RoleConst.Admin))
 			{
-				Role adminRole = new() { Name = Role.AdminRole };
+				IdentityRole<Guid> adminRole = new() { Name = RoleConst.Admin };
 				roleManager.CreateAsync(adminRole).Wait();
 			}
 
diff --git a/ExamTemplate/Web/Views/Account/Edit.cshtml b/ExamTemplate/Web/Views/Account/Edit.cshtml
new file mode 100644
index 0000000..da08d9a
--- /dev/null
+++ b/ExamTemplate/Web/Views/Account/Edit.cshtml
@@ -0,0 +1,20 @@
+@model EditUserViewModel
+@{
+	ViewData["Title"] = "Edit Profile";
+}
+
+<form asp-controller="User" asp-action="EditProfile" method="post">
+	<label asp-for="Username">Username:</label>
+	<input type="text" asp-for="Username" placeholder="@Model.Username">
+	<span asp-validation-for="Username" class="form-error"></span>
+
+	<label asp-for="FirstName">First Name:</label>
+	<input type="text" asp-for="FirstName" placeholder="@Model.FirstName">
+	<span asp-validation-for="FirstName" class="form-error"></span>
+
+	<label asp-for="LastName">Last Name:</label>
+	<input type="text" asp-for="LastName" placeholder="@Model.LastName">
+	<span asp-validation-for="LastName" class="form-error"></span>
+	
+	<input type="submit" value="Update Profile">
+</form>
diff --git a/ExamTemplate/Web/Views/Account/Login.cshtml b/ExamTemplate/Web/Views/Account/Login.cshtml
new file mode 100644
index 0000000..688c547
--- /dev/null
+++ b/ExamTemplate/Web/Views/Account/Login.cshtml
@@ -0,0 +1,14 @@
+@model ExamTemplate.Web.Models.User.LoginUserViewModel
+@{
+	ViewData["Title"] = "Login";
+}
+
+<form asp-controller="Account" asp-action="Login" method="post">
+	<input type="text" asp-for="Username" placeholder="Username">
+	<span asp-validation-for="Username" class="form-error"></span>
+
+	<input type="password" asp-for="Password" placeholder="Password">
+	<span asp-validation-for="Password" class="form-error"></span>
+
+	<input type="submit">
+</form>
diff --git a/ExamTemplate/Web/Views/Account/Profile.cshtml b/ExamTemplate/Web/Views/Account/Profile.cshtml
new file mode 100644
index 0000000..c6f3e5c
--- /dev/null
+++ b/ExamTemplate/Web/Views/Account/Profile.cshtml
@@ -0,0 +1,27 @@
+@using Microsoft.AspNetCore.Identity
+
+@inject SignInManager<User> SignInManager
+@inject UserManager<User> UserManager
+
+@model UserViewModel
+@{
+	ViewData["Title"] = Model.Username + "'s Profile";
+}
+
+<p>
+	<h2>
+		@Model.FirstName @Model.LastName
+	</h2>
+	<div>
+		@Model.Username
+	</div>
+	@if (SignInManager.IsSignedIn(User))
+	{
+		@if(UserManager.GetUserName(User) == Model.Username)
+		{
+			<form asp-controller="Account" asp-action="Edit" method="get">
+				<input type="submit" value="Edit Profile">
+			</form>
+		}
+	}
+</p>
diff --git a/ExamTemplate/Web/Views/Account/Register.cshtml b/ExamTemplate/Web/Views/Account/Register.cshtml
new file mode 100644
index 0000000..d255287
--- /dev/null
+++ b/ExamTemplate/Web/Views/Account/Register.cshtml
@@ -0,0 +1,20 @@
+@model ExamTemplate.Web.Models.User.RegisterUserViewModel
+@{
+	ViewData["Title"] = "Register";
+}
+
+<form asp-controller="User" asp-action="Register" method="post">
+	<input type="text" asp-for="FirstName" placeholder="FirstName">
+	<span asp-validation-for="FirstName" class="form-error"></span>
+
+	<input type="text" asp-for="LastName" placeholder="LastName">
+	<span asp-validation-for="LastName" class="form-error"></span>
+
+	<input type="text" asp-for="Username" placeholder="Username">
+	<span asp-validation-for="Username" class="form-error"></span>
+	
+	<input type="password" asp-for="Password" placeholder="Password">
+	<span asp-validation-for="Password" class="form-error"></span>
+
+	<input type="submit">
+</form>
diff --git a/ExamTemplate/Web/Views/Shared/_Navbar.cshtml b/ExamTemplate/Web/Views/Shared/_Navbar.cshtml
index 7ae8f50..0ec5c4d 100644
--- a/ExamTemplate/Web/Views/Shared/_Navbar.cshtml
+++ b/ExamTemplate/Web/Views/Shared/_Navbar.cshtml
@@ -13,18 +13,18 @@
 		<section>
 			@if (SignInManager.IsSignedIn(User))
 			{
-				<a asp-controller="User" asp-action="Profile" asp-route-username="@UserManager.GetUserName(User)">
+				<a asp-controller="Account" asp-action="Profile" asp-route-username="@UserManager.GetUserName(User)">
 					@UserManager.GetUserName(User)
 				</a>
 
-				<form asp-controller="User" asp-action="Logout" method="post">
+				<form asp-controller="Account" asp-action="Logout" method="post">
 					<input type="submit" value="Logout">
 				</form>
 			}
 			else
 			{
-				<a asp-controller="User" asp-action="Login">Login</a>
-				<a asp-controller="User" asp-action="Register">Register</a>
+				<a asp-controller="Account" asp-action="Login">Login</a>
+				<a asp-controller="Account" asp-action="Register">Register</a>
 			}
 		</section>
 	</div> 
diff --git a/ExamTemplate/Web/Views/User/EditProfile.cshtml b/ExamTemplate/Web/Views/User/EditProfile.cshtml
deleted file mode 100644
index da08d9a..0000000
--- a/ExamTemplate/Web/Views/User/EditProfile.cshtml
+++ /dev/null
@@ -1,20 +0,0 @@
-@model EditUserViewModel
-@{
-	ViewData["Title"] = "Edit Profile";
-}
-
-<form asp-controller="User" asp-action="EditProfile" method="post">
-	<label asp-for="Username">Username:</label>
-	<input type="text" asp-for="Username" placeholder="@Model.Username">
-	<span asp-validation-for="Username" class="form-error"></span>
-
-	<label asp-for="FirstName">First Name:</label>
-	<input type="text" asp-for="FirstName" placeholder="@Model.FirstName">
-	<span asp-validation-for="FirstName" class="form-error"></span>
-
-	<label asp-for="LastName">Last Name:</label>
-	<input type="text" asp-for="LastName" placeholder="@Model.LastName">
-	<span asp-validation-for="LastName" class="form-error"></span>
-	
-	<input type="submit" value="Update Profile">
-</form>
diff --git a/ExamTemplate/Web/Views/User/Login.cshtml b/ExamTemplate/Web/Views/User/Login.cshtml
deleted file mode 100644
index 7cb5ac5..0000000
--- a/ExamTemplate/Web/Views/User/Login.cshtml
+++ /dev/null
@@ -1,14 +0,0 @@
-@model ExamTemplate.Web.Models.User.LoginUserViewModel
-@{
-	ViewData["Title"] = "Login";
-}
-
-<form asp-controller="User" asp-action="Login" method="post">
-	<input type="text" asp-for="Username" placeholder="Username">
-	<span asp-validation-for="Username" class="form-error"></span>
-
-	<input type="password" asp-for="Password" placeholder="Password">
-	<span asp-validation-for="Password" class="form-error"></span>
-
-	<input type="submit">
-</form>
diff --git a/ExamTemplate/Web/Views/User/Profile.cshtml b/ExamTemplate/Web/Views/User/Profile.cshtml
deleted file mode 100644
index 4120766..0000000
--- a/ExamTemplate/Web/Views/User/Profile.cshtml
+++ /dev/null
@@ -1,27 +0,0 @@
-@using Microsoft.AspNetCore.Identity
-
-@inject SignInManager<User> SignInManager
-@inject UserManager<User> UserManager
-
-@model UserViewModel
-@{
-	ViewData["Title"] = Model.Username + "'s Profile";
-}
-
-<p>
-	<h2>
-		@Model.FirstName @Model.LastName
-	</h2>
-	<div>
-		@Model.Username
-	</div>
-	@if (SignInManager.IsSignedIn(User))
-	{
-		@if(UserManager.GetUserName(User) == Model.Username)
-		{
-			<form asp-controller="User" asp-action="EditProfile" method="get">
-				<input type="submit" value="Edit Profile">
-			</form>
-		}
-	}
-</p>
diff --git a/ExamTemplate/Web/Views/User/Register.cshtml b/ExamTemplate/Web/Views/User/Register.cshtml
deleted file mode 100644
index 3b7f6d9..0000000
--- a/ExamTemplate/Web/Views/User/Register.cshtml
+++ /dev/null
@@ -1,20 +0,0 @@
-@model ExamTemplate.Web.Models.User.RegisterUserViewModel
-@{
-    ViewData["Title"] = "Register";
-}
-
-<form asp-controller="User" asp-action="Register" method="post">
-	<input type="text" asp-for="FirstName" placeholder="FirstName">
-	<span asp-validation-for="FirstName" class="form-error"></span>
-
-	<input type="text" asp-for="LastName" placeholder="LastName">
-	<span asp-validation-for="LastName" class="form-error"></span>
-
-	<input type="text" asp-for="Username" placeholder="Username">
-	<span asp-validation-for="Username" class="form-error"></span>
-	
-	<input type="password" asp-for="Password" placeholder="Password">
-	<span asp-validation-for="Password" class="form-error"></span>
-
-	<input type="submit">
-</form>
-- 
cgit v1.2.3