Change directory of migrations folder

jioo · jioo · commit c1543c826d39 · 2019-02-04T18:29:27.000+08:00
- Refactor AccountsController
- [General] Fixed indention in `if` statements
- Updated the property of GracePeriod to `int` in Config
- Updated view model validations
- Updated InitializeDatabase in SeedData.cs
diff --git a/src/Api/Constants/AttendanceConfig.cs b/src/Api/Constants/AttendanceConfig.cs
@@ -4,7 +4,6 @@ public class AttendanceConfig
     {
         public const string TimeIn = "09:00";
         public const string TimeOut = "18:00";
-        public const string GracePeriod = "15";
-
+        public const int GracePeriod = 15;
     }
 }
diff --git a/src/Api/Entities/Config.cs b/src/Api/Entities/Config.cs
@@ -7,6 +7,6 @@ public class Config
         public Guid Id { get; set; }
         public string TimeIn { get; set; }
         public string TimeOut { get; set; }
-        public string GracePeriod { get; set; }
+        public int GracePeriod { get; set; }
     }
 }
diff --git a/src/Api/Extensions/ListExtensions.cs b/src/Api/Extensions/ListExtensions.cs
@@ -7,7 +7,7 @@ namespace WebApi.Extensions
     public static class ListExtensions
     {
         /// <summary>
-        /// 
+        /// Apply sort filters based on parameters
         /// </summary>
         /// <param name="queryable"></param>
         /// <param name="parameters"></param>
diff --git a/src/Api/Features/Accounts/AccountsController.cs b/src/Api/Features/Accounts/AccountsController.cs
@@ -4,6 +4,8 @@
 using Microsoft.AspNetCore.Authorization;
 using WebApi.Entities;
 using MediatR;
+using System.Security.Claims;
+using Microsoft.AspNetCore.Http;
 
 namespace WebApi.Features.Accounts
 {
@@ -12,10 +14,12 @@ namespace WebApi.Features.Accounts
     public class AccountsController : ControllerBase
     {
         private readonly IMediator _mediator;
+        private readonly IHttpContextAccessor _httpContext;
 
-        public AccountsController(IMediator mediator)
+        public AccountsController(IMediator mediator, IHttpContextAccessor httpContext)
         {
             _mediator = mediator;
+            _httpContext = httpContext;
         }
 
         // POST: api/accounts/register
@@ -25,11 +29,13 @@ public async Task<IActionResult> Register(RegisterViewModel viewModel)
         {
             // mediator from Features/Employees
             var isCardExist = await _mediator.Send(new Employees.IsCardExists.Query(Guid.Empty, viewModel.CardNo));
-            if (isCardExist) return BadRequest("Card No. is already in use");
+            if (isCardExist) 
+                return BadRequest("Card No. is already in use");
 
             // mediator from Features/Employees
             var isUsernameExist = await _mediator.Send(new Auth.IsUserExists.Query(viewModel.UserName));
-            if(isUsernameExist) return BadRequest($"Username {viewModel.UserName} is already taken");
+            if (isUsernameExist) 
+                return BadRequest($"Username {viewModel.UserName} is already taken");
 
             // Create user account
             var employeeInfo = await _mediator.Send(new Register.Command(viewModel));
@@ -40,11 +46,12 @@ public async Task<IActionResult> Register(RegisterViewModel viewModel)
         // PUT: api/accounts/update-password
         [Authorize(Roles = "Admin")]
         [HttpPut("update-password")]
-        public async Task<IActionResult> UpdatePassword(ChangePasswordViewModel viewModel)
+        public async Task<IActionResult> UpdatePassword(UpdatePasswordViewModel viewModel)
         {
             // Change a specific Employee account's password
             var result = await _mediator.Send(new UpdatePassword.Command(viewModel));
-            if(!result) return StatusCode(500);
+            if (!result) 
+                return BadRequest();
 
             return Ok();
         }
@@ -54,12 +61,15 @@ public async Task<IActionResult> UpdatePassword(ChangePasswordViewModel viewMode
         public async Task<IActionResult> ChangePassword(ChangePasswordViewModel viewModel)
         {
             // Check if Old password is correct
-            var validatePassword = await _mediator.Send(new Auth.ValidatePassword.Query(viewModel.UserName, viewModel.OldPassword));
-            if (!validatePassword) return BadRequest("Incorrect password");
+            var currentUser = _httpContext.HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
+            var validatePassword = await _mediator.Send(new Auth.ValidatePassword.Query(currentUser, viewModel.OldPassword));
+            if (!validatePassword) 
+                return BadRequest("Incorrect password");
             
             // Change account password
             var result = await _mediator.Send(new ChangePassword.Command(viewModel));
-            if(!result.Succeeded) return BadRequest("Unable to change password");
+            if (!result.Succeeded) 
+                return BadRequest("Unable to change password");
             
             return Ok();
         }
diff --git a/src/Api/Features/Accounts/ChangePassword.cs b/src/Api/Features/Accounts/ChangePassword.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
 using MediatR;
@@ -40,9 +41,7 @@ public async Task<IdentityResult> Handle(Command request, CancellationToken canc
                 try
                 {
                     // Get the username in sub type claim
-                    var username = _httpContext.HttpContext.User.Claims
-                        .First(m => m.Type == "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier")
-                        .Value;
+                    var username =  _httpContext.HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
 
                     // Get account details
                     var user = await _manager.FindByNameAsync(username);
@@ -51,7 +50,8 @@ public async Task<IdentityResult> Handle(Command request, CancellationToken canc
                     return await _manager.ChangePasswordAsync(
                         user, 
                         request.ViewModel.OldPassword, 
-                        request.ViewModel.NewPassword);
+                        request.ViewModel.NewPassword
+                    );
                 }
                 catch (Exception e)
                 {
diff --git a/src/Api/Features/Accounts/ChangePasswordViewModel.cs b/src/Api/Features/Accounts/ChangePasswordViewModel.cs
@@ -1,9 +1,13 @@
+using System.ComponentModel.DataAnnotations;
+
 namespace WebApi.Features.Accounts
 {
     public class ChangePasswordViewModel 
     {
-        public string UserName { get; set; }
+        [Required]
         public string OldPassword { get; set; }
+        [Required]
+        [StringLength(100, ErrorMessage = "The {0} must be at least {2} characters long.", MinimumLength = 6)]
         public string NewPassword { get; set; }
     }
 }
diff --git a/src/Api/Features/Accounts/UpdatePassword.cs b/src/Api/Features/Accounts/UpdatePassword.cs
@@ -1,5 +1,6 @@
 
 using System;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using MediatR;
@@ -15,12 +16,12 @@ public class UpdatePassword
     {
         public class Command : IRequest<bool>
         {
-            public Command(ChangePasswordViewModel viewModel)
+            public Command(UpdatePasswordViewModel viewModel)
             {
                 ViewModel = viewModel;
             }
 
-            public ChangePasswordViewModel ViewModel { get; }
+            public UpdatePasswordViewModel ViewModel { get; }
         }
 
         public class CommandHandler : IRequestHandler<Command, bool>
@@ -36,14 +37,19 @@ public async Task<bool> Handle(Command request, CancellationToken cancellationTo
             {
                 try
                 {
+                    // Validate User
+                    var validateUser = _manager.Users.FirstOrDefault(m => m.UserName == request.ViewModel.UserName);
+                    if(validateUser == null)
+                        return false;
+                        
                     // Get account details
                     var user = await _manager.FindByNameAsync(request.ViewModel.UserName);
 
                     // Remove the existing password
                     await _manager.RemovePasswordAsync(user);
 
                     // Add the new password
-                    var result = await _manager.AddPasswordAsync(user, request.ViewModel.NewPassword);
+                    var result = await _manager.AddPasswordAsync(user, request.ViewModel.Password);
 
                     return (result.Succeeded) ? true : false;
                 }
diff --git a/src/Api/Features/Accounts/UpdatePasswordViewModel.cs b/src/Api/Features/Accounts/UpdatePasswordViewModel.cs
@@ -0,0 +1,13 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace WebApi.Features.Accounts
+{
+    public class UpdatePasswordViewModel
+    {
+        [Required]
+        public string UserName { get; set; }
+        [Required]
+        [StringLength(100, ErrorMessage = "The {0} must be at least {2} characters long.", MinimumLength = 6)]
+        public string Password { get; set; }
+    }
+}
diff --git a/src/Api/Features/Auth/AuthController.cs b/src/Api/Features/Auth/AuthController.cs
@@ -25,7 +25,8 @@ public async Task<IActionResult> Login(LoginViewModel viewModel)
         {
             // Check if credentials are correct
             var validate = await _mediator.Send(new ValidatePassword.Query(viewModel.UserName, viewModel.Password));
-            if (!validate) return BadRequest("Invalid username or password");
+            if (!validate) 
+                return BadRequest("Invalid username or password");
 
             // Get User Claims
             var claimsIdentity = await _mediator.Send(new GetRoleClaimsIdentity.Command(viewModel));
@@ -48,9 +49,7 @@ public IActionResult ChallengeAuth(string role)
             {
                 var validateRole = _httpContext.HttpContext.User.IsInRole(role);
                 if(!validateRole)
-                {
                     return Forbid();
-                }
             }
 
             return Ok();
diff --git a/src/Api/Features/Auth/Extensions.cs b/src/Api/Features/Auth/Extensions.cs
@@ -18,22 +18,17 @@ public static long ToUnixEpochDate(DateTime date) =>
         /// </summary>
         public static void ThrowIfInvalidOptions(JwtIssuerOptions options)
         {
-            if (options == null) throw new ArgumentNullException(nameof(options));
+            if (options == null) 
+                throw new ArgumentNullException(nameof(options));
 
             if (options.ValidFor <= TimeSpan.Zero)
-            {
                 throw new ArgumentException("Must be a non-zero TimeSpan.", nameof(JwtIssuerOptions.ValidFor));
-            }
 
             if (options.SigningCredentials == null)
-            {
                 throw new ArgumentNullException(nameof(JwtIssuerOptions.SigningCredentials));
-            }
 
             if (options.JtiGenerator == null)
-            {
                 throw new ArgumentNullException(nameof(JwtIssuerOptions.JtiGenerator));
-            }
         }
     }
 }
diff --git a/src/Api/Features/Config/ConfigController.cs b/src/Api/Features/Config/ConfigController.cs
@@ -7,7 +7,7 @@ namespace WebApi.Features.Config
 {
     [Authorize]
     [Route("api/[controller]"), ApiController]
-    public class ConfigController : ControllerBase
+    public class ConfigController : Controller
     {
         private readonly IMediator _mediator;
 
@@ -26,8 +26,12 @@ public async Task<ConfigViewModel> Index()
         // PUT api/config
         [Authorize(Roles = "Admin")]
         [HttpPut]
-        public async Task<ConfigViewModel> Update(ConfigViewModel viewModel)
+        public async Task<ActionResult<ConfigViewModel>> Update(ConfigViewModel viewModel)
         {
+            string message;
+            if (Extensions.ValidateTimeStrings(viewModel, out message))
+                return BadRequest(message);
+
             return await _mediator.Send(new Update.Command(viewModel));
         }
     }
diff --git a/src/Api/Features/Config/ConfigViewModel.cs b/src/Api/Features/Config/ConfigViewModel.cs
@@ -1,12 +1,21 @@
 using System;
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc;
 
 namespace WebApi.Features.Config
 {
     public class ConfigViewModel
     {
         public Guid Id { get; set; }
+        
+        [Required]
         public string TimeIn { get; set; }
+
+        [Required]
         public string TimeOut { get; set; }
-        public string GracePeriod { get; set; }
+
+        [Required]
+        [Range(0, 59)]
+        public int GracePeriod { get; set; }
     }
 }
diff --git a/src/Api/Features/Config/Extensions.cs b/src/Api/Features/Config/Extensions.cs
@@ -0,0 +1,23 @@
+using System;
+
+namespace WebApi.Features.Config
+{
+    public static class Extensions
+    {
+        public static bool ValidateTimeStrings(ConfigViewModel viewModel, out string message)
+        {
+            TimeSpan outResult;
+            message = "";
+
+            var timeInResult = TimeSpan.TryParse(viewModel.TimeIn, out outResult);
+            if (!timeInResult)
+                message = "Invalid time value in TimeIn field.";
+
+            var timeOutResult =  TimeSpan.TryParse(viewModel.TimeOut, out outResult);
+            if (!timeOutResult)
+                message = "Invalid time value in TimeOut field.";
+
+            return !(timeInResult && timeOutResult);
+        }
+    }
+}
diff --git a/src/Api/Features/Employees/EmployeeController.cs b/src/Api/Features/Employees/EmployeeController.cs
@@ -41,7 +41,8 @@ public async Task<IActionResult> Update(EmployeeViewModel model)
             var isCardExist = await _mediator.Send(
                 new IsCardExists.Query(model.Id, model.CardNo)
             );
-            if(isCardExist) return BadRequest("Card No. is already in use");
+            if (isCardExist) 
+                return BadRequest("Card No. is already in use");
 
             // Return update result
             return new OkObjectResult(
diff --git a/src/Api/Features/Logs/LogController.cs b/src/Api/Features/Logs/LogController.cs
@@ -46,7 +46,8 @@ public async Task<IActionResult> Log(LogInOutViewModel viewModel)
         {
             // Validate card no. & password
             var user = await _mediator.Send(new ValidateTimeInOut.Query(viewModel));
-            if (user.Id == Guid.Empty) return BadRequest("Invalid username or password!");
+            if (user.Id == Guid.Empty) 
+                return BadRequest("Invalid username or password!");
 
             // Broadcast to web client
             await _hubContext.Clients.All.SendAsync("employee-logged"); 
diff --git a/src/Api/Features/Logs/ValidateTimeInOut.cs b/src/Api/Features/Logs/ValidateTimeInOut.cs
@@ -59,7 +59,8 @@ public async Task<EmployeeViewModel> Handle(Query request, CancellationToken can
                         .SingleOrDefaultAsync(cancellationToken);
                     
                     // Check if employee exist
-                    if(emp == null) return new EmployeeViewModel{ Id = Guid.Empty };
+                    if (emp == null) 
+                        return new EmployeeViewModel{ Id = Guid.Empty };
 
                     // Check if password is correct
                     var user = await _manager.FindByIdAsync(emp.IdentityId);
diff --git a/src/Api/Infrastructure/Migrations/20190204045450_Init.Designer.cs b/src/Api/Infrastructure/Migrations/20190204045450_Init.Designer.cs
diff --git a/src/Api/Infrastructure/Migrations/20190204045450_Init.cs b/src/Api/Infrastructure/Migrations/20190204045450_Init.cs
diff --git a/src/Api/Infrastructure/Migrations/ApplicationDbContextModelSnapshot.cs b/src/Api/Infrastructure/Migrations/ApplicationDbContextModelSnapshot.cs
diff --git a/src/Api/SeedData.cs b/src/Api/SeedData.cs

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ public class AttendanceConfig`
`4`	`4`	`{`
`5`	`5`	`public const string TimeIn = "09:00";`
`6`	`6`	`public const string TimeOut = "18:00";`
`7`		`- public const string GracePeriod = "15";`
`8`		`-`
	`7`	`+ public const int GracePeriod = 15;`
`9`	`8`	`}`
`10`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@ public class Config`
`7`	`7`	`public Guid Id { get; set; }`
`8`	`8`	`public string TimeIn { get; set; }`
`9`	`9`	`public string TimeOut { get; set; }`
`10`		`- public string GracePeriod { get; set; }`
	`10`	`+ public int GracePeriod { get; set; }`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace WebApi.Extensions`
`7`	`7`	`public static class ListExtensions`
`8`	`8`	`{`
`9`	`9`	`/// <summary>`
`10`		`- ///`
	`10`	`+ /// Apply sort filters based on parameters`
`11`	`11`	`/// </summary>`
`12`	`12`	`/// <param name="queryable"></param>`
`13`	`13`	`/// <param name="parameters"></param>`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,13 @@`
	`1`	`+using System.ComponentModel.DataAnnotations;`
	`2`	`+`
`1`	`3`	`namespace WebApi.Features.Accounts`
`2`	`4`	`{`
`3`	`5`	`public class ChangePasswordViewModel`
`4`	`6`	`{`
`5`		`- public string UserName { get; set; }`
	`7`	`+ [Required]`
`6`	`8`	`public string OldPassword { get; set; }`
	`9`	`+ [Required]`
	`10`	`+ [StringLength(100, ErrorMessage = "The {0} must be at least {2} characters long.", MinimumLength = 6)]`
`7`	`11`	`public string NewPassword { get; set; }`
`8`	`12`	`}`
`9`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`
`2`	`2`	`using System;`
	`3`	`+using System.Linq;`
`3`	`4`	`using System.Threading;`
`4`	`5`	`using System.Threading.Tasks;`
`5`	`6`	`using MediatR;`
`@@ -15,12 +16,12 @@ public class UpdatePassword`
`15`	`16`	`{`
`16`	`17`	`public class Command : IRequest<bool>`
`17`	`18`	`{`
`18`		`- public Command(ChangePasswordViewModel viewModel)`
	`19`	`+ public Command(UpdatePasswordViewModel viewModel)`
`19`	`20`	`{`
`20`	`21`	`ViewModel = viewModel;`
`21`	`22`	`}`
`22`	`23`
`23`		`- public ChangePasswordViewModel ViewModel { get; }`
	`24`	`+ public UpdatePasswordViewModel ViewModel { get; }`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`public class CommandHandler : IRequestHandler<Command, bool>`
`@@ -36,14 +37,19 @@ public async Task<bool> Handle(Command request, CancellationToken cancellationTo`
`36`	`37`	`{`
`37`	`38`	`try`
`38`	`39`	`{`
	`40`	`+ // Validate User`
	`41`	`+ var validateUser = _manager.Users.FirstOrDefault(m => m.UserName == request.ViewModel.UserName);`
	`42`	`+ if(validateUser == null)`
	`43`	`+ return false;`
	`44`	`+`
`39`	`45`	`// Get account details`
`40`	`46`	`var user = await _manager.FindByNameAsync(request.ViewModel.UserName);`
`41`	`47`
`42`	`48`	`// Remove the existing password`
`43`	`49`	`await _manager.RemovePasswordAsync(user);`
`44`	`50`
`45`	`51`	`// Add the new password`
`46`		`- var result = await _manager.AddPasswordAsync(user, request.ViewModel.NewPassword);`
	`52`	`+ var result = await _manager.AddPasswordAsync(user, request.ViewModel.Password);`
`47`	`53`
`48`	`54`	`return (result.Succeeded) ? true : false;`
`49`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@ public async Task<IActionResult> Login(LoginViewModel viewModel)`
`25`	`25`	`{`
`26`	`26`	`// Check if credentials are correct`
`27`	`27`	`var validate = await _mediator.Send(new ValidatePassword.Query(viewModel.UserName, viewModel.Password));`
`28`		`- if (!validate) return BadRequest("Invalid username or password");`
	`28`	`+ if (!validate)`
	`29`	`+ return BadRequest("Invalid username or password");`
`29`	`30`
`30`	`31`	`// Get User Claims`
`31`	`32`	`var claimsIdentity = await _mediator.Send(new GetRoleClaimsIdentity.Command(viewModel));`
`@@ -48,9 +49,7 @@ public IActionResult ChallengeAuth(string role)`
`48`	`49`	`{`
`49`	`50`	`var validateRole = _httpContext.HttpContext.User.IsInRole(role);`
`50`	`51`	`if(!validateRole)`
`51`		`- {`
`52`	`52`	`return Forbid();`
`53`		`- }`
`54`	`53`	`}`
`55`	`54`
`56`	`55`	`return Ok();`
Original file line number	Diff line number	Diff line change
`@@ -18,22 +18,17 @@ public static long ToUnixEpochDate(DateTime date) =>`
`18`	`18`	`/// </summary>`
`19`	`19`	`public static void ThrowIfInvalidOptions(JwtIssuerOptions options)`
`20`	`20`	`{`
`21`		`- if (options == null) throw new ArgumentNullException(nameof(options));`
	`21`	`+ if (options == null)`
	`22`	`+ throw new ArgumentNullException(nameof(options));`
`22`	`23`
`23`	`24`	`if (options.ValidFor <= TimeSpan.Zero)`
`24`		`- {`
`25`	`25`	`throw new ArgumentException("Must be a non-zero TimeSpan.", nameof(JwtIssuerOptions.ValidFor));`
`26`		`- }`
`27`	`26`
`28`	`27`	`if (options.SigningCredentials == null)`
`29`		`- {`
`30`	`28`	`throw new ArgumentNullException(nameof(JwtIssuerOptions.SigningCredentials));`
`31`		`- }`
`32`	`29`
`33`	`30`	`if (options.JtiGenerator == null)`
`34`		`- {`
`35`	`31`	`throw new ArgumentNullException(nameof(JwtIssuerOptions.JtiGenerator));`
`36`		`- }`
`37`	`32`	`}`
`38`	`33`	`}`
`39`	`34`	`}`