squashes header arrays and updates types

JackSpagnoliNHS · JackSpagnoliNHS · commit 6423344ddbdd · 2026-04-22T12:12:27.000Z
diff --git a/packages/coordinator/src/routes/util.ts b/packages/coordinator/src/routes/util.ts
@@ -5,7 +5,7 @@ import * as LosslessJson from "lossless-json"
 import axios from "axios"
 import stream from "stream"
 import {translateToFhir} from "../services/translation/response"
-import {getShowValidationWarnings, RequestHeaders} from "../utils/headers"
+import {collapseHeaderArrays, getShowValidationWarnings, RequestHeaders} from "../utils/headers"
 import {getPayloadIdentifiers} from "./logging"
 import {
   isBundle,
@@ -60,12 +60,13 @@ export async function handleResponse<T>(
   }
 }
 
-function extractTraceIds(headers: Hapi.Utils.Dictionary<string>): Record<string, string> {
+function extractTraceIds(headers: Hapi.InternalRequestDefaults["Headers"]): Record<string, string> {
+  const collapsedHeaders = collapseHeaderArrays(headers)
   return {
-    "x-request-id": headers["x-request-id"] || headers["nhsd-request-id"],
-    "x-amzn-trace-id": headers["x-amzn-trace-id"],
-    "nhsd-correlation-id": headers["nhsd-correlation-id"],
-    "nhsd-request-id": headers["nhsd-request-id"]
+    "x-request-id": collapsedHeaders["x-request-id"]! || collapsedHeaders["nhsd-request-id"]!,
+    "x-amzn-trace-id": collapsedHeaders["x-amzn-trace-id"]!,
+    "nhsd-correlation-id": collapsedHeaders["nhsd-correlation-id"]!,
+    "nhsd-request-id": collapsedHeaders["nhsd-request-id"]!
   }
 }
 
@@ -84,7 +85,7 @@ const getCircularReplacer = () => {
 
 export async function callFhirValidator(
   payload: HapiPayload,
-  requestHeaders: Hapi.Utils.Dictionary<string>,
+  requestHeaders: Hapi.InternalRequestDefaults["Headers"],
   logger: pino.Logger = null
 ): Promise<fhir.OperationOutcome> {
   // Payload is already normalised if it went through externalValidator or getPayload
diff --git a/packages/coordinator/src/services/communication/ebxml-request-builder.ts b/packages/coordinator/src/services/communication/ebxml-request-builder.ts
@@ -67,7 +67,7 @@ export function addEbXmlWrapper(spineRequest: spine.SpineRequest): string {
  */
 export function toSpineRequest<T>(
   sendMessagePayload: hl7V3.SendMessagePayload<T>,
-  headers: Hapi.Utils.Dictionary<string>,
+  headers: Hapi.InternalRequestDefaults["Headers"],
   messageId?: string
 ): spine.SpineRequest {
   const requestId = getRequestId(headers)
diff --git a/packages/coordinator/src/services/communication/tracker111/index.ts b/packages/coordinator/src/services/communication/tracker111/index.ts
@@ -11,12 +11,12 @@ export interface TrackerClient {
     businessStatus: string,
     earliestDate: string,
     latestDate: string,
-    headers: Hapi.Utils.Dictionary<string>,
+    headers: Hapi.InternalRequestDefaults["Headers"],
     logger: pino.Logger
   ): Promise<spine.SummaryTrackerResponse>
   getPrescriptionById(
     prescriptionId: string,
-    headers: Hapi.Utils.Dictionary<string>,
+    headers: Hapi.InternalRequestDefaults["Headers"],
     logger: pino.Logger
   ): Promise<spine.DetailTrackerResponse>
 }
diff --git a/packages/coordinator/src/services/translation/request/index.ts b/packages/coordinator/src/services/translation/request/index.ts
@@ -129,7 +129,7 @@ export function isRepeatDispensing(medicationRequests: Array<fhir.MedicationRequ
 
 export async function convertPrescriptionBundleToSpineRequest(
   bundle: fhir.Bundle,
-  headers: Hapi.Utils.Dictionary<string>,
+  headers: Hapi.InternalRequestDefaults["Headers"],
   logger: pino.Logger
 ): Promise<{spineRequest: spine.SpineRequest, parentPrescription: hl7V3.ParentPrescription}> {
   const messageId = getBundleIdentifierValue(bundle)
diff --git a/packages/coordinator/src/services/translation/request/payload/factory.ts b/packages/coordinator/src/services/translation/request/payload/factory.ts
@@ -66,7 +66,7 @@ export abstract class SendMessagePayloadFactory {
 
   public createSendMessagePayload(
     fhirResource: FactoryInput,
-    headers: Hapi.Utils.Dictionary<string>,
+    headers: Hapi.InternalRequestDefaults["Headers"],
     logger: pino.Logger
   ): hl7V3.SendMessagePayload<PayloadContent> {
     this.logIdentifiers(fhirResource, logger)
diff --git a/packages/coordinator/src/services/translation/request/payload/index.ts b/packages/coordinator/src/services/translation/request/payload/index.ts
@@ -6,7 +6,7 @@ import * as requestBuilder from "../../../communication/ebxml-request-builder"
 
 async function convertBundleToSpineRequest(
   bundle: fhir.Bundle,
-  headers: Hapi.Utils.Dictionary<string>,
+  headers: Hapi.InternalRequestDefaults["Headers"],
   logger: pino.Logger
 ): Promise<spine.SpineRequest> {
   const factory = SendMessagePayloadFactory.forBundle()
@@ -16,7 +16,7 @@ async function convertBundleToSpineRequest(
 
 function convertClaimToSpineRequest(
   claim: fhir.Claim,
-  headers: Hapi.Utils.Dictionary<string>,
+  headers: Hapi.InternalRequestDefaults["Headers"],
   logger: pino.Logger
 ): spine.SpineRequest {
   const factory = SendMessagePayloadFactory.forClaim()
@@ -26,7 +26,7 @@ function convertClaimToSpineRequest(
 
 function convertParametersToSpineRequest(
   parameters: fhir.Parameters,
-  headers: Hapi.Utils.Dictionary<string>,
+  headers: Hapi.InternalRequestDefaults["Headers"],
   logger: pino.Logger
 ): spine.SpineRequest {
   const factory = SendMessagePayloadFactory.forParameters()
@@ -36,7 +36,7 @@ function convertParametersToSpineRequest(
 
 function convertTaskToSpineRequest(
   task: fhir.Task,
-  headers: Hapi.Utils.Dictionary<string>,
+  headers: Hapi.InternalRequestDefaults["Headers"],
   logger: pino.Logger
 ): spine.SpineRequest {
   const factory = SendMessagePayloadFactory.forTask()
diff --git a/packages/coordinator/src/services/translation/request/payload/message.ts b/packages/coordinator/src/services/translation/request/payload/message.ts
@@ -7,7 +7,7 @@ import Hapi from "@hapi/hapi"
 export function createSendMessagePayload<T>(
   messageId: string,
   interactionId: hl7V3.Hl7InteractionIdentifier,
-  headers: Hapi.Utils.Dictionary<string>,
+  headers: Hapi.InternalRequestDefaults["Headers"],
   subject: T
 ): hl7V3.SendMessagePayload<T> {
   const fromAsid = getAsid(headers)
@@ -31,7 +31,7 @@ function createCommunicationFunction(asid: string) {
 }
 
 function createControlActEvent<T>(
-  headers: Hapi.Utils.Dictionary<string>,
+  headers: Hapi.InternalRequestDefaults["Headers"],
   subject: T
 ) {
   const sdsUniqueIdentifier = getSdsUserUniqueId(headers)
diff --git a/packages/coordinator/src/services/translation/request/return/payload/return-payload-factory.ts b/packages/coordinator/src/services/translation/request/return/payload/return-payload-factory.ts
@@ -8,7 +8,7 @@ type ReturnProposal = DispenseProposalReturnRoot
 export interface ReturnPayloadFactory {
   createPayload(
     returnProposal: ReturnProposal,
-    requestHeaders: Hapi.Utils.Dictionary<string>
+    requestHeaders: Hapi.InternalRequestDefaults["Headers"]
     ): hl7V3.SendMessagePayload<ReturnProposal>
 }
 
diff --git a/packages/coordinator/src/services/translation/response/index.ts b/packages/coordinator/src/services/translation/response/index.ts
@@ -22,7 +22,9 @@ const spineResponseHandlers : Array<SpineResponseHandler<unknown>> = [
   RELEASE_REJECTION_HANDLER
 ]
 
-export function createReleaseHandlers(requestHeaders: Hapi.Utils.Dictionary<string>) : Array<ReleaseResponseHandler> {
+export function createReleaseHandlers(
+  requestHeaders: Hapi.InternalRequestDefaults["Headers"]
+) : Array<ReleaseResponseHandler> {
   const NOMINATED_RELEASE_RESPONSE_HANDLER = new ReleaseResponseHandler(
     "PORX_IN070101UK31",
     new DispensePropsalReturnHandler(requestHeaders,
@@ -42,7 +44,7 @@ export function createReleaseHandlers(requestHeaders: Hapi.Utils.Dictionary<stri
 export async function translateToFhir<T>(
   hl7Message: spine.SpineDirectResponse<T>,
   logger: pino.Logger,
-  requestHeaders: Hapi.Utils.Dictionary<string>): Promise<TranslatedSpineResponse> {
+  requestHeaders: Hapi.InternalRequestDefaults["Headers"]): Promise<TranslatedSpineResponse> {
   const responseHandlers = [...createReleaseHandlers(requestHeaders), ...spineResponseHandlers]
   const bodyString = hl7Message.body.toString()
 
diff --git a/packages/coordinator/src/services/translation/response/spine-return-handler.ts b/packages/coordinator/src/services/translation/response/spine-return-handler.ts
@@ -15,12 +15,12 @@ export interface SpineReturnHandler {
 
 export class DispensePropsalReturnHandler implements SpineReturnHandler {
 
-  private readonly requestHeaders : Hapi.Utils.Dictionary<string>
+  private readonly requestHeaders : Hapi.InternalRequestDefaults["Headers"]
   private readonly payloadFactory: ReturnPayloadFactory
   private readonly spineClient: SpineClient
 
   constructor(
-    headers: Hapi.Utils.Dictionary<string>,
+    headers: Hapi.InternalRequestDefaults["Headers"],
     returnPayloadFactory: ReturnPayloadFactory,
     spineClient : SpineClient) {
     this.requestHeaders = headers
diff --git a/packages/coordinator/src/utils/headers.ts b/packages/coordinator/src/utils/headers.ts
@@ -36,71 +36,73 @@ export const AWS_SCOPE = `${AWS_PRESCRIBING_USER_SCOPE} ${AWS_DISPENSING_USER_SC
 export const DEFAULT_SHOW_VALIDATION_WARNINGS = "false"
 const DEFAULT_APPLICATION_ID = "00000000-0000-0000-0000-000000000000"
 
-function getHeaderIdentifier(headers: Hapi.Utils.Dictionary<string>, identifier: RequestHeaders): string {
-  return isSandbox() ? crypto.randomUUID() : headers[identifier].toUpperCase()
+function getHeaderIdentifier(headers: Hapi.InternalRequestDefaults["Headers"], identifier: RequestHeaders): string {
+  return isSandbox() ? crypto.randomUUID() : collapseHeaderArrays(headers)[identifier]!.toUpperCase()
 }
 
-export function getRequestId(headers: Hapi.Utils.Dictionary<string>): string {
+export function getRequestId(headers: Hapi.InternalRequestDefaults["Headers"]): string {
   return getHeaderIdentifier(headers, RequestHeaders.REQUEST_ID)
 }
 
-export function getCorrelationId(headers: Hapi.Utils.Dictionary<string>): string {
+export function getCorrelationId(headers: Hapi.InternalRequestDefaults["Headers"]): string {
   return getHeaderIdentifier(headers, RequestHeaders.CORRELATION_ID)
 }
 
-export function getAsid(headers: Hapi.Utils.Dictionary<string>): string {
+export function getAsid(headers: Hapi.InternalRequestDefaults["Headers"]): string {
   if (isSandbox()) {
     return DEFAULT_SANDBOX_ASID
   }
   if (isEpsHostedContainer() && enableDefaultAsidPartyKey()) {
-    return DEFAULT_PTL_ASID
+    return DEFAULT_PTL_ASID!
   }
   if (headers[RequestHeaders.ASID] !== undefined) {
-    return headers[RequestHeaders.ASID]
+    return collapseHeaderArrays(headers)[RequestHeaders.ASID]!
   }
 
   throw new Error("Could not get ASID")
 }
 
-export function getPartyKey(headers: Hapi.Utils.Dictionary<string>): string {
+export function getPartyKey(headers: Hapi.InternalRequestDefaults["Headers"]): string {
   if (isSandbox()) {
     return DEFAULT_SANDBOX_PARTY_KEY
   }
   if (isEpsHostedContainer() && enableDefaultAsidPartyKey()) {
-    return DEFAULT_PTL_PARTY_KEY
+    return DEFAULT_PTL_PARTY_KEY!
   }
   if (headers[RequestHeaders.PARTY_KEY] !== undefined) {
-    return headers[RequestHeaders.PARTY_KEY]
+    return collapseHeaderArrays(headers)[RequestHeaders.PARTY_KEY]!
   }
 
   throw new Error("Could not get party key")
 }
 
-export function getSdsUserUniqueId(headers: Hapi.Utils.Dictionary<string>): string {
-  return isSandbox() ? DEFAULT_UUID : headers[RequestHeaders.SDS_USER_UNIQUE_ID]
+export function getSdsUserUniqueId(headers: Hapi.InternalRequestDefaults["Headers"]): string {
+  return isSandbox() ? DEFAULT_UUID : collapseHeaderArrays(headers)[RequestHeaders.SDS_USER_UNIQUE_ID]!
 }
 
-export function getSdsRoleProfileId(headers: Hapi.Utils.Dictionary<string>): string {
-  return isSandbox() ? DEFAULT_RPID : headers[RequestHeaders.SDS_ROLE_PROFILE_ID]
+export function getSdsRoleProfileId(headers: Hapi.InternalRequestDefaults["Headers"]): string {
+  return isSandbox() ? DEFAULT_RPID : collapseHeaderArrays(headers)[RequestHeaders.SDS_ROLE_PROFILE_ID]!
 }
 
-export function getScope(headers: Hapi.Utils.Dictionary<string>): string {
+export function getScope(headers: Hapi.InternalRequestDefaults["Headers"]): string {
   // scope is not passed through with proxygen but it is verified by it
   // so we can just return what scopes are checked in proxygen
   if (isEpsHostedContainer()) {
     return AWS_SCOPE
   }
-  return isSandbox() ? DEFAULT_SCOPE : headers[RequestHeaders.SCOPE]
+  return isSandbox() ? DEFAULT_SCOPE : collapseHeaderArrays(headers)[RequestHeaders.SCOPE]!
 }
 
-export function getShowValidationWarnings(headers: Hapi.Utils.Dictionary<string>): string {
+export function getShowValidationWarnings(headers: Hapi.InternalRequestDefaults["Headers"]): string {
   return isSandbox()
     ? DEFAULT_SHOW_VALIDATION_WARNINGS
-    : headers[RequestHeaders.SHOW_VALIDATION_WARNINGS]
+    : collapseHeaderArrays(headers)[RequestHeaders.SHOW_VALIDATION_WARNINGS]!
 }
 
-export function getApplicationId(headers: Hapi.Utils.Dictionary<string>): string {
-  return process.env.SANDBOX === "1" ? DEFAULT_APPLICATION_ID : headers[RequestHeaders.APPLICATION_ID]
+export function getApplicationId(headers: Hapi.InternalRequestDefaults["Headers"]): string {
+  return process.env.SANDBOX === "1"
+    ? DEFAULT_APPLICATION_ID
+    : collapseHeaderArrays(headers)[RequestHeaders.APPLICATION_ID]!
 }
 
 export enum ProxyName {
@@ -109,9 +111,9 @@ export enum ProxyName {
   EPS_FHIR = "EPS-FHIR",
 }
 
-export function getProxyName(headers: Hapi.Utils.Dictionary<string>): string {
+export function getProxyName(headers: Hapi.InternalRequestDefaults["Headers"]): string {
   if (isEpsHostedContainer()) {
-    const proxyName = headers[RequestHeaders.PROXY_NAME]
+    const proxyName = collapseHeaderArrays(headers)[RequestHeaders.PROXY_NAME]
     if (proxyName) {
       if (proxyName.includes("fhir-dispensing")) {
         return ProxyName.EPS_FHIR_DISPENSING
@@ -125,3 +127,14 @@ export function getProxyName(headers: Hapi.Utils.Dictionary<string>): string {
   }
   return ProxyName.EPS_FHIR
 }
+
+export function collapseHeaderArrays(
+  headers: Hapi.InternalRequestDefaults["Headers"]
+): Record<string, string | undefined> {
+  for (const key in headers) {
+    if (Array.isArray(headers[key])) {
+      headers[key] = headers[key][0]
+    }
+  }
+  return headers as Record<string, string | undefined>
+}
diff --git a/packages/coordinator/src/utils/metadata.ts b/packages/coordinator/src/utils/metadata.ts
@@ -291,7 +291,7 @@ function createDispensingCapabilityStatement(manifest: Manifest) {
 
 export function getCapabilityStatement(
   logger: pino.Logger,
-  headers: Hapi.Utils.Dictionary<string>
+  headers: Hapi.InternalRequestDefaults["Headers"]
 ) {
   const manifest = JSON.parse(readManifestFile(logger))
   if (isEpsHostedContainer()) {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ type ReturnProposal = DispenseProposalReturnRoot`
`8`	`8`	`export interface ReturnPayloadFactory {`
`9`	`9`	`createPayload(`
`10`	`10`	`returnProposal: ReturnProposal,`
`11`		`- requestHeaders: Hapi.Utils.Dictionary<string>`
	`11`	`+ requestHeaders: Hapi.InternalRequestDefaults["Headers"]`
`12`	`12`	`): hl7V3.SendMessagePayload<ReturnProposal>`
`13`	`13`	`}`
`14`	`14`