@gov-cy/govcy-express-services 1.12.2 → 1.13.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gov-cy/govcy-express-services",
-  "version": "1.12.2",
+  "version": "1.13.0",
   "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",
@@ -57,7 +57,7 @@
   },
   "dependencies": {
     "@gov-cy/dsf-email-templates": "^2.1.15",
-    "@gov-cy/govcy-frontend-renderer": "^1.29.0",
+    "@gov-cy/govcy-frontend-renderer": "^1.30.0",
     "axios": "^1.9.0",
     "cookie-parser": "^1.4.7",
     "dotenv": "^16.3.1",
@@ -89,5 +89,8 @@
     "minimatch": "^10.2.1",
     "serialize-javascript": "^7.0.3",
     "yauzl": "^3.2.1"
+  },
+  "allowScripts": {
+    "puppeteer@24.37.4": true
   }
 }

package/src/middleware/govcyConfigSiteData.mjs

@@ -1,4 +1,5 @@
 import { getServiceConfigData } from "../utils/govcyLoadConfigData.mjs";
+import { getUser } from "../utils/govcyDataLayer.mjs";
 
 /**
  * Middleware to load service configuration data based on siteId and language.
@@ -11,7 +12,10 @@ import { getServiceConfigData } from "../utils/govcyLoadConfigData.mjs";
 export async function serviceConfigDataMiddleware(req, res, next) {
     try {
         const { siteId } = req.params;
-        req.serviceData = await getServiceConfigData(siteId, req.globalLang);
+        // get User sub
+        const user = getUser(req.session);
+        const userSub = typeof user?.sub === "string" ? user.sub.trim() : "";
+        req.serviceData = await getServiceConfigData(siteId, req.globalLang, userSub);
 
         // Store current service 
         if (siteId) {

package/src/utils/govcyLoadConfigData.mjs

@@ -8,6 +8,14 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 import { whatsIsMyEnvironment, getEnvVariable} from './govcyEnvVariables.mjs';
 import { logger } from "./govcyLogger.mjs";
+import crypto from "crypto";
+
+function hashMatomoUserId(userSub) {
+  return crypto
+    .createHmac("sha256", getEnvVariable('SESSION_SECRET', 'default_secret_key_for_HMAC')) // Use SESSION_SECRET or a default value
+    .update(String(userSub))
+    .digest("base64");
+}
 
 
 /**
@@ -42,9 +50,10 @@ function loadConfigDataById(siteId) {
  * 
  * @param {string} siteId The siteId
  * @param {string} lang The desired language
+ * @param {string|null} userSub The user's sub (optional)
  * @returns {Array} services - Array of JSON data
  */
-export function getServiceConfigData(siteId,lang) {
+export function getServiceConfigData(siteId,lang, userSub = null) {
     //Load data from source
     const service = loadConfigDataById(siteId);
     if (!service) {
@@ -81,6 +90,13 @@ export function getServiceConfigData(siteId,lang) {
         url: getEnvVariable('MATOMO_URL', 'https://wp.matomo.dits.dmrid.gov.cy/'),
         siteId: getEnvVariable('MATOMO_SITE_ID', '50')
     };
+
+    //Handle userSub: Set userId if provided
+    const normalizedUserSub = typeof userSub === "string" ? userSub.trim() : "";
+
+    if (normalizedUserSub) {
+        serviceCopy.site.matomo.userId = hashMatomoUserId(normalizedUserSub);
+    }
     // Add manifest path
     serviceCopy.site.manifest = `/${siteId}/manifest.json`;