Fix content type and body handling for OpenHIM responses

jembi · Mar 4, 2024 · c7b6de3 · c7b6de3
1 parent c15f93c
commit c7b6de3
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 17 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mpi-mediator",
-  "version": "v2.0.1",
+  "version": "v2.0.2",
   "description": "An OpenHIM mediator to handle all interactions with an MPI component",
   "main": "index.ts",
   "scripts": {

diff --git a/src/middlewares/mpi-mdm-everything.ts b/src/middlewares/mpi-mdm-everything.ts
@@ -69,6 +69,6 @@ export const mpiMdmEverythingMiddleware: RequestHandler = async (req, res, next)
 
   const { status, body } = await fetchAllLinkedPatientResources(req.params.patientId);
 
-  res.set('Content-Type', 'application/openhim+json');
+  res.set('Content-Type', 'application/json+openhim');
   res.status(status).send(body);
 };
diff --git a/src/middlewares/mpi-mdm-summary.ts b/src/middlewares/mpi-mdm-summary.ts
@@ -42,6 +42,6 @@ export const mpiMdmSummaryMiddleware: RequestHandler = async (req, res, next) =>
 
   const { status, body } = await fetchAllLinkedPatientSummary(req.params.patientId);
 
-  res.set('Content-Type', 'application/openhim+json');
+  res.set('Content-Type', 'application/json+openhim');
   res.status(status).send(body);
 };
diff --git a/src/middlewares/openhim-proxy-interceptor.ts b/src/middlewares/openhim-proxy-interceptor.ts
@@ -24,6 +24,8 @@ export const openhimProxyResponseInterceptor = responseInterceptor(
 
     const responseBody = buildOpenhimResponseObject(transactionStatus, statusCode, body);
 
+    _res.setHeader('Content-Type', 'application/json+openhim');
+
     return JSON.stringify(responseBody);
   }
 );

diff --git a/src/middlewares/validation.ts b/src/middlewares/validation.ts
@@ -4,8 +4,13 @@ import logger from '../logger';
 import { ResponseObject } from '../types/response';
 import { buildOpenhimResponseObject, isHttpStatusOk, postData } from '../utils/utils';
 
-const { fhirDatastoreProtocol, fhirDatastoreHost, fhirDatastorePort, contentType, disableValidation } =
-  getConfig();
+const {
+  fhirDatastoreProtocol,
+  fhirDatastoreHost,
+  fhirDatastorePort,
+  contentType,
+  disableValidation,
+} = getConfig();
 
 export const validationMiddleware: RequestHandler = async (req, res, next) => {
   logger.info('Validating Fhir Resources');
@@ -21,7 +26,7 @@ export const validationMiddleware: RequestHandler = async (req, res, next) => {
       status: 400,
     };
   } else if (disableValidation) {
-      return next();
+    return next();
   } else {
     response = await postData(
       fhirDatastoreProtocol,
@@ -56,6 +61,6 @@ export const validationMiddleware: RequestHandler = async (req, res, next) => {
     response.body
   );
 
-  res.set('Content-Type', 'application/openhim+json');
+  res.set('Content-Type', 'application/json+openhim');
   res.status(response.status).send(responseBody);
 };
diff --git a/src/routes/index.ts b/src/routes/index.ts
@@ -26,7 +26,7 @@ routes.post(
   asyncHandler(async (req, res) => {
     const result = await matchSyncHandler(req.body);
 
-    res.set('Content-Type', 'application/openhim+json');
+    res.set('Content-Type', 'application/json+openhim');
     res.status(result.status).send(result.body);
   })
 );
@@ -40,7 +40,7 @@ routes.post(
 
     const responseBody = buildOpenhimResponseObject(transactionStatus, status, body);
 
-    res.set('Content-Type', 'application/openhim+json');
+    res.set('Content-Type', 'application/json+openhim');
     res.status(status).send(responseBody);
   })
 );
@@ -67,7 +67,7 @@ routes.get(
   asyncHandler(async (req, res) => {
     const { status, body } = await fetchEverythingByRef(`Patient/${req.params.patientId}`);
 
-    res.set('Content-Type', 'application/openhim+json');
+    res.set('Content-Type', 'application/json+openhim');
     res.status(status).send(body);
   })
 );
@@ -78,7 +78,7 @@ routes.get(
   asyncHandler(async (req, res) => {
     const { status, body } = await fetchPatientSummaryByRef(`Patient/${req.params.patientId}`);
 
-    res.set('Content-Type', 'application/openhim+json');
+    res.set('Content-Type', 'application/json+openhim');
     res.status(status).send(body);
   })
 );
@@ -90,7 +90,7 @@ routes.post(
   asyncHandler(async (req, res) => {
     const result = await matchAsyncHandler(req.body);
 
-    res.set('Content-Type', 'application/openhim+json');
+    res.set('Content-Type', 'application/json+openhim');
     res.status(result.status).send(result.body);
   })
 );

diff --git a/src/types/response.ts b/src/types/response.ts
@@ -1,6 +1,6 @@
 export interface Response {
   status: number;
-  body: object;
+  body: string;
   timestamp: string;
   headers: HeadersInit;
 }

diff --git a/src/utils/utils.ts b/src/utils/utils.ts
@@ -95,12 +95,12 @@ export const buildOpenhimResponseObject = (
   openhimTransactionStatus: string,
   httpResponseStatusCode: number,
   responseBody: object,
-  contentType = 'application/json'
+  contentType = 'application/fhir+json'
 ): OpenHimResponseObject => {
   const response: Response = {
     status: httpResponseStatusCode,
     headers: { 'Content-Type': contentType },
-    body: responseBody,
+    body: JSON.stringify(responseBody),
     timestamp: format(new Date(), "yyyy-MM-dd'T'HH:mm:ss.SSSXXX"),
   };
-Original file line number
+Diff line change
@@ Expand Up @@
         const responseBody = buildOpenhimResponseObject(transactionStatus, statusCode, body);
+        _res.setHeader('Content-Type', 'application/json+openhim');
         return JSON.stringify(responseBody);
       }
     );
@@ Expand Down @@