@opengovsg/mockpass 4.0.9 → 4.0.11

package/lib/express/oidc/v2-ndi.js

@@ -59,47 +59,80 @@ const id_token_encryption_alg_values_supported = {
   corpPass: corppass_id_token_encryption_alg_values_supported,
 }
 
-function findEncryptionKey(jwks) {
+function findEcdhEsEncryptionKey(jwks, crv, algs) {
   let encryptionKey = jwks.keys.find(
     (item) =>
       item.use === 'enc' &&
       item.kty === 'EC' &&
-      item.crv === 'P-521' &&
-      (item.alg === 'ECDH-ES+A256KW' || !item.alg),
+      item.crv === crv &&
+      (!item.alg ||
+        (item.alg === 'ECDH-ES+A256KW' &&
+          algs.some((alg) => alg === item.alg))),
   )
   if (encryptionKey) {
-    return { ...encryptionKey, alg: 'ECDH-ES+A256KW' }
+    return {
+      ...encryptionKey,
+      ...(!encryptionKey.alg ? { alg: 'ECDH-ES+A256KW' } : {}),
+    }
+  }
+  encryptionKey = jwks.keys.find(
+    (item) =>
+      item.use === 'enc' &&
+      item.kty === 'EC' &&
+      item.crv === crv &&
+      (!item.alg ||
+        (item.alg === 'ECDH-ES+A192KW' &&
+          algs.some((alg) => alg === item.alg))),
+  )
+  if (encryptionKey) {
+    return {
+      ...encryptionKey,
+      ...(!encryptionKey.alg ? { alg: 'ECDH-ES+A256KW' } : {}),
+    }
+  }
+  encryptionKey = jwks.keys.find(
+    (item) =>
+      item.use === 'enc' &&
+      item.kty === 'EC' &&
+      item.crv === crv &&
+      (!item.alg ||
+        (item.alg === 'ECDH-ES+A128KW' &&
+          algs.some((alg) => alg === item.alg))),
+  )
+  if (encryptionKey) {
+    return {
+      ...encryptionKey,
+      ...(!encryptionKey.alg ? { alg: 'ECDH-ES+A256KW' } : {}),
+    }
+  }
+  return null
+}
+
+function findEncryptionKey(jwks, algs) {
+  let encryptionKey = findEcdhEsEncryptionKey(jwks, 'P-521', algs)
+  if (encryptionKey) {
+    return encryptionKey
   }
   if (!encryptionKey) {
-    encryptionKey = jwks.keys.find(
-      (item) =>
-        item.use === 'enc' &&
-        item.kty === 'EC' &&
-        item.crv === 'P-384' &&
-        (item.alg === 'ECDH-ES+A192KW' || !item.alg),
-    )
+    encryptionKey = findEcdhEsEncryptionKey(jwks, 'P-384', algs)
   }
   if (encryptionKey) {
-    return { ...encryptionKey, alg: 'ECDH-ES+A192KW' }
+    return encryptionKey
   }
   if (!encryptionKey) {
-    encryptionKey = jwks.keys.find(
-      (item) =>
-        item.use === 'enc' &&
-        item.kty === 'EC' &&
-        item.crv === 'P-256' &&
-        (item.alg === 'ECDH-ES+A128KW' || !item.alg),
-    )
+    encryptionKey = findEcdhEsEncryptionKey(jwks, 'P-256', algs)
   }
   if (encryptionKey) {
-    return { ...encryptionKey, alg: 'ECDH-ES+A128KW' }
+    return encryptionKey
   }
   if (!encryptionKey) {
     encryptionKey = jwks.keys.find(
       (item) =>
         item.use === 'enc' &&
         item.kty === 'RSA' &&
-        (item.alg === 'RSA-OAEP-256' || !item.alg),
+        (!item.alg ||
+          (item.alg === 'RSA-OAEP-256' &&
+            algs.some((alg) => alg === item.alg))),
     )
   }
   if (encryptionKey) {
@@ -432,7 +465,7 @@ function config(app, { showLoginPage }) {
         const signedProtectedHeader = {
           alg: 'ES256',
           typ: 'JWT',
-          kid: signingKey.kid,
+          kid: aspSigningKey.kid,
         }
         const signedIdToken = await new jose.CompactSign(
           new TextEncoder().encode(JSON.stringify(idTokenClaims)),
@@ -441,7 +474,10 @@ function config(app, { showLoginPage }) {
           .sign(signingKey)
 
         // Step 4: Encrypt ID token with RP encryption key
-        const rpEncryptionKey = findEncryptionKey(rpKeysetJson)
+        const rpEncryptionKey = findEncryptionKey(
+          rpKeysetJson,
+          id_token_encryption_alg_values_supported[idp],
+        )
         if (!rpEncryptionKey) {
           console.error('No suitable encryption key found', rpKeysetJson.keys)
           return res.status(400).send({

package/lib/express/sgid.js

@@ -208,6 +208,13 @@ function config(app, { showLoginPage, serviceProvider }) {
           'myinfo.residential',
           'myinfo.housingtype',
           'myinfo.hdbtype',
+          'myinfo.birth_country',
+          'myinfo.vehicles',
+          'myinfo.name_of_employer',
+          'myinfo.workpass_status',
+          'myinfo.workpass_expiry_date',
+          'myinfo.marital_status',
+          'myinfo.mobile_number_with_country_code',
         ],
         id_token_signing_alg_values_supported: ['RS256'],
         subject_types_supported: ['pairwise'],
@@ -232,28 +239,79 @@ const concatMyInfoRegAddr = (regadd) => {
   return `${line1}\n${line2}\n${line3}`
 }
 
+// Refer to sgid myinfo parser
+const formatMobileNumberWithPrefix = (phone) => {
+  if (!phone || !phone.nbr?.value) {
+    return 'NA'
+  }
+  return phone.prefix?.value && phone.areacode?.value
+    ? `${phone.prefix?.value}${phone.areacode?.value} ${phone.nbr?.value}`
+    : phone.nbr?.value
+}
+
+// Refer to sgid myinfo parser
+const formatVehicles = (vehicles) => {
+  const vehicleObjects =
+    vehicles?.map((vehicle) => ({
+      vehicle_number: vehicle.vehicleno?.value || 'NA',
+    })) || '[]'
+  return vehicleObjects
+}
+
+const defaultUndefinedToNA = (value) => {
+  return value || 'NA'
+}
+
 // Refer to https://docs.id.gov.sg/data-catalog
 const sgIDScopeToMyInfoField = (persona, scope) => {
   switch (scope) {
     // No NRIC as that is always returned by default
     case 'openid':
-      return persona.uuid.value
+      return defaultUndefinedToNA(persona.uuid?.value)
     case 'myinfo.name':
-      return persona.name.value
+      return defaultUndefinedToNA(persona.name?.value)
     case 'myinfo.email':
-      return persona.email.value
+      return defaultUndefinedToNA(persona.email?.value)
+    case 'myinfo.sex':
+      return defaultUndefinedToNA(persona.sex?.desc)
+    case 'myinfo.race':
+      return defaultUndefinedToNA(persona.race?.desc)
     case 'myinfo.mobile_number':
-      return persona.mobileno.nbr.value
+      return defaultUndefinedToNA(persona.mobileno?.nbr?.value)
     case 'myinfo.registered_address':
       return concatMyInfoRegAddr(persona.regadd)
     case 'myinfo.date_of_birth':
-      return persona.dob.value
+      return defaultUndefinedToNA(persona.dob?.value)
     case 'myinfo.passport_number':
-      return persona.passportnumber.value
+      return defaultUndefinedToNA(persona.passportnumber?.value)
     case 'myinfo.passport_expiry_date':
-      return persona.passportexpirydate.value
+      return defaultUndefinedToNA(persona.passportexpirydate?.value)
+    case 'myinfo.nationality':
+      return defaultUndefinedToNA(persona.nationality?.desc)
+    case 'myinfo.residentialstatus':
+      return defaultUndefinedToNA(persona.residentialstatus?.desc)
+    case 'myinfo.residential':
+      return defaultUndefinedToNA(persona.residential?.desc)
+    case 'myinfo.housingtype':
+      return defaultUndefinedToNA(persona.housingtype?.desc)
+    case 'myinfo.hdbtype':
+      return defaultUndefinedToNA(persona.hdbtype?.desc)
+    case 'myinfo.birth_country':
+      return defaultUndefinedToNA(persona.birthcountry?.desc)
+    case 'myinfo.vehicles':
+      return formatVehicles(persona.vehicles)
+    case 'myinfo.name_of_employer':
+      return defaultUndefinedToNA(persona.employment?.value)
+    case 'myinfo.workpass_status':
+      return defaultUndefinedToNA(persona.passstatus?.value)
+    case 'myinfo.workpass_expiry_date':
+      return defaultUndefinedToNA(persona.passexpirydate?.value)
+    case 'myinfo.marital_status':
+      return defaultUndefinedToNA(persona.marital?.desc)
+    case 'myinfo.mobile_number_with_country_code':
+      return formatMobileNumberWithPrefix(persona.mobileno)
     default:
-      return ''
+      return 'NA'
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengovsg/mockpass",
-  "version": "4.0.9",
+  "version": "4.0.11",
   "description": "A mock SingPass/CorpPass server for dev purposes",
   "main": "index.js",
   "bin": {
@@ -59,7 +59,7 @@
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",
     "husky": "^8.0.1",
-    "lint-staged": "^13.0.3",
+    "lint-staged": "^14.0.1",
     "nodemon": "^3.0.1",
     "pinst": "^3.0.0",
     "prettier": "^2.0.5"