@gov-cy/govcy-express-services 1.6.1 → 1.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gov-cy/govcy-express-services",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "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",

package/src/middleware/cyLoginAuth.mjs

@@ -181,4 +181,16 @@ export function cyLoginPolicy(req, res, next) {
         next
     );
 }
-/************************************************************************/
+/************************************************************************/
+
+export function getUniqueIdentifier(req) {
+    // https://dev.azure.com/cyprus-gov-cds/Documentation/_wiki/wikis/Documentation/82/Available-Scopes-and-Claims
+    const user = req?.session?.user || {};
+
+    const id =
+        user.unique_identifier ??
+        user.legal_unique_identifier ??
+        "";
+
+    return String(id);
+}

package/src/middleware/govcyReviewPostHandler.mjs

@@ -184,7 +184,7 @@ export function govcyReviewPostHandler() {
                 const submissionData = prepareSubmissionData(req, siteId, service);
 
                 // Prepare submission data for API
-                const submissionDataAPI = prepareSubmissionDataAPI(submissionData, service);
+                const submissionDataAPI = prepareSubmissionDataAPI(submissionData, service, req);
 
                 logger.debug("Prepared submission data for API:", submissionDataAPI);
 

package/src/resources/govcyResources.mjs

@@ -437,10 +437,13 @@ export const staticResources = {
                     {
                         check: "valid",
                         params: {
-                            checkValue: "noSpecialChars",
+                            checkValue: "nameCY",
                             message: {
-                                el: "Το όνομα σας πρέπει να αποτελείται μόνο από γράμματα, αριθμούς και ορισμένους άλλους χαρακτήρες",
-                                en: "Your name must consist only of letters, numbers and some other characters",
+                                // el: "Το όνομά σας μπορεί να περιέχει μόνο γράμματα, κενά, παύλες (-), αποστρόφους (’ ‘ ʼ) και τελείες (.)",
+                                // en: "Your name can only include letters, spaces, hyphens (-), apostrophes (’ ‘ ʼ) and dots (.)",
+                                // tr: ""
+                                el: "Το όνομά σας μπορεί να περιέχει μόνο γράμματα, κενά, παύλες (-), αποστρόφους (’ ‘ ʼ) και τελείες (.)",
+                                en: "Your name can only include letters, spaces, hyphens (-), curly apostrophes (’ ‘ ʼ) and dots (.)",
                                 tr: ""
                             }
                         }

package/src/utils/govcySubmitData.mjs

@@ -8,6 +8,7 @@ import { getServiceConfigData, getPageConfigData } from "./govcyLoadConfigData.m
 import { getMultipleThingsEmptyFormData } from "./govcyFormHandling.mjs";
 import { logger } from "./govcyLogger.mjs";
 import { createUmdManualPageTemplate } from "../middleware/govcyUpdateMyDetails.mjs"
+import { getUniqueIdentifier } from "../middleware/cyLoginAuth.mjs"
 import nunjucks from "nunjucks";
 
 /**
@@ -101,11 +102,19 @@ export function prepareSubmissionData(req, siteId, service) {
                     // radios conditional elements
                     if (el.element === "radios") {
                         for (const radioItem of el.params.items || []) {
+
+                            const isSelected = radioItem.value === value; // 🔸 to decide to populate only selected
+
                             for (const condEl of radioItem.conditionalElements || []) {
                                 if (!ALLOWED_FORM_ELEMENTS.includes(condEl.element)) continue;
                                 const condId = condEl.params?.id || condEl.params?.name;
                                 if (!condId) continue;
-                                let condValue = getValue(condEl, pageUrl, req, siteId, idx);
+
+                                // 🔸only populate if selected, otherwise empty string
+                                let condValue = isSelected
+                                    ? getValue(condEl, pageUrl, req, siteId, idx)
+                                    : ""; // 🔸 Empty if conditional radio is not selected
+
                                 itemData[condId] = condValue;
 
                                 if (condEl.element === "fileInput") {
@@ -156,6 +165,8 @@ export function prepareSubmissionData(req, siteId, service) {
                         const condEls = radioItem.conditionalElements;
                         if (!Array.isArray(condEls)) continue;
 
+                        const isSelected = radioItem.value === value; // 🔸 to decide to populate only selected
+
                         for (const condElement of condEls) {
                             const condType = condElement.element;
                             if (!ALLOWED_FORM_ELEMENTS.includes(condType)) continue;
@@ -164,7 +175,10 @@ export function prepareSubmissionData(req, siteId, service) {
                             if (!condId) continue;
 
                             // Again: read from session or fallback to ""
-                            const condValue = getValue(condElement, pageUrl, req, siteId) ?? "";
+                            // 🔸 only populate if selected; otherwise keep empty string
+                            const condValue = isSelected
+                                ? getValue(condElement, pageUrl, req, siteId) ?? ""
+                                : ""; // 🔸 Empty if conditional radio is not selected
 
                             // Store even if the field was not visible to user
                             // submissionData[pageUrl].formData[condId] = condValue;
@@ -255,9 +269,10 @@ export function prepareSubmissionData(req, siteId, service) {
  * 
  * @param {object} data data prepared by `prepareSubmissionData`\
  * @param {object} service service config data
+ * @param {object} req request object
  * @returns {object} The API-ready submission data object with all fields as strings
  */
-export function prepareSubmissionDataAPI(data, service) {
+export function prepareSubmissionDataAPI(data, service, req) {
 
     //deep copy data to avoid mutating the original
     let dataObj = JSON.parse(JSON.stringify(data));
@@ -277,12 +292,20 @@ export function prepareSubmissionDataAPI(data, service) {
                     let pageEmptyData = getMultipleThingsEmptyFormData(page);
                     //replace the dataObj.submissionData[key] with the empty data
                     dataObj.submissionData[key] = [pageEmptyData];
-    
+
                 } catch (error) {
                     logger.error('Error getting pageConfigData:', key);
                 }
             }
         }
+        // get the Unique Identifier of the user
+        const uniqueIdentifier = getUniqueIdentifier(req);
+
+        // Insert unique identifier as the first item in the array
+        dataObj.submissionData = {
+            cylogin_unique_identifier: uniqueIdentifier,
+            ...(dataObj.submissionData || {})
+        };
     }
 
     return {
@@ -923,7 +946,7 @@ export function generateSubmitEmail(service, submissionData, submissionId, req)
         //  Custom page
         // ==========================================================
         // 🆕 Check for custom pages that should appear after this one
-        for (const [customKey, customPage] of   customPageEntries) {
+        for (const [customKey, customPage] of customPageEntries) {
             const insertAfter = customPage.insertAfterPageUrl;
             if (insertAfter && insertAfter === pageUrl && Array.isArray(customPage.email)) {
                 pagesInBody.push(customPage.pageUrl); // Track custom page key for later
@@ -939,7 +962,7 @@ export function generateSubmitEmail(service, submissionData, submissionId, req)
                 body.push(...customPage.email);
             }
         }
-        
+
         // ==========================================================
     }
 

package/src/utils/govcyValidator.mjs

@@ -29,7 +29,8 @@ function validateValue(value, rules) {
     alphaNum: (val) => /^[A-Za-zΑ-Ωα-ω\u0370-\u03ff\u1f00-\u1fff0-9\s]+$/.test(val),
     noSpecialChars: (val) => /^([0-9]|[A-Z]|[a-z]|[α-ω]|[Α-Ω]|[,]|[.]|[-]|[(]|[)]|[?]|[!]|[;]|[:]|[\n]|[\r]|[ _]|[\u0370-\u03ff\u1f00-\u1fff])+$/.test(val),
     noSpecialCharsEl: (val) => /^([0-9]|[α-ω]|[Α-Ω]|[,]|[.]|[-]|[(]|[)]|[?]|[!]|[;]|[:]|[\n]|[\r]|[ _]|[\u0370-\u03ff\u1f00-\u1fff])+$/.test(val),
-    name: (val) => /^[A-Za-zΑ-Ωα-ω\u0370-\u03ff\u1f00-\u1fff\s'-]+$/.test(val),
+    name: (val) => /^[\p{L}\p{M}\s’‘ʼ.-]+$/u.test(val),
+    nameCY: (val) => /^[A-Za-zΑ-Ωα-ωΆ-Ώά-ώΪΫϊΐϋΰÇĞİIŞÖÜçğışöü\s.’‘ʼ-]*$/u.test(val),
     tel: (val) => /^(?:\+|00)?[\d\s\-()]{8,20}$/.test(val.replace(/[\s\-()]/g, '')),
     mobile: (val) => /^(?:\+|00)?[\d\s\-()]{8,20}$/.test(val.replace(/[\s\-()]/g, '')),
     // telCY: (val) => /^(?:\+|00)?357[-\s]?(2|9)\d{7}$/.test(val.replace(/[\s\-()]/g, '')),