3 files changed, 30 insertions, 24 deletions

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<ApiAccessToken.ApiAccessTokenDto>.WithActionResult
+public class CreateTokenRoute : RouteBaseSync.WithRequest<CreateTokenRoute.Payload>.WithActionResult
 {
     private readonly MainAppDatabase _database;
     private readonly AppConfiguration _configuration;
@@ -14,6 +14,15 @@ public class CreateTokenRoute : RouteBaseSync.WithRequest<ApiAccessToken.ApiAcce
         _logger = logger;
     }
 
+    public class Payload
+    {
+        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; }
+    }
+
     /// <summary>
     /// Create a new api token with the provided claims.
     /// </summary>
@@ -21,7 +30,7 @@ public class CreateTokenRoute : RouteBaseSync.WithRequest<ApiAccessToken.ApiAcce
     /// <returns></returns>
     [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<ActionResult<List<ApiAccessToken.ApiAccessTokenDto>>>
+public class GetTokensRoute : RouteBaseSync.WithoutRequest.WithResult<ActionResult<List<GetTokensRoute.ResponseModel>>>
 {
     private readonly MainAppDatabase _database;
 
@@ -8,13 +8,29 @@ public class GetTokensRoute : RouteBaseSync.WithoutRequest.WithResult<ActionResu
         _database = database;
     }
 
+    public class ResponseModel
+    {
+        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;
+    }
+
     /// <summary>
     /// Get all tokens, both active and inactive.
     /// </summary>
     /// <returns>A list of tokens</returns>
     [ApiVersion(ApiSpecV1.VERSION_STRING)]
     [HttpGet("~/v{version:apiVersion}/api-tokens")]
-    public override ActionResult<List<ApiAccessToken.ApiAccessTokenDto>> Handle() {
-        return Ok(_database.AccessTokens.Where(c => c.User.Id == LoggedInUser.Id).Select(c => c.AsDto));
+    public override ActionResult<List<ResponseModel>> 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