ref: return Set from checkMyInfoHashes

src/app/controllers/myinfo.server.controller.ts

@@ -8,7 +8,12 @@ import { StatusCodes } from 'http-status-codes'
 import { ProcessedFieldResponse } from 'src/app/modules/submission/submission.types'
 
 import { createLoggerWithLabel } from '../../config/logger'
-import { AuthType, IHashes, IPopulatedForm, SpcpSession } from '../../types'
+import {
+  AuthType,
+  IPopulatedForm,
+  MyInfoAttribute,
+  SpcpSession,
+} from '../../types'
 import { MyInfoFactory } from '../services/myinfo/myinfo.factory'
 import {
   extractRequestedAttributes,
@@ -20,14 +25,16 @@ const logger = createLoggerWithLabel(module)
 
 type MyInfoReq<T> = T & {
   form: IPopulatedForm
-  hashedFields?: IHashes
 }
 type ResWithSpcpSession<T> = T & {
   locals: { spcpSession?: SpcpSession }
 }
 type ResWithUinFin<T> = T & {
   uinFin?: string
 }
+type ResWithHashedFields<T> = T & {
+  locals: { hashedFields?: Set<MyInfoAttribute> }
+}
 
 export const addMyInfo: RequestHandler<ParamsDictionary> = async (
   req,
@@ -104,7 +111,9 @@ export const verifyMyInfoVals: RequestHandler<
     )
     .map((hashedFields) => {
       // eslint-disable-next-line @typescript-eslint/no-extra-semi
-      ;(req as MyInfoReq<typeof req>).hashedFields = hashedFields
+      ;(res as ResWithHashedFields<
+        typeof res
+      >).locals.hashedFields = hashedFields
       return next()
     })
     .mapErr((error) => {

src/app/services/myinfo/myinfo.factory.ts

@@ -7,7 +7,12 @@ import FeatureManager, {
   FeatureNames,
   RegisteredFeature,
 } from '../../../config/feature-manager'
-import { IFieldSchema, IHashes, IMyInfoHashSchema } from '../../../types'
+import {
+  IFieldSchema,
+  IHashes,
+  IMyInfoHashSchema,
+  MyInfoAttribute,
+} from '../../../types'
 import {
   DatabaseError,
   MissingFeatureError,
@@ -54,7 +59,7 @@ interface IMyInfoFactory {
     responses: ProcessedFieldResponse[],
     hashes: IHashes,
   ) => ResultAsync<
-    IHashes,
+    Set<MyInfoAttribute>,
     HashingError | HashDidNotMatchError | MissingFeatureError
   >
 }

src/app/services/myinfo/myinfo.service.ts

@@ -18,6 +18,7 @@ import {
   IFieldSchema,
   IHashes,
   IMyInfoHashSchema,
+  MyInfoAttribute,
 } from '../../../types'
 import { DatabaseError } from '../../modules/core/core.errors'
 import { ProcessedFieldResponse } from '../../modules/submission/submission.types'
@@ -250,7 +251,7 @@ export class MyInfoService {
   checkMyInfoHashes(
     responses: ProcessedFieldResponse[],
     hashes: IHashes,
-  ): ResultAsync<IHashes, HashingError | HashDidNotMatchError> {
+  ): ResultAsync<Set<MyInfoAttribute>, HashingError | HashDidNotMatchError> {
     const comparisonPromises = compareHashedValues(responses, hashes)
     return ResultAsync.fromPromise(
       Bluebird.props(comparisonPromises),
@@ -266,9 +267,10 @@ export class MyInfoService {
         return new HashingError(message)
       },
     ).andThen((comparisonResults) => {
+      const comparedAttrs = Array.from(comparisonResults.keys())
       // All outcomes should be true
-      const failedAttrs = Object.keys(comparisonResults).filter(
-        (attr) => !comparisonResults[attr],
+      const failedAttrs = comparedAttrs.filter(
+        (attr) => !comparisonResults.get(attr),
       )
       if (failedAttrs.length > 0) {
         const message = 'MyInfo Hash did not match'
@@ -281,7 +283,7 @@ export class MyInfoService {
         })
         return errAsync(new HashDidNotMatchError(message))
       }
-      return okAsync(comparisonResults as IHashes)
+      return okAsync(new Set(comparedAttrs))
     })
   }
 }

src/app/services/myinfo/myinfo.util.ts

@@ -5,7 +5,7 @@ import {
 } from '@opengovsg/myinfo-gov-client'
 import bcrypt from 'bcrypt'
 import { StatusCodes } from 'http-status-codes'
-import { get, keyBy, mapValues } from 'lodash'
+import { get } from 'lodash'
 import moment from 'moment'
 
 import { createLoggerWithLabel } from '../../../config/logger'
@@ -182,19 +182,17 @@ const compareSingleHash = (
 export const compareHashedValues = (
   responses: ProcessedFieldResponse[],
   hashes: IHashes,
-): Record<string, Promise<boolean>> => {
+): Map<MyInfoAttribute, Promise<boolean>> => {
   // Filter responses to only those fields with a corresponding hash
   const fieldsWithHashes = filterFieldsWithHashes(responses, hashes)
   // Map MyInfoAttribute to response
-  const myInfoResponsesObj = keyBy(
-    fieldsWithHashes,
-    (field) => field.myInfo.attr,
-  )
-  // Map MyInfoAttribute to Promise<boolean>
-  return mapValues(myInfoResponsesObj, (answer) =>
+  const myInfoResponsesMap = new Map<MyInfoAttribute, Promise<boolean>>()
+  fieldsWithHashes.forEach((field) => {
+    const attr = field.myInfo.attr
     // Already checked that hashes contains this attr
-    compareSingleHash(hashes[answer.myInfo.attr]!, answer),
-  )
+    myInfoResponsesMap.set(attr, compareSingleHash(hashes[attr]!, field))
+  })
+  return myInfoResponsesMap
 }
 
 export const mapVerifyMyInfoError: MapRouteError = (error) => {