From 971a70d15e5531b59afd74556dc50214deeeafe9 Mon Sep 17 00:00:00 2001 From: ivarlovlie Date: Thu, 17 Nov 2022 13:46:38 +0700 Subject: feat: Update known problem model --- .../Internal/Account/CreateAccountRoute.cs | 16 +++++++------ .../Internal/Account/UpdateAccountRoute.cs | 12 ++++++---- .../CreateResetRequestRoute.cs | 27 ++++++++++++++++------ .../FulfillResetRequestRoute.cs | 13 ++++++++++- .../Endpoints/V1/Customers/CreateCustomerRoute.cs | 11 ++++++--- .../Endpoints/V1/Projects/CreateProjectRoute.cs | 14 +++++++---- 6 files changed, 65 insertions(+), 28 deletions(-) (limited to 'code/api/src/Endpoints') diff --git a/code/api/src/Endpoints/Internal/Account/CreateAccountRoute.cs b/code/api/src/Endpoints/Internal/Account/CreateAccountRoute.cs index 6b6e7bc..81c507d 100644 --- a/code/api/src/Endpoints/Internal/Account/CreateAccountRoute.cs +++ b/code/api/src/Endpoints/Internal/Account/CreateAccountRoute.cs @@ -23,22 +23,24 @@ public class CreateAccountRoute : RouteBaseAsync.WithRequest HandleAsync(Payload request, CancellationToken cancellationToken = default) { - var errors = new Dictionary(); + var problem = new KnownProblemModel(); if (request.Username.IsValidEmailAddress() == false) { - errors.Add("username", _localizer["{0} does not look like a valid email", request.Username]); + problem.AddError("username", _localizer["{0} does not look like a valid email", request.Username]); } if (request.Password.Length < 6) { - errors.Add("password", _localizer["The password requires 6 or more characters."]); + problem.AddError("password", _localizer["The password requires 6 or more characters."]); } var username = request.Username.Trim(); - if (errors.All(p => p.Key != "username") && _database.Users.Any(c => c.Username == username)) { - errors.Add("username", _localizer["There is already a user registered with username: {0}", username]); + if (problem.Errors.All(p => p.Key != "username") && _database.Users.Any(c => c.Username == username)) { + problem.AddError("username", _localizer["There is already a user registered with username: {0}", username]); } - if (errors.Any()) { - return KnownProblem(_localizer["Invalid form"], _localizer["You have invalid values"], errors); + if (problem.Errors.Any()) { + problem.Title = _localizer["Invalid form"]; + problem.Subtitle = _localizer["One or more fields is invalid"]; + return KnownProblem(problem); } var user = new User(username); diff --git a/code/api/src/Endpoints/Internal/Account/UpdateAccountRoute.cs b/code/api/src/Endpoints/Internal/Account/UpdateAccountRoute.cs index c8999e0..c75e750 100644 --- a/code/api/src/Endpoints/Internal/Account/UpdateAccountRoute.cs +++ b/code/api/src/Endpoints/Internal/Account/UpdateAccountRoute.cs @@ -31,10 +31,10 @@ public class UpdateAccountRoute : RouteBaseAsync.WithRequest(); + var problem = new KnownProblemModel(); if (request.Password.HasValue() && request.Password.Length < 6) { - validationProblems.Add("password", _localizer["The new password must contain at least 6 characters"]); + problem.AddError("password", _localizer["The new password must contain at least 6 characters"]); } if (request.Password.HasValue()) { @@ -42,11 +42,13 @@ public class UpdateAccountRoute : RouteBaseAsync.WithRequest.WithActionResult +public class CreateResetRequestRoute : RouteBaseAsync.WithRequest.WithActionResult { private readonly ILogger _logger; private readonly PasswordResetService _passwordResetService; private readonly MainAppDatabase _database; + private readonly IStringLocalizer _localizer; - public CreateResetRequestRoute(ILogger logger, PasswordResetService passwordResetService, MainAppDatabase database) { + public CreateResetRequestRoute(ILogger logger, PasswordResetService passwordResetService, MainAppDatabase database, IStringLocalizer localizer) { _logger = logger; _passwordResetService = passwordResetService; _database = database; + _localizer = localizer; + } + + public class Payload + { + public string Email { get; set; } } [AllowAnonymous] [HttpPost("~/_/password-reset-request/create")] - public override async Task HandleAsync([FromQuery(Name = "for_user")] string username, CancellationToken cancellationToken = default) { + public override async Task HandleAsync(Payload payload, CancellationToken cancellationToken = default) { + if (payload.Email.IsNullOrWhiteSpace()) { + return KnownProblem(_localizer["Invalid form"], + _localizer["One or more fields is invalid"], + new() {{"email", new string[] {_localizer["Email is a required field"]}}} + ); + } + var tz = GetRequestTimeZone(_logger); _logger.LogInformation("Creating forgot password request with local date time: " + tz.LocalDateTime.ToString("u")); - - var user = _database.Users.FirstOrDefault(c => c.Username.Equals(username)); + var user = _database.Users.FirstOrDefault(c => c.Username.Equals(payload.Email)); // Don't inform the caller that the user does not exist. if (user == default) return Ok(); - await _passwordResetService.AddRequestAsync(user, tz.TimeZoneInfo, cancellationToken); - return Ok(); } } \ No newline at end of file diff --git a/code/api/src/Endpoints/Internal/PasswordResetRequests/FulfillResetRequestRoute.cs b/code/api/src/Endpoints/Internal/PasswordResetRequests/FulfillResetRequestRoute.cs index c831470..8c7ce03 100644 --- a/code/api/src/Endpoints/Internal/PasswordResetRequests/FulfillResetRequestRoute.cs +++ b/code/api/src/Endpoints/Internal/PasswordResetRequests/FulfillResetRequestRoute.cs @@ -1,11 +1,15 @@ +using Microsoft.Extensions.Localization; + namespace IOL.GreatOffice.Api.Endpoints.Internal.PasswordResetRequests; public class FulfillResetRequestRoute : RouteBaseAsync.WithRequest.WithActionResult { + private readonly IStringLocalizer _localizer; private readonly PasswordResetService _passwordResetService; - public FulfillResetRequestRoute(PasswordResetService passwordResetService) { + public FulfillResetRequestRoute(PasswordResetService passwordResetService, IStringLocalizer localizer) { _passwordResetService = passwordResetService; + _localizer = localizer; } public class Payload @@ -17,6 +21,13 @@ public class FulfillResetRequestRoute : RouteBaseAsync.WithRequest HandleAsync(Payload request, CancellationToken cancellationToken = default) { + if (request.NewPassword.Length < 6) { + return KnownProblem(_localizer["Invalid form"], + _localizer["One or more fields is invalid"], + new() {{"newPassword", new string[] {_localizer["The new password needs to be atleast 6 characters"]}}} + ); + } + return await _passwordResetService.FulfillRequestAsync(request.Id, request.NewPassword, cancellationToken) switch { FulfillPasswordResetRequestResult.REQUEST_NOT_FOUND => NotFound(), FulfillPasswordResetRequestResult.USER_NOT_FOUND => NotFound(), diff --git a/code/api/src/Endpoints/V1/Customers/CreateCustomerRoute.cs b/code/api/src/Endpoints/V1/Customers/CreateCustomerRoute.cs index eb69f7f..b20b404 100644 --- a/code/api/src/Endpoints/V1/Customers/CreateCustomerRoute.cs +++ b/code/api/src/Endpoints/V1/Customers/CreateCustomerRoute.cs @@ -16,9 +16,14 @@ public class CreateCustomerRoute : RouteBaseAsync.WithRequest HandleAsync(CreateCustomerPayload request, CancellationToken cancellationToken = default) { - var errors = new Dictionary(); - if (request.Name.Trim().IsNullOrEmpty()) errors.Add("name", _localizer["Name is a required field"]); - if (errors.Any()) return KnownProblem(_localizer["Invalid form"], _localizer["One or more fields is invalid"], errors); + var problem = new KnownProblemModel(); + if (request.Name.Trim().IsNullOrEmpty()) problem.AddError("name", _localizer["Name is a required field"]); + if (problem.Errors.Any()) { + problem.Title = _localizer["Invalid form"]; + problem.Subtitle = _localizer["One or more validation errors occured"]; + return KnownProblem(problem); + } + var customer = new Customer(LoggedInUser) { CustomerNumber = request.CustomerNumber, Name = request.Name, diff --git a/code/api/src/Endpoints/V1/Projects/CreateProjectRoute.cs b/code/api/src/Endpoints/V1/Projects/CreateProjectRoute.cs index 5c78e27..04a3a9a 100644 --- a/code/api/src/Endpoints/V1/Projects/CreateProjectRoute.cs +++ b/code/api/src/Endpoints/V1/Projects/CreateProjectRoute.cs @@ -14,10 +14,10 @@ public class CreateProjectRoute : RouteBaseAsync.WithRequest HandleAsync(CreateProjectPayload request, CancellationToken cancellationToken = default) { - var errors = new Dictionary(); + var problem = new KnownProblemModel(); if (request.Name.IsNullOrEmpty()) { - errors.Add("name", _localizer["Name is a required field"]); + problem.AddError("name", _localizer["Name is a required field"]); } var project = new Project(LoggedInUser) { @@ -31,7 +31,7 @@ public class CreateProjectRoute : RouteBaseAsync.WithRequest c.Id == customerId); if (customer == default) { - errors.Add("customer_" + customerId, _localizer["Customer not found"]); + problem.AddError("customer_" + customerId, _localizer["Customer not found"]); continue; } @@ -41,7 +41,7 @@ public class CreateProjectRoute : RouteBaseAsync.WithRequest c.Id == member.UserId); if (user == default) { - errors.Add("members_" + member.UserId, _localizer["User not found"]); + problem.AddError("members_" + member.UserId, _localizer["User not found"]); continue; } @@ -52,7 +52,11 @@ public class CreateProjectRoute : RouteBaseAsync.WithRequest