hof 22.0.0-timeout-warning-beta.12 → 22.1.0-timeout-warning-sign-in-beta

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hof",
   "description": "A bootstrap for HOF projects",
-  "version": "22.0.0-timeout-warning-beta.12",
+  "version": "22.1.0-timeout-warning-sign-in-beta",
   "license": "MIT",
   "main": "index.js",
   "author": "HomeOffice",
@@ -54,7 +54,7 @@
     "duplexify": "^3.5.0",
     "express": "^4.17.1",
     "express-healthcheck": "^0.1.0",
-    "express-partial-templates": "^0.2.0",
+    "express-partial-templates": "^0.2.1",
     "express-session": "^1.13.0",
     "findup": "^0.1.5",
     "glob": "^7.2.0",
@@ -81,7 +81,7 @@
     "nodemailer-ses-transport": "^1.5.1",
     "nodemailer-smtp-transport": "^2.7.4",
     "nodemailer-stub-transport": "^1.1.0",
-    "notifications-node-client": "^6.0.0",
+    "notifications-node-client": "^8.2.0",
     "redis": "^3.1.2",
     "reqres": "^3.0.1",
     "rimraf": "^3.0.2",

package/sandbox/.env

@@ -1,2 +1,3 @@
-SESSION_TTL=61
-SESSION_TIMEOUT_WARNING=57
+SESSION_TTL=65
+SESSION_TIMEOUT_WARNING=60
+NODE_ENV = 'local

package/sandbox/apps/sandbox/index.js

@@ -30,6 +30,7 @@ module.exports = {
     },
     '/dob': {
       fields: ['dateOfBirth'],
+      locals: { showSaveAndExit: true },
       next: '/address'
     },
     '/address': {
@@ -92,6 +93,7 @@ module.exports = {
       next: '/confirm'
     },
     '/session-timeout': {},
-    '/exit': {}
+    '/exit': {},
+    '/save-and-exit': {}
   }
 };

package/sandbox/apps/sandbox/translations/en/default.json

@@ -1,7 +1,7 @@
 {
   "exit": {
-    "header": "You have left this application",
-    "title": "You have left this application"
+    "header": "You have left this form",
+    "title": "You have left this form"
   },
   "fields": {
     "landing-page-radio": {
@@ -170,10 +170,16 @@
       "message": "We have cleared your information to keep it secure. Your information has not been saved."
     },
     "session-timeout-warning": {
-      "dialog-title": "Your application will close soon",
-      "dialog-text": "If that happens, your progress will not be saved.",
-      "timeout-continue-button": "Stay on this page",
-      "dialog-exit-link": "Exit this form"
+      "dialog-title": "{{^showSaveAndExit}}Your application will close soon{{/showSaveAndExit}}{{#showSaveAndExit}}You will be signed out soon{{/showSaveAndExit}}",
+      "dialog-text": "{{^showSaveAndExit}}If that happens, your progress will not be saved.{{/showSaveAndExit}}{{#showSaveAndExit}}Any answers you have saved will not be affected, but your progress on this page will not be saved.{{/showSaveAndExit}}",
+      "timeout-continue-button": "{{^showSaveAndExit}}Stay on this page{{/showSaveAndExit}}{{#showSaveAndExit}}Stay signed in{{/showSaveAndExit}}",
+      "dialog-exit-link": "{{^showSaveAndExit}}Exit this form{{/showSaveAndExit}}{{#showSaveAndExit}}Sign out{{/showSaveAndExit}}"
+    },
+    "save-and-exit": {
+      "header": "You have been signed out",
+      "paragraph-1": "Your form doesn’t appear to have been worked on for 30 minutes so we closed it for security.",
+      "paragraph-2": "Any answers you saved have not been affected.",
+      "paragraph-3": "You can sign back in to your application at any time by returning to the"
     }
   },
   "validation": {

package/sandbox/apps/sandbox/translations/src/en/exit.json

@@ -1,4 +1,4 @@
 {
-  "header": "You have left this application",
-  "title": "You have left this application"
+  "header": "You have left this form",
+  "title": "You have left this form"
 }

package/sandbox/apps/sandbox/translations/src/en/pages.json

@@ -58,9 +58,15 @@
     "message": "We have cleared your information to keep it secure. Your information has not been saved."
   },
   "session-timeout-warning": {
-    "dialog-title": "Your application will close soon",
-    "dialog-text": "If that happens, your progress will not be saved.",
-    "timeout-continue-button": "Stay on this page",
-    "dialog-exit-link": "Exit this form"
+    "dialog-title": "{{^showSaveAndExit}}Your application will close soon{{/showSaveAndExit}}{{#showSaveAndExit}}You will be signed out soon{{/showSaveAndExit}}",
+    "dialog-text": "{{^showSaveAndExit}}If that happens, your progress will not be saved.{{/showSaveAndExit}}{{#showSaveAndExit}}Any answers you have saved will not be affected, but your progress on this page will not be saved.{{/showSaveAndExit}}",
+    "timeout-continue-button": "{{^showSaveAndExit}}Stay on this page{{/showSaveAndExit}}{{#showSaveAndExit}}Stay signed in{{/showSaveAndExit}}",
+    "dialog-exit-link": "{{^showSaveAndExit}}Exit this form{{/showSaveAndExit}}{{#showSaveAndExit}}Sign out{{/showSaveAndExit}}"
+  },
+  "save-and-exit": {
+    "header": "You have been signed out",
+    "paragraph-1": "Your form doesn’t appear to have been worked on for 30 minutes so we closed it for security.",
+    "paragraph-2": "Any answers you saved have not been affected.",
+    "paragraph-3": "You can sign back in to your application at any time by returning to the"
   }
 }

