Merge pull request #486 from ukhsa-collaboration/pr-1359

Updated PR #1359 with recommended changes to schema, type and service…

Author: SullyK

model/src/data-model/types.ts

@@ -194,5 +194,5 @@ export type FormDefinition = {
   paymentReferenceFormat?: string;
   feeOptions: FeeOptions;
   exitOptions: ExitOptions;
-  confirmationTimeout: number | undefined;
+  confirmationSessionTimeout: number | undefined;
 };

model/src/schema/schema.ts

@@ -328,7 +328,7 @@ export const Schema = joi
     feeOptions: feeOptionSchema,
     exitOptions: exitSchema.optional(),
     showFilenamesOnSummaryPage: joi.boolean().optional(),
-    confirmationTimeout: joi.number().optional()
+    confirmationSessionTimeout: joi.number().optional()
   });
 
 /**

runner/src/server/plugins/applicationStatus/index.ts

@@ -72,11 +72,9 @@ const index = {
               newReference
             );
 
-            const formTimeout =  request.server?.app?.forms?.[request.params?.id]?.def?.confirmationTimeout
-            ?? config.confirmationSessionTimeout;
-            
-            await cacheService.setConfirmationState(request, { confirmation: viewModel }, formTimeout);
-
+            const confirmationTimeout = form.def.confirmationTimeout ?? config.confirmationSessionTimeout;    
+            await cacheService.setConfirmationState(request, { confirmation: viewModel }, confirmationTimeout);
+            await cacheService.clearState(request);
 
             return h.view("confirmation", viewModel);
           },

runner/src/server/services/cacheService.ts

@@ -73,9 +73,9 @@ export class CacheService {
     return await this.cache.get(key);
   }
 
-async setConfirmationState(request: HapiRequest, viewModel, ttl?: number) {
+  async setConfirmationState(request: HapiRequest, viewModel, ttl?: number) {
     const key = this.Key(request, ADDITIONAL_IDENTIFIER.Confirmation);
-    const timeout = ttl ?? confirmationSessionTimeout; 
+    const timeout = ttl ?? confirmationSessionTimeout;
     return this.cache.set(key, viewModel, timeout);
   }
 
@@ -189,7 +189,7 @@ export const catboxProvider = () => {
           {
             dnsLookup: (address, callback) => callback(null, address, 4),
             redisOptions,
-          }
+          },
         );
     provider.options = { client, partition };
   } else {