diff options
| author | ivar <i@oiee.no> | 2024-04-28 22:37:48 +0200 |
|---|---|---|
| committer | ivar <i@oiee.no> | 2024-04-28 22:37:48 +0200 |
| commit | f356f15d3a7dce1669944d23ab395ec96d042293 (patch) | |
| tree | 03a82934ec802e2579daa45f748e959dc6598847 /code/api/src/Endpoints/Internal | |
| parent | f99db65435f2cac81b5b48eb117991f4acd66a7e (diff) | |
| download | greatoffice-f356f15d3a7dce1669944d23ab395ec96d042293.tar.xz greatoffice-f356f15d3a7dce1669944d23ab395ec96d042293.zip | |
Misc
Diffstat (limited to 'code/api/src/Endpoints/Internal')
6 files changed, 113 insertions, 116 deletions
diff --git a/code/api/src/Endpoints/Internal/Account/GetAccountRoute.cs b/code/api/src/Endpoints/Internal/Account/GetAccountRoute.cs index 121b40f..67c4d4d 100644 --- a/code/api/src/Endpoints/Internal/Account/GetAccountRoute.cs +++ b/code/api/src/Endpoints/Internal/Account/GetAccountRoute.cs @@ -12,7 +12,7 @@ public class GetAccountRoute : RouteBaseAsync.WithoutRequest.WithActionResult<Lo public override async Task<ActionResult<LoggedInUserModel>> HandleAsync(CancellationToken cancellationToken = default) { var user = _database.Users .Select(x => new {x.Username, x.Id}) - .SingleOrDefault(c => c.Id == LoggedInUser.Id); + .FirstOrDefault(c => c.Id == LoggedInUser.Id); if (user != default) { return Ok(new LoggedInUserModel { Id = LoggedInUser.Id, @@ -23,4 +23,4 @@ public class GetAccountRoute : RouteBaseAsync.WithoutRequest.WithActionResult<Lo await HttpContext.SignOutAsync(); return Unauthorized(); } -}
\ No newline at end of file +} diff --git a/code/api/src/Endpoints/Internal/Account/UpdateAccountRoute.cs b/code/api/src/Endpoints/Internal/Account/UpdateAccountRoute.cs index 1081240..f6e18af 100644 --- a/code/api/src/Endpoints/Internal/Account/UpdateAccountRoute.cs +++ b/code/api/src/Endpoints/Internal/Account/UpdateAccountRoute.cs @@ -19,7 +19,7 @@ public class UpdateAccountRoute : RouteBaseAsync.WithRequest<UpdateAccountRoute. [HttpPost("~/_/account/update")] public override async Task<ActionResult> HandleAsync(Payload request, CancellationToken cancellationToken = default) { - var user = _database.Users.SingleOrDefault(c => c.Id == LoggedInUser.Id); + var user = _database.Users.FirstOrDefault(c => c.Id == LoggedInUser.Id); if (user == default) { await HttpContext.SignOutAsync(); return Unauthorized(); @@ -56,4 +56,4 @@ public class UpdateAccountRoute : RouteBaseAsync.WithRequest<UpdateAccountRoute. await _database.SaveChangesAsync(cancellationToken); return Ok(); } -}
\ No newline at end of file +} diff --git a/code/api/src/Endpoints/Internal/INT_EndpointBase.cs b/code/api/src/Endpoints/Internal/INT_EndpointBase.cs index 699a976..0ba6c82 100644 --- a/code/api/src/Endpoints/Internal/INT_EndpointBase.cs +++ b/code/api/src/Endpoints/Internal/INT_EndpointBase.cs @@ -6,4 +6,4 @@ namespace IOL.GreatOffice.Api.Endpoints.Internal; public class INT_EndpointBase : EndpointBase { -} +}
\ No newline at end of file diff --git a/code/api/src/Endpoints/Internal/Root/ValidateRoute.cs b/code/api/src/Endpoints/Internal/Root/ValidateRoute.cs index d8ec85a..f141fe9 100644 --- a/code/api/src/Endpoints/Internal/Root/ValidateRoute.cs +++ b/code/api/src/Endpoints/Internal/Root/ValidateRoute.cs @@ -6,8 +6,7 @@ public class ValidateRoute : RouteBaseSync.WithRequest<ValidateRoute.QueryParams private readonly string CanonicalFrontendUrl; private readonly ILogger<ValidateRoute> _logger; - public ValidateRoute(EmailValidationService emailValidation, ILogger<ValidateRoute> logger) - { + public ValidateRoute(EmailValidationService emailValidation, ILogger<ValidateRoute> logger) { _emailValidation = emailValidation; _logger = logger; CanonicalFrontendUrl = Program.AppConfiguration.CANONICAL_FRONTEND_URL; @@ -20,20 +19,18 @@ public class ValidateRoute : RouteBaseSync.WithRequest<ValidateRoute.QueryParams } [HttpGet("~/_/validate")] - public override ActionResult Handle([FromQuery] QueryParams request) - { + public override ActionResult Handle([FromQuery] QueryParams request) { var isFulfilled = _emailValidation.FulfillEmailValidationRequest(request.Id, LoggedInUser.Id); - if (!isFulfilled) - { + if (!isFulfilled) { _logger.LogError("Email validation fulfillment failed for request {requestId} and user {userId}", request.Id, LoggedInUser.Id); return StatusCode(400, $""" -<html> -<body> -<h3>The validation could not be completed</h3> -<p>We are working on fixing this, in the meantime, have patience.</p> -<a href="{CanonicalFrontendUrl}">Click here to go back to {CanonicalFrontendUrl}</a> -</body> -"""); + <html> + <body> + <h3>The validation could not be completed</h3> + <p>We are working on fixing this, in the meantime, have patience.</p> + <a href="{CanonicalFrontendUrl}">Click here to go back to {CanonicalFrontendUrl}</a> + </body> + """); } return Redirect(CanonicalFrontendUrl + "/portal?msg=emailValidated"); diff --git a/code/api/src/Endpoints/Internal/RouteBaseAsync.cs b/code/api/src/Endpoints/Internal/RouteBaseAsync.cs index a87facf..dc25499 100644 --- a/code/api/src/Endpoints/Internal/RouteBaseAsync.cs +++ b/code/api/src/Endpoints/Internal/RouteBaseAsync.cs @@ -5,69 +5,69 @@ namespace IOL.GreatOffice.Api.Endpoints.Internal; /// </summary> public static class RouteBaseAsync { - public static class WithRequest<TRequest> - { - public abstract class WithResult<TResponse> : INT_EndpointBase - { - public abstract Task<TResponse> HandleAsync( - TRequest request, - CancellationToken cancellationToken = default - ); - } + public static class WithRequest<TRequest> + { + public abstract class WithResult<TResponse> : INT_EndpointBase + { + public abstract Task<TResponse> HandleAsync( + TRequest request, + CancellationToken cancellationToken = default + ); + } - public abstract class WithoutResult : INT_EndpointBase - { - public abstract Task HandleAsync( - TRequest request, - CancellationToken cancellationToken = default - ); - } + public abstract class WithoutResult : INT_EndpointBase + { + public abstract Task HandleAsync( + TRequest request, + CancellationToken cancellationToken = default + ); + } - public abstract class WithActionResult<TResponse> : INT_EndpointBase - { - public abstract Task<ActionResult<TResponse>> HandleAsync( - TRequest request, - CancellationToken cancellationToken = default - ); - } + public abstract class WithActionResult<TResponse> : INT_EndpointBase + { + public abstract Task<ActionResult<TResponse>> HandleAsync( + TRequest request, + CancellationToken cancellationToken = default + ); + } - public abstract class WithActionResult : INT_EndpointBase - { - public abstract Task<ActionResult> HandleAsync( - TRequest request, - CancellationToken cancellationToken = default - ); - } - } + public abstract class WithActionResult : INT_EndpointBase + { + public abstract Task<ActionResult> HandleAsync( + TRequest request, + CancellationToken cancellationToken = default + ); + } + } - public static class WithoutRequest - { - public abstract class WithResult<TResponse> : INT_EndpointBase - { - public abstract Task<TResponse> HandleAsync( - CancellationToken cancellationToken = default - ); - } + public static class WithoutRequest + { + public abstract class WithResult<TResponse> : INT_EndpointBase + { + public abstract Task<TResponse> HandleAsync( + CancellationToken cancellationToken = default + ); + } - public abstract class WithoutResult : INT_EndpointBase - { - public abstract Task HandleAsync( - CancellationToken cancellationToken = default - ); - } + public abstract class WithoutResult : INT_EndpointBase + { + public abstract Task HandleAsync( + CancellationToken cancellationToken = default + ); + } - public abstract class WithActionResult<TResponse> : INT_EndpointBase - { - public abstract Task<ActionResult<TResponse>> HandleAsync( - CancellationToken cancellationToken = default - ); - } + public abstract class WithActionResult<TResponse> : INT_EndpointBase + { + public abstract Task<ActionResult<TResponse>> HandleAsync( + CancellationToken cancellationToken = default + ); + } - public abstract class WithActionResult : INT_EndpointBase - { - public abstract Task<ActionResult> HandleAsync( - CancellationToken cancellationToken = default - ); - } - } -} + public abstract class WithActionResult : INT_EndpointBase + { + public abstract Task<ActionResult> HandleAsync( + CancellationToken cancellationToken = default + ); + } + } +}
\ No newline at end of file diff --git a/code/api/src/Endpoints/Internal/RouteBaseSync.cs b/code/api/src/Endpoints/Internal/RouteBaseSync.cs index 9d9bd5a..4bbfa16 100644 --- a/code/api/src/Endpoints/Internal/RouteBaseSync.cs +++ b/code/api/src/Endpoints/Internal/RouteBaseSync.cs @@ -5,49 +5,49 @@ namespace IOL.GreatOffice.Api.Endpoints.Internal; /// </summary> public static class RouteBaseSync { - public static class WithRequest<TRequest> - { - public abstract class WithResult<TResponse> : INT_EndpointBase - { - public abstract TResponse Handle(TRequest request); - } + public static class WithRequest<TRequest> + { + public abstract class WithResult<TResponse> : INT_EndpointBase + { + public abstract TResponse Handle(TRequest request); + } - public abstract class WithoutResult : INT_EndpointBase - { - public abstract void Handle(TRequest request); - } + public abstract class WithoutResult : INT_EndpointBase + { + public abstract void Handle(TRequest request); + } - public abstract class WithActionResult<TResponse> : INT_EndpointBase - { - public abstract ActionResult<TResponse> Handle(TRequest request); - } + public abstract class WithActionResult<TResponse> : INT_EndpointBase + { + public abstract ActionResult<TResponse> Handle(TRequest request); + } - public abstract class WithActionResult : INT_EndpointBase - { - public abstract ActionResult Handle(TRequest request); - } - } + public abstract class WithActionResult : INT_EndpointBase + { + public abstract ActionResult Handle(TRequest request); + } + } - public static class WithoutRequest - { - public abstract class WithResult<TResponse> : INT_EndpointBase - { - public abstract TResponse Handle(); - } + public static class WithoutRequest + { + public abstract class WithResult<TResponse> : INT_EndpointBase + { + public abstract TResponse Handle(); + } - public abstract class WithoutResult : INT_EndpointBase - { - public abstract void Handle(); - } + public abstract class WithoutResult : INT_EndpointBase + { + public abstract void Handle(); + } - public abstract class WithActionResult<TResponse> : INT_EndpointBase - { - public abstract ActionResult<TResponse> Handle(); - } + public abstract class WithActionResult<TResponse> : INT_EndpointBase + { + public abstract ActionResult<TResponse> Handle(); + } - public abstract class WithActionResult : INT_EndpointBase - { - public abstract ActionResult Handle(); - } - } -} + public abstract class WithActionResult : INT_EndpointBase + { + public abstract ActionResult Handle(); + } + } +}
\ No newline at end of file |