package/sandbox/public/css/app.css

@@ -9214,88 +9214,6 @@ dl {
   padding: 20px;
 }
 
-@media (min-width: 641px) {
-  .modal-dialog__inner {
-    padding: 30px;
-  }
-}
-.modal-dialog__inner__text {
-  font-family: "nta", Arial, sans-serif;
-  font-weight: 400;
-  text-transform: none;
-  font-size: 16px;
-  line-height: 1.25;
-  padding-top: 2px;
-  padding-bottom: 8px;
-  margin-bottom: 20px;
-}
-
-@media (min-width: 641px) {
-  .modal-dialog__inner__text {
-    font-size: 19px;
-    line-height: 1.31579;
-  }
-}
-@media (min-width: 641px) {
-  .modal-dialog__inner__text {
-    padding-top: 0;
-    padding-bottom: 5px;
-  }
-}
-.modal-dialog__inner__button {
-  font-size: 19px;
-  margin-top: 10px;
-}
-
-.modal-dialog__inner__link {
-  font-family: "nta", Arial, sans-serif;
-  font-weight: 400;
-  text-transform: none;
-  font-size: 16px;
-  line-height: 1.25;
-  padding-top: 2px;
-  padding-bottom: 8px;
-  background: none;
-  border: none;
-  vertical-align: middle;
-  margin-top: 20px;
-}
-.modal-dialog__inner__link:hover {
-  cursor: pointer;
-}
-
-@media (min-width: 641px) {
-  .modal-dialog__inner__link {
-    font-size: 19px;
-    line-height: 1.31579;
-  }
-}
-@media (min-width: 641px) {
-  .modal-dialog__inner__link {
-    padding-top: 0;
-    padding-bottom: 5px;
-  }
-}
-@media (max-width: 640px) {
-  .modal-dialog__inner__link {
-    text-align: center;
-    display: block;
-    margin-top: 25px;
-  }
-}
-@media (min-width: 641px) {
-  .modal-dialog__inner__link {
-    position: absolute;
-    top: 50%;
-    transform: translateY(-50%);
-    padding: 0;
-    margin: 0 0 0 30px;
-  }
-}
-.modal-dialog__inner__block {
-  position: relative;
-}
-
 .modal-dialog #dialog-title {
   margin-top: 0;
 }
@@ -9364,7 +9282,6 @@ dialog[open] + .backdrop, dialog[open]::backdrop {
   font-size: 1.125rem;
   line-height: 1.1111111111;
   display: inline-block;
-  margin: 5px;
 }
 @media print {
   .dialog-exit-link {
@@ -9394,7 +9311,6 @@ dialog[open] + .backdrop, dialog[open]::backdrop {
     font-size: 1rem;
     line-height: 1.25;
     position: relative;
-    top: 2px;
     padding: 0.526315em 0.789473em 0.263157em;
     line-height: 1.5;
   }

package/sandbox/server.js

@@ -17,7 +17,7 @@ bootstrap({
     }
   },
   getAccessibility: true,
-  sessionTimeoutWarningContent: false,
-  exitFormContent: false,
+  sessionTimeoutWarningContent: true,
+  exitFormContent: true,
   "port": 8082
 });