@gov-cy/govcy-express-services 1.9.0 → 1.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gov-cy/govcy-express-services",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "description": "An Express-based system that dynamically renders services using @gov-cy/govcy-frontend-renderer and posts data to a submission API.",
   "author": "DMRID - DSF Team",
   "license": "MIT",
@@ -56,8 +56,8 @@
     "coverage:badge": "coverage-badges --output ./coverage-badges.svg && npm run coverage:copy"
   },
   "dependencies": {
-    "@gov-cy/dsf-email-templates": "^2.1.11",
-    "@gov-cy/govcy-frontend-renderer": "^1.26.7",
+    "@gov-cy/dsf-email-templates": "^2.1.14",
+    "@gov-cy/govcy-frontend-renderer": "^1.26.9",
     "axios": "^1.9.0",
     "cookie-parser": "^1.4.7",
     "dotenv": "^16.3.1",
@@ -78,8 +78,8 @@
     "nodemon": "^3.0.2",
     "pa11y": "^9.1.0",
     "patch-package": "^8.0.1",
-    "sinon": "^21.0.1",
-    "puppeteer": "^24.6.0"
+    "puppeteer": "^24.6.0",
+    "sinon": "^21.0.1"
   },
   "engines": {
     "node": ">=18.0.0"

package/src/utils/govcyExpressions.mjs

@@ -94,19 +94,27 @@ export function evaluateExpression(expression, dataLayer = {}) {
 }
 
 
-/**
- * Evaluates expression **with automatic flattening**.
- * This is a convenience wrapper for most use cases.
- * 
- * @param {string} expression - JS expression using dataLayer["..."]
- * @param {object} object - Unflattened data object (e.g., session.siteData[siteKey])
- * @param {string} prefix - Prefix to add to all keys (usually the siteKey)
- * @returns {*} - The evaluated result
- */
-export function evaluateExpressionWithFlattening(expression, object, prefix = '') {
-  const dataLayer = flattenContext(object, prefix);
-  return evaluateExpression(expression, dataLayer);
-}
+/**
+ * Evaluates expression **with automatic flattening**.
+ * This is a convenience wrapper for most use cases.
+ * 
+ * @param {string} expression - JS expression using dataLayer["..."]
+ * @param {object} object - Unflattened data object (e.g., session.siteData[siteKey])
+ * @param {string} prefix - Prefix to add to all keys (usually the siteKey)
+ * @param {object} [req=null] - Express request, used to inject user.profile_type into the context
+ * @returns {*} - The evaluated result
+ */
+export function evaluateExpressionWithFlattening(expression, object, prefix = '', req = null) {
+  const baseObject = (object && typeof object === 'object') ? object : {};
+  const dataLayer = flattenContext(baseObject, prefix);
+
+  if (req) {
+    const profileType = req?.user?.profile_type ?? req?.session?.user?.profile_type ?? null;
+    dataLayer['user.profile_type'] = profileType;
+  }
+
+  return evaluateExpression(expression, dataLayer);
+}
 
 
 /**
@@ -166,11 +174,12 @@ export function evaluatePageConditions(page, store, siteKey, req = {}) {
 
     try {
       // Evaluate the expression using flattened site data
-      const result = evaluateExpressionWithFlattening(
-        condition.expression,
-        siteData,
-        siteKey
-      );
+      const result = evaluateExpressionWithFlattening(
+        condition.expression,
+        siteData,
+        siteKey,
+        req
+      );
 
       if (typeof result !== 'boolean') {
         logger.debug(`Condition expression on page '${page.pageData?.url || page.id}' returned non-boolean:`, result);