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

package/package.json

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

package/src/middleware/govcyFileDeleteHandler.mjs

@@ -53,7 +53,9 @@ export function govcyFileDeletePageHandler() {
         
             // Guard if still nothing found
             if (!elementData || !elementData.fileId || !elementData.sha256) {
-                return handleMiddlewareError(`File input [${elementName}] data not found on this page`, 404, next);
+                logger.info(`govcyFileDeletePageHandler: File data not found for element [${elementName}] on page [${pageUrl}] in site [${siteId}]. Redirecting to "${siteId}/${pageUrl}".`);
+                return res.redirect(govcyResources.constructPageUrl(siteId, pageUrl, (req.query.route === "review" ? "review" : "")))
+                // return handleMiddlewareError(`File input [${elementName}] data not found on this page`, 404, next);
             }
 
 

package/src/middleware/govcyHttpErrorHandler.mjs

@@ -52,6 +52,11 @@ export function govcyHttpErrorHandler(err, req, res, next) {
     res.status(statusCode);
 
     if (isApiRequest(req)) {
+        if (err.code === `LIMIT_FILE_SIZE` && err.name === `MulterError`) {
+            statusCode = 409;
+            message = "File exceeds allowed size";
+            return res.status(400).json(errorResponse(statusCode, message));
+        }
         return res.status(statusCode).json(errorResponse(statusCode, message));
     }
 

package/src/middleware/govcyReviewPostHandler.mjs

@@ -163,6 +163,18 @@ export function govcyReviewPostHandler() {
                     // Add the reference number to the submission data
                     submissionData.referenceNumber = referenceNo;
                     logger.info("✅ Data submitted", siteId, referenceNo);
+                    
+                    // Get the user email address
+                    let emailAddress = "";
+                    // if Update my details not provided the use user email
+                    if (!updateMyDetailsData || !updateMyDetailsData.email) {
+                        emailAddress = dataLayer.getUser(req.session).email;
+                    } else {
+                        emailAddress = updateMyDetailsData.email;
+                    }
+                    // add contact email to submission data
+                    submissionData.contactEmailAddress = emailAddress;
+                    
                     // handle data layer submission
                     dataLayer.storeSiteSubmissionData(
                         req.session,
@@ -172,16 +184,7 @@ export function govcyReviewPostHandler() {
                     //-- Send email to user
                     // Generate the email body
                     let emailBody = generateSubmitEmail(service, submissionData.printFriendlyData, referenceNo, req);
-                    logger.debug("Email generated:", emailBody);
-
-                    let emailAddress = "";
-                    // if Update my details not provided the use user email
-                    if (!updateMyDetailsData || !updateMyDetailsData.email) {
-                        emailAddress = dataLayer.getUser(req.session).email;
-                    } else {
-                        emailAddress = updateMyDetailsData.email;
-                    }
-
+                   
                     // Send the email
                     sendEmail(
                         service.site.title[service.site.lang], 

package/src/middleware/govcyServiceEligibilityHandler.mjs

@@ -26,19 +26,22 @@ export function govcyServiceEligibilityHandler(checkForForm = false) {
                 if (!pageUrl) pageUrl = "index";
                 // 🔍 Find the page by pageUrl
                 const page = getPageConfigData(service, pageUrl);
-                if (!page || !page.pageTemplate) return next(); // Defensive: skip if no template
-                // Deep copy pageTemplate to avoid modifying the original
-                const pageTemplateCopy = JSON.parse(JSON.stringify(page.pageTemplate));
-
-                // Check if any section contains a form element
-                const hasForm = pageTemplateCopy.sections?.some(section =>
-                    section.elements?.some(el => el.element === "form")
-                );
-                if (!hasForm) {
-                    // No form found, skip eligibility check
-                    return next();
+                // ----- `updateMyDetails` handling. always run eligibility for updateMyDetails
+                if (!page.updateMyDetails) {
+                    if (!page || !page.pageTemplate) return next(); // Defensive: skip if no template
+                    // Deep copy pageTemplate to avoid modifying the original
+                    const pageTemplateCopy = JSON.parse(JSON.stringify(page.pageTemplate));
+    
+                    // Check if any section contains a form element
+                    const hasForm = pageTemplateCopy.sections?.some(section =>
+                        section.elements?.some(el => el.element === "form")
+                    );
+                    if (!hasForm) {
+                        // No form found, skip eligibility check
+                        return next();
+                    }
+                    // else: continue with eligibility check
                 }
-                // else: continue with eligibility check
             }
             const eligibilityEndpoints = service?.site?.eligibilityAPIEndpoints || [];
             const user = dataLayer.getUser(req.session); // Get the user from the session;

package/src/middleware/govcySuccessPageHandler.mjs

@@ -44,12 +44,21 @@ export function govcySuccessPageHandler(isPDF = false) {
                     // }
                 ]
             };
+
+            let weHaveSendYouAnEmailText = JSON.parse(JSON.stringify(govcyResources.staticResources.text.weHaveSendYouAnEmail));
+            // Replace label placeholders for email
+            for (const lang of Object.keys(weHaveSendYouAnEmailText)) {
+                weHaveSendYouAnEmailText[lang] = weHaveSendYouAnEmailText[lang].replace("{{email}}", 
+                    submissionData.contactEmailAddress || ""
+                );
+            }
+
             // Construct page title
             const weHaveSendYouAnEmail = {
                 element: "textElement",
                 params: {
                     type: "p",
-                    text: govcyResources.staticResources.text.weHaveSendYouAnEmail
+                    text: weHaveSendYouAnEmailText
                 }
             };
             

package/src/resources/govcyResources.mjs

@@ -102,9 +102,9 @@ export const staticResources = {
             tr: "Your reference number: "
         },
         weHaveSendYouAnEmail: {
-            en: "We have sent you a confirmation email.",
-            el: "Έχουμε στείλει email επιβεβαιωσης.",
-            tr: "We have sent you a confirmation email."
+            en: "We have sent you a confirmation email at \"{{email}}\".",
+            el: "Έχουμε στείλει email επιβεβαιωσης στο \"{{email}}\".",
+            tr: "We have sent you a confirmation email at \"{{email}}\"."
         },
         theDataFromYourRequest: {
             en: "The data from your request: ",
@@ -182,14 +182,14 @@ export const staticResources = {
             tr: "This entry already exists"
         },
         multipleThingsMaxMessage: {
-            en: "You have reached the maximum number of entries. You can only add up to {{max}} entries",
-            el: "Έχετε φτάσει το μέγιστο αριθμό καταχωρίσεων. Μπορείτε να προσθέσετε μόνο έως {{max}} καταχωρίσεις",
-            tr: "You have reached the maximum number of entries. You can only add up to {{max}} entries"
+            en: "You have reached the maximum number of entries. You can only add up to {{max}}",
+            el: "Έχετε φτάσει το μέγιστο αριθμό καταχωρίσεων. Μπορείτε να προσθέσετε μόνο έως {{max}}",
+            tr: "You have reached the maximum number of entries. You can only add up to {{max}}"
         },
         multipleThingsMinMessage: {
-            en: "You have not added the minimum number of entries. You must add at least {{min}} entries",
-            el: "Δεν έχετε προσθέσει τον ελάχιστο αριθμό καταχωρίσεων. Πρέπει να προσθέσετε τουλάχιστον {{min}} καταχωρίσεις",
-            tr: "You have not added the minimum number of entries. You must add at least {{min}} entries"
+            en: "You have not added the minimum number of entries. You must add at least {{min}}",
+            el: "Δεν έχετε προσθέσει τον ελάχιστο αριθμό καταχωρίσεων. Πρέπει να προσθέσετε τουλάχιστον {{min}}",
+            tr: "You have not added the minimum number of entries. You must add at least {{min}}"
         },
         multipleThingsItemsValidationPrefix: {
             en: "Entry {{index}} - ",