feat: improve response types of API

romanett · Nov 6, 2023 · dcd4d4a · dcd4d4a
1 parent 123d013
commit dcd4d4a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/GDSwithREST/Controllers/ApplicationsController.cs b/GDSwithREST/Controllers/ApplicationsController.cs
@@ -38,9 +38,9 @@ public ApplicationsController(GdsDbContext context, IApplicationsDatabase applic
         /// <returns></returns>
         // GET: /Applications
         [HttpGet]
-        [ProducesResponseType(Microsoft.AspNetCore.Http.StatusCodes.Status200OK, Type = typeof(ApplicationApiModel))]
+        [ProducesResponseType(Microsoft.AspNetCore.Http.StatusCodes.Status200OK, Type = typeof(ApplicationApiModel[]))]
         [ProducesResponseType(Microsoft.AspNetCore.Http.StatusCodes.Status404NotFound)]
-        public async Task<ActionResult<IEnumerable<ApplicationApiModel>>> GetApplications()
+        public async Task<ActionResult<ApplicationApiModel[]>> GetApplications()
         {
           if (_context.Applications == null)
           {
@@ -50,7 +50,7 @@ public async Task<ActionResult<IEnumerable<ApplicationApiModel>>> GetApplication
             var applicationsAsApiModel =
                from application in applications
                select new ApplicationApiModel(application);
-            return Ok(applicationsAsApiModel);
+            return Ok(applicationsAsApiModel.ToArray());
         }
         /// <summary>
         /// Returns the specified Application

diff --git a/GDSwithREST/Controllers/CertificateGroupsController.cs b/GDSwithREST/Controllers/CertificateGroupsController.cs
@@ -24,13 +24,13 @@ public CertificateGroupsController(ICertificateGroupDb certificates)
         /// <returns></returns>
         // GET: /CertificateGroups
         [HttpGet]
-        [ProducesResponseType(StatusCodes.Status200OK, Type = typeof(CertificateGroupApiModel))]
-        public ActionResult<IEnumerable<CertificateGroupApiModel>> GetCertificateGroups()
+        [ProducesResponseType(StatusCodes.Status200OK, Type = typeof(CertificateGroupApiModel[]))]
+        public ActionResult<CertificateGroupApiModel[]> GetCertificateGroups()
         {
             var certificateGroups =
                 from certificateGroup in _certificatesDatabase.CertificateGroups
                 select new CertificateGroupApiModel(certificateGroup);
-            return Ok(certificateGroups);
+            return Ok(certificateGroups.ToArray());
         }
         /// <summary>
         /// Returns the CA Certificate of the specified Certificate Group
@@ -63,9 +63,9 @@ public ActionResult<X509CertificateApiModel> GetCertificateGroupCA(uint id)
         /// <returns></returns>
         // GET: /CertificateGroups/5/trustlist
         [HttpGet("{id:int}/trustlist")]
-        [ProducesResponseType(StatusCodes.Status200OK, Type = typeof(X509CertificateApiModel))]
+        [ProducesResponseType(StatusCodes.Status200OK, Type = typeof(X509CertificateApiModel[]))]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
-        public async Task<ActionResult<IEnumerable<X509CertificateApiModel>>> GetCertificateGroupTrustList(uint id)
+        public async Task<ActionResult<X509CertificateApiModel[]>> GetCertificateGroupTrustList(uint id)
         {
             if (_certificatesDatabase == null)
             {
@@ -81,7 +81,7 @@ public async Task<ActionResult<IEnumerable<X509CertificateApiModel>>> GetCertifi
             var trustList =
                 from cert in trustedCertificatesCollection
                 select new X509CertificateApiModel(cert);
-            return  Ok(trustList);
+            return  Ok(trustList.ToArray());
         }
         /// <summary>
         /// Regenerate the CA Certificate of the specified Certificate Group
@@ -94,9 +94,8 @@ from cert in trustedCertificatesCollection
         [HttpPost("{id:int}/ca")]
         [ProducesResponseType(StatusCodes.Status200OK, Type = typeof(X509CertificateApiModel))]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
-        public async Task<ActionResult<X509CertificateApiModel>> PostCertificateGroupCA(uint id, [FromBody] JsonElement subjectNameRaw)
+        public async Task<ActionResult<X509CertificateApiModel>> PostCertificateGroupCA(uint id)
         {
-            var subjectName = subjectNameRaw.ToString();
             if (_certificatesDatabase == null)
             {
                 return NotFound();
@@ -106,7 +105,7 @@ public async Task<ActionResult<X509CertificateApiModel>> PostCertificateGroupCA(
             {
                 return NotFound();
             }
-            await certificateGroup.CreateCACertificateAsync(subjectName);
+            await certificateGroup.CreateCACertificateAsync(certificateGroup.Configuration.SubjectName);
 
             return Ok(new X509CertificateApiModel(certificateGroup.Certificate));
         }