From cba9c246b20c9b2d33546a48ac5878dc46e87f55 Mon Sep 17 00:00:00 2001 From: ivarlovlie Date: Thu, 17 Nov 2022 13:52:37 +0700 Subject: refactor: Use explicit req/res classes instead of common dto --- code/api/src/Data/Database/Api/ApiAccessToken.cs | 19 ------------------ .../src/Endpoints/V1/ApiTokens/CreateTokenRoute.cs | 13 ++++++++++-- .../src/Endpoints/V1/ApiTokens/GetTokensRoute.cs | 22 ++++++++++++++++++--- code/app/src/lib/api/api-tokens/index.ts | 23 ++++++++++++++++++++++ 4 files changed, 53 insertions(+), 24 deletions(-) create mode 100644 code/app/src/lib/api/api-tokens/index.ts (limited to 'code') diff --git a/code/api/src/Data/Database/Api/ApiAccessToken.cs b/code/api/src/Data/Database/Api/ApiAccessToken.cs index 9582869..9359fc4 100644 --- a/code/api/src/Data/Database/Api/ApiAccessToken.cs +++ b/code/api/src/Data/Database/Api/ApiAccessToken.cs @@ -9,23 +9,4 @@ public class ApiAccessToken : Base public bool AllowUpdate { get; set; } public bool AllowDelete { get; set; } public bool HasExpired => ExpiryDate < AppDateTime.UtcNow; - public ApiAccessTokenDto AsDto => new(this); - - public class ApiAccessTokenDto - { - public ApiAccessTokenDto(ApiAccessToken source) { - ExpiryDate = source.ExpiryDate; - AllowRead = source.AllowRead; - AllowCreate = source.AllowCreate; - AllowUpdate = source.AllowUpdate; - AllowDelete = source.AllowDelete; - } - - public DateTime ExpiryDate { get; set; } - public bool AllowRead { get; set; } - public bool AllowCreate { get; set; } - public bool AllowUpdate { get; set; } - public bool AllowDelete { get; set; } - public bool HasExpired => ExpiryDate < AppDateTime.UtcNow; - } } \ No newline at end of file diff --git a/code/api/src/Endpoints/V1/ApiTokens/CreateTokenRoute.cs b/code/api/src/Endpoints/V1/ApiTokens/CreateTokenRoute.cs index c4f2ee5..163ddb6 100644 --- a/code/api/src/Endpoints/V1/ApiTokens/CreateTokenRoute.cs +++ b/code/api/src/Endpoints/V1/ApiTokens/CreateTokenRoute.cs @@ -2,7 +2,7 @@ using System.Text; namespace IOL.GreatOffice.Api.Endpoints.V1.ApiTokens; -public class CreateTokenRoute : RouteBaseSync.WithRequest.WithActionResult +public class CreateTokenRoute : RouteBaseSync.WithRequest.WithActionResult { private readonly MainAppDatabase _database; private readonly AppConfiguration _configuration; @@ -14,6 +14,15 @@ public class CreateTokenRoute : RouteBaseSync.WithRequest /// Create a new api token with the provided claims. /// @@ -21,7 +30,7 @@ public class CreateTokenRoute : RouteBaseSync.WithRequest [ApiVersion(ApiSpecV1.VERSION_STRING)] [HttpPost("~/v{version:apiVersion}/api-tokens/create")] - public override ActionResult Handle(ApiAccessToken.ApiAccessTokenDto request) { + public override ActionResult Handle(Payload request) { var user = _database.Users.SingleOrDefault(c => c.Id == LoggedInUser.Id); if (user == default) { return NotFound(new KnownProblemModel("User does not exist")); diff --git a/code/api/src/Endpoints/V1/ApiTokens/GetTokensRoute.cs b/code/api/src/Endpoints/V1/ApiTokens/GetTokensRoute.cs index 90f4d71..ee46b34 100644 --- a/code/api/src/Endpoints/V1/ApiTokens/GetTokensRoute.cs +++ b/code/api/src/Endpoints/V1/ApiTokens/GetTokensRoute.cs @@ -1,6 +1,6 @@ namespace IOL.GreatOffice.Api.Endpoints.V1.ApiTokens; -public class GetTokensRoute : RouteBaseSync.WithoutRequest.WithResult>> +public class GetTokensRoute : RouteBaseSync.WithoutRequest.WithResult>> { private readonly MainAppDatabase _database; @@ -8,13 +8,29 @@ public class GetTokensRoute : RouteBaseSync.WithoutRequest.WithResult ExpiryDate < AppDateTime.UtcNow; + } + /// /// Get all tokens, both active and inactive. /// /// A list of tokens [ApiVersion(ApiSpecV1.VERSION_STRING)] [HttpGet("~/v{version:apiVersion}/api-tokens")] - public override ActionResult> Handle() { - return Ok(_database.AccessTokens.Where(c => c.User.Id == LoggedInUser.Id).Select(c => c.AsDto)); + public override ActionResult> Handle() { + return Ok(_database.AccessTokens.Where(c => c.User.Id == LoggedInUser.Id).Select(c => new ResponseModel() { + AllowCreate = c.AllowCreate, + AllowRead = c.AllowRead, + AllowDelete = c.AllowDelete, + AllowUpdate = c.AllowUpdate, + ExpiryDate = c.ExpiryDate + })); } } \ No newline at end of file diff --git a/code/app/src/lib/api/api-tokens/index.ts b/code/app/src/lib/api/api-tokens/index.ts new file mode 100644 index 0000000..77bfd91 --- /dev/null +++ b/code/app/src/lib/api/api-tokens/index.ts @@ -0,0 +1,23 @@ +import {http_delete_async, http_get_async, http_post_async} from "src/lib/api/_fetch"; +import {api_base} from "src/lib/configuration"; +import type {Temporal} from "temporal-polyfill"; + +export const http_api_tokens = { + create_token_async(payload: CreateTokenPayload): Promise { + return http_post_async(api_base("v1/api-tokens/create"), payload); + }, + delete_token_async(id: string): Promise { + return http_delete_async(api_base("v1/api-tokens/delete?id=" + id)); + }, + get_tokens_async(): Promise { + return http_get_async(api_base("v1/api-tokens")) + }, +}; + +export type CreateTokenPayload = { + expiryDate: Temporal.PlainDateTime, + allowRead: boolean, + allowCreate: boolean, + allowUpdate: boolean, + allowDelete: boolean +} \ No newline at end of file -- cgit v1.3