@gov-cy/govcy-express-services 1.3.0-alpha.1 → 1.3.0-alpha.3

package/src/utils/govcyConstants.mjs

@@ -5,4 +5,16 @@ export const ALLOWED_FORM_ELEMENTS = ["textInput", "textArea", "select", "radios
 export const ALLOWED_FILE_MIME_TYPES = ['application/pdf', 'image/jpeg', 'image/png'];
 export const ALLOWED_FILE_EXTENSIONS = ['pdf', 'jpg', 'jpeg', 'png'];
 export const ALLOWED_FILE_SIZE_MB = 4; // Maximum file size in MB
-export const ALLOWED_MULTER_FILE_SIZE_MB = 10; // Maximum file size in MB
+export const ALLOWED_MULTER_FILE_SIZE_MB = 10; // Maximum file size in MB
+// UPDATE MY DETAILS 
+// Only allow certain hosts
+export const UPDATE_MY_DETAILS_ALLOWED_HOSTS = [
+        "update-my-details.staging.service.gov.cy",
+        "update-my-details.service.gov.cy",
+        "localhost"
+    ];
+// Possible incoming routes 
+export const UPDATE_MY_DETAILS_REDIRECT_HOSTS = [
+        "update-my-details.staging.service.gov.cy",
+        "update-my-details.service.gov.cy"
+    ];

package/src/utils/govcyHandleFiles.mjs

@@ -100,6 +100,16 @@ export async function handleFileUpload({
 
     // deep copy the page template to avoid modifying the original
     const pageTemplateCopy = JSON.parse(JSON.stringify(page.pageTemplate));
+    
+    // If mode is `single` make sure it has no multipleThings
+    if (mode === "single" && page?.multipleThings) {
+      return {
+        status: 400,
+        dataStatus: 413,
+        errorMessage: 'Single mode upload not allowed on multipleThings pages'
+      };
+    }
+    
     // Validate the field: Only allow upload if the page contains a fileInput with the given name
     const isAllowed = pageContainsFileInput(pageTemplateCopy, elementName);
     if (!isAllowed) {

package/src/utils/govcySubmitData.mjs

@@ -6,6 +6,7 @@ import { ALLOWED_FORM_ELEMENTS } from "./govcyConstants.mjs";
 import { evaluatePageConditions } from "./govcyExpressions.mjs";
 import { getPageConfigData } from "./govcyLoadConfigData.mjs";
 import { logger } from "./govcyLogger.mjs";
+import { createUmdManualPageTemplate } from "../middleware/govcyUpdateMyDetails.mjs"
 import nunjucks from "nunjucks";
 
 /**
@@ -43,9 +44,30 @@ export function prepareSubmissionData(req, siteId, service) {
 
         // Find the <form> element in the page
         let formElement = null;
-        for (const section of page.pageTemplate.sections || []) {
-            formElement = section.elements.find(el => el.element === "form");
-            if (formElement) break;
+
+        // ----- `updateMyDetails` handling
+        // 🔹 Case C: updateMyDetails
+        if (page.updateMyDetails) {
+            logger.debug("Preparing submission data for UpdateMyDetails page", { siteId, pageUrl });
+            // Build the manual UMD page template
+            const umdTemplate  = createUmdManualPageTemplate(siteId, service.site.lang, page, req);
+            
+            // Extract the form element
+            formElement = umdTemplate .sections
+                .flatMap(section => section.elements)
+                .find(el => el.element === "form");
+            
+            if (!formElement) {
+                logger.error("🚨 UMD form element not found during prepareSubmissionData", { siteId, pageUrl });
+                return handleMiddlewareError("🚨 UMD form element not found during prepareSubmissionData", 500, next);
+            }
+            // ----- `updateMyDetails` handling
+        } else {
+            // Normal flow 
+            for (const section of page.pageTemplate.sections || []) {
+                formElement = section.elements.find(el => el.element === "form");
+                if (formElement) break;
+            }
         }
 
         if (!formElement) continue; // ⛔ Skip pages without a <form> element
@@ -235,8 +257,20 @@ export function preparePrintFriendlyData(req, siteId, service) {
             continue; // ⛔ Skip this page from print-friendly data
         }
 
+        let pageTemplate = page.pageTemplate;
+        let pageTitle = page.pageData.title || {};
+        
+
+        // ----- MultipleThings hub handling
+        if (page.updateMyDetails) {
+            // create the page template
+            pageTemplate = createUmdManualPageTemplate(siteId, service.site.lang, page, req );
+            // set the page title
+            pageTitle = govcyResources.staticResources.text.updateMyDetailsTitle;
+        }
+
         // find the form element in the page template
-        for (const section of page.pageTemplate.sections || []) {
+        for (const section of pageTemplate.sections || []) {
             for (const element of section.elements || []) {
                 if (element.element !== "form") continue;
 
@@ -282,6 +316,7 @@ export function preparePrintFriendlyData(req, siteId, service) {
 
         // Special case: multipleThings page → extract item titles // ✅ new
         if (page.multipleThings) {
+            pageTitle = page.multipleThings?.listPage?.title || pageTitle;
             let mtItems = dataLayer.getPageData(req.session, siteId, page.pageData.url);
             if (Array.isArray(mtItems)) {
                 const env = new nunjucks.Environment(null, { autoescape: false });
@@ -295,7 +330,7 @@ export function preparePrintFriendlyData(req, siteId, service) {
         if (fields.length > 0) {
             submissionData.push({
                 pageUrl: page.pageData.url,
-                pageTitle: page.pageData.title,
+                pageTitle: pageTitle,
                 fields,
                 items: (page.multipleThings ? items : null) // ✅ new
             });
@@ -674,8 +709,12 @@ export function generateSubmitEmail(service, submissionData, submissionId, req)
     // For each page in the submission data
     for (const page of submissionData) {
         // Get the page URL, title, and fields
-        const { pageUrl, pageTitle, fields, items } = page;
+        let { pageUrl, pageTitle, fields, items } = page;
 
+        // 🔹 MultipleThings page
+        if (page.multipleThings) {
+            pageTitle = page.multipleThings?.listPage?.title || pageTitle;
+        }
         // Add data title to the body
         body.push(
             {

package/src/utils/govcyValidator.mjs

@@ -96,13 +96,39 @@ function validateValue(value, rules) {
       }
       return normalizedVal <= max;
     },
-    // ✅ New rule: maxCurrentYear
+    // ✅ Year based current rules
     maxCurrentYear: (val) => {
       const normalizedVal = normalizeNumber(val);
       if (isNaN(normalizedVal)) return false;
       const currentYear = new Date().getFullYear();
       return normalizedVal <= currentYear;
     },
+    minCurrentYear: (val) => {
+      const normalizedVal = normalizeNumber(val);
+      if (isNaN(normalizedVal)) return false;
+      const currentYear = new Date().getFullYear();
+      return normalizedVal >= currentYear;
+    },
+    // ✅ Date-based current rules
+    minCurrentDate: (val) => {
+      const valueDate = parseDate(val);
+      const today = new Date();
+      if (isNaN(valueDate)) return false;
+      // strip time components from both
+      const valueOnly = new Date(valueDate.getFullYear(), valueDate.getMonth(), valueDate.getDate());
+      const todayOnly = new Date(today.getFullYear(), today.getMonth(), today.getDate());
+      return valueOnly >= todayOnly;
+    },
+
+    maxCurrentDate: (val) => {
+      const valueDate = parseDate(val);
+      const today = new Date();
+      if (isNaN(valueDate)) return false;
+      const valueOnly = new Date(valueDate.getFullYear(), valueDate.getMonth(), valueDate.getDate());
+      const todayOnly = new Date(today.getFullYear(), today.getMonth(), today.getDate());
+      return valueOnly <= todayOnly;
+    },
+
     minValueDate: (val, minDate) => {
       const valueDate = parseDate(val); // Parse the input date
       const min = parseDate(minDate); // Parse the minimum date
@@ -139,7 +165,7 @@ function validateValue(value, rules) {
     // Skip validation if the value is empty
     if (value === null || value === undefined || (typeof value === 'string' && value.trim() === "")) {
       continue; // let "required" handle emptiness
-    } 
+    }
     // Check for "valid" rules (e.g., numeric, telCY, etc.)
     if (check === "valid" && validationRules[checkValue]) {
       const isValid = validationRules[checkValue](value);
@@ -168,12 +194,12 @@ function validateValue(value, rules) {
     if (check === 'minValue' && !validationRules.minValue(value, checkValue)) {
       return message;
     }
-    
+
     // Check for "maxValue"
     if (check === 'maxValue' && !validationRules.maxValue(value, checkValue)) {
       return message;
     }
-    
+
     // Check for "minValueDate"
     if (check === 'minValueDate' && !validationRules.minValueDate(value, checkValue)) {
       return message;
@@ -368,4 +394,77 @@ export function validateFormElements(elements, formData, pageUrl) {
     }
   });
   return validationErrors;
-}
+}
+
+
+/**
+ * Checks if a user is an Individual with a valid Cypriot citizen identifier.
+ * Rules:
+ *  - profile_type must be "Individual"
+ *  - unique_identifier must be a string
+ *  - must start with "00"
+ *  - must be 10 characters long
+ *
+ * @param {object} user - The user object (e.g. req.session.user)
+ * @returns {boolean} true if valid, false otherwise
+ */
+export function isValidCypriotCitizen(user = {}) {
+  const { profile_type, unique_identifier } = user;
+
+  if (
+    typeof profile_type === "string" &&
+    profile_type === "Individual" &&
+    typeof unique_identifier === "string" &&
+    unique_identifier.startsWith("00") &&
+    unique_identifier.length === 10
+  ) {
+    return true;
+  }
+
+  return false;
+}
+
+/**
+ * Checks if the given user represents a valid foreign resident (ARC holder).
+ * Conditions:
+ *  - profile_type must equal "Individual"
+ *  - unique_identifier must be a string
+ *  - unique_identifier must start with "05"
+ *  - unique_identifier must be exactly 10 characters long
+ *
+ * @param {object} user - e.g. req.session.user
+ * @returns {boolean} True if valid foreign resident, otherwise false
+ */
+export function isValidForeignResident(user = {}) {
+  const { profile_type, unique_identifier } = user;
+
+  return (
+    typeof profile_type === "string" &&
+    profile_type === "Individual" &&
+    typeof unique_identifier === "string" &&
+    unique_identifier.startsWith("05") &&
+    unique_identifier.length === 10
+  );
+}
+
+/**
+ * Checks if the user is under 18 years old based on their date of birth.
+ * @param {string} dobString - The date of birth in the format "YYYY-MM-DD".
+ * @returns {boolean} True if the user is under 18 years old, otherwise false.
+ * @throws {Error} If the date of birth is missing or invalid.
+ * */
+export function isUnder18(dobString) {
+  if (!dobString) throw new Error("DOB is missing");
+  const dob = new Date(dobString);
+  if (isNaN(dob)) throw new Error("Invalid DOB format");
+
+  const today = new Date();
+  const ageDiff = today.getFullYear() - dob.getFullYear();
+  const hasHadBirthday =
+    today.getMonth() > dob.getMonth() ||
+    (today.getMonth() === dob.getMonth() && today.getDate() >= dob.getDate());
+
+  return (hasHadBirthday ? ageDiff : ageDiff - 1) < 18;
+}
+
+