@opengovsg/mockpass 4.9.2 → 4.10.0

package/lib/express/fapi/fapi.service.js

@@ -299,10 +299,15 @@ function lookUpPersonAttribute(profile, attribute) {
 function buildPersonInfo(profile, scope) {
   const requestedAttributes = scope
     .split(' ')
-    .filter((requested) => FapiUtils.MyInfoPersonScopes.includes(requested))
+    .map((requested) =>
+      FapiUtils.MyInfoPersonScopes.includes(requested)
+        ? requested
+        : resolveGranularScope(requested),
+    )
+    .filter(Boolean)
 
   const personInfo = {}
-  for (const attribute of requestedAttributes) {
+  for (const attribute of new Set(requestedAttributes)) {
     personInfo[attribute] = lookUpPersonAttribute(profile, attribute)
   }
   return personInfo
@@ -505,10 +510,19 @@ function verifyAllowedScopes(scope) {
   assert(scope, 'Scope is required')
   const scopes = scope.split(' ')
   for (const s of scopes) {
-    if (!FapiUtils.SupportedScopes.includes(s))
+    if (!FapiUtils.SupportedScopes.includes(s) && !resolveGranularScope(s))
       throw new Error(`Scope ${s} is not supported`)
   }
 }
+
+// Myinfo v4/v5 lets clients consent to a single field of a complex attribute
+// with a dotted scope, e.g. vehicles.vehicleno or childrenbirthrecords.dob.
+// Mockpass serves the whole parent attribute for any of its sub-scopes.
+function resolveGranularScope(scope) {
+  const [parent, subAttribute] = scope.split('.')
+  if (!subAttribute) return null
+  return FapiUtils.MyInfoPersonScopes.includes(parent) ? parent : null
+}
 function verifyStateAndNonce(state, nonce) {
   assert(state, 'State is required')
   if (/^[A-Za-z0-9/+_\-=.]{30,255}$/.test(state) === false)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengovsg/mockpass",
-  "version": "4.9.2",
+  "version": "4.10.0",
   "description": "A mock SingPass/CorpPass server for dev purposes",
   "main": "app.js",
   "bin": {
@@ -38,7 +38,7 @@
   "dependencies": {
     "base-64": "^1.0.0",
     "cookie-parser": "^1.4.3",
-    "dotenv": "^17.2.0",
+    "dotenv": "^18.0.5",
     "expiry-map": "^2.0.0",
     "express": "^5.1.0",
     "express-session": "^1.19.0",

package/static/myinfo/v3.json

@@ -5408,7 +5408,18 @@
           "secondaryrace": {
             "code": "",
             "desc": ""
-          }
+          },
+          "vaccinationrequirements": [
+            {
+              "requirement": {
+                "code": "1M3D",
+                "desc": "Minimum 1 dose of MMR and 3 doses of DTaP"
+              },
+              "fulfilled": {
+                "value": true
+              }
+            }
+          ]
         },
         {
           "dialect": {
@@ -5457,7 +5468,18 @@
           "secondaryrace": {
             "code": "",
             "desc": ""
-          }
+          },
+          "vaccinationrequirements": [
+            {
+              "requirement": {
+                "code": "1M3D",
+                "desc": "Minimum 1 dose of MMR and 3 doses of DTaP"
+              },
+              "fulfilled": {
+                "value": false
+              }
+            }
+          ]
         }
       ],
       "drivinglicence": {
@@ -6537,7 +6559,18 @@
           "secondaryrace": {
             "code": "",
             "desc": ""
-          }
+          },
+          "vaccinationrequirements": [
+            {
+              "requirement": {
+                "code": "1M3D",
+                "desc": "Minimum 1 dose of MMR and 3 doses of DTaP"
+              },
+              "fulfilled": {
+                "value": true
+              }
+            }
+          ]
         },
         {
           "dialect": {
@@ -6586,7 +6619,18 @@
           "secondaryrace": {
             "code": "",
             "desc": ""
-          }
+          },
+          "vaccinationrequirements": [
+            {
+              "requirement": {
+                "code": "1M3D",
+                "desc": "Minimum 1 dose of MMR and 3 doses of DTaP"
+              },
+              "fulfilled": {
+                "value": false
+              }
+            }
+          ]
         }
       ],
       "drivinglicence": {
@@ -10988,7 +11032,18 @@
           "secondaryrace": {
             "code": "",
             "desc": ""
-          }
+          },
+          "vaccinationrequirements": [
+            {
+              "requirement": {
+                "code": "1M3D",
+                "desc": "Minimum 1 dose of MMR and 3 doses of DTaP"
+              },
+              "fulfilled": {
+                "value": true
+              }
+            }
+          ]
         }
       ],
       "drivinglicence": {
@@ -13513,7 +13568,18 @@
           "secondaryrace": {
             "code": "",
             "desc": ""
-          }
+          },
+          "vaccinationrequirements": [
+            {
+              "requirement": {
+                "code": "1M3D",
+                "desc": "Minimum 1 dose of MMR and 3 doses of DTaP"
+              },
+              "fulfilled": {
+                "value": true
+              }
+            }
+          ]
         },
         {
           "dialect": {
@@ -13562,7 +13628,18 @@
           "secondaryrace": {
             "code": "",
             "desc": ""
-          }
+          },
+          "vaccinationrequirements": [
+            {
+              "requirement": {
+                "code": "1M3D",
+                "desc": "Minimum 1 dose of MMR and 3 doses of DTaP"
+              },
+              "fulfilled": {
+                "value": false
+              }
+            }
+          ]
         },
         {
           "dialect": {
@@ -18078,7 +18155,18 @@
           "secondaryrace": {
             "code": "",
             "desc": ""
-          }
+          },
+          "vaccinationrequirements": [
+            {
+              "requirement": {
+                "code": "1M3D",
+                "desc": "Minimum 1 dose of MMR and 3 doses of DTaP"
+              },
+              "fulfilled": {
+                "value": true
+              }
+            }
+          ]
         },
         {
           "dialect": {
@@ -18127,7 +18215,18 @@
           "secondaryrace": {
             "code": "",
             "desc": ""
-          }
+          },
+          "vaccinationrequirements": [
+            {
+              "requirement": {
+                "code": "1M3D",
+                "desc": "Minimum 1 dose of MMR and 3 doses of DTaP"
+              },
+              "fulfilled": {
+                "value": false
+              }
+            }
+          ]
         }
       ],
       "drivinglicence": {
@@ -20444,7 +20543,18 @@
           "secondaryrace": {
             "code": "",
             "desc": ""
-          }
+          },
+          "vaccinationrequirements": [
+            {
+              "requirement": {
+                "code": "1M3D",
+                "desc": "Minimum 1 dose of MMR and 3 doses of DTaP"
+              },
+              "fulfilled": {
+                "value": true
+              }
+            }
+          ]
         },
         {
           "dialect": {
@@ -20493,7 +20603,18 @@
           "secondaryrace": {
             "code": "",
             "desc": ""
-          }
+          },
+          "vaccinationrequirements": [
+            {
+              "requirement": {
+                "code": "1M3D",
+                "desc": "Minimum 1 dose of MMR and 3 doses of DTaP"
+              },
+              "fulfilled": {
+                "value": false
+              }
+            }
+          ]
         },
         {
           "dialect": {
@@ -22742,7 +22863,18 @@
           "secondaryrace": {
             "code": "",
             "desc": ""
-          }
+          },
+          "vaccinationrequirements": [
+            {
+              "requirement": {
+                "code": "1M3D",
+                "desc": "Minimum 1 dose of MMR and 3 doses of DTaP"
+              },
+              "fulfilled": {
+                "value": true
+              }
+            }
+          ]
         },
         {
           "dialect": {
@@ -22791,7 +22923,18 @@
           "secondaryrace": {
             "code": "",
             "desc": ""
-          }
+          },
+          "vaccinationrequirements": [
+            {
+              "requirement": {
+                "code": "1M3D",
+                "desc": "Minimum 1 dose of MMR and 3 doses of DTaP"
+              },
+              "fulfilled": {
+                "value": false
+              }
+            }
+          ]
         }
       ],
       "drivinglicence": {
@@ -23871,7 +24014,18 @@
           "secondaryrace": {
             "code": "",
             "desc": ""
-          }
+          },
+          "vaccinationrequirements": [
+            {
+              "requirement": {
+                "code": "1M3D",
+                "desc": "Minimum 1 dose of MMR and 3 doses of DTaP"
+              },
+              "fulfilled": {
+                "value": true
+              }
+            }
+          ]
         },
         {
           "dialect": {
@@ -23920,7 +24074,18 @@
           "secondaryrace": {
             "code": "",
             "desc": ""
-          }
+          },
+          "vaccinationrequirements": [
+            {
+              "requirement": {
+                "code": "1M3D",
+                "desc": "Minimum 1 dose of MMR and 3 doses of DTaP"
+              },
+              "fulfilled": {
+                "value": false
+              }
+            }
+          ]
         },
         {
           "dialect": {
@@ -29398,4 +29563,4 @@
       }
     }
   }
-}
+}