@defra/forms-engine-plugin 1.3.1 → 1.4.1

package/.server/server/services/cacheService.js.map

@@ -1 +1 @@
-{"version":3,"file":"cacheService.js","names":["Hoek","config","partition","ADDITIONAL_IDENTIFIER","CacheService","cache","generateKey","customFetcher","logger","constructor","server","cacheName","options","keyGenerator","sessionHydrator","log","defaultKeyGenerator","bind","undefined","segment","getState","request","cached","get","Key","rehydrated","set","setState","state","key","ttl","getConfirmationState","Confirmation","value","setConfirmationState","confirmationState","clearState","yar","id","drop","getFlash","messages","flash","Array","isArray","length","at","setFlash","message","Error","params","slug","additionalIdentifier","baseKey","merge","update","mergeArrays"],"sources":["../../../src/server/services/cacheService.ts"],"sourcesContent":["import { type Request, type Server } from '@hapi/hapi'\nimport * as Hoek from '@hapi/hoek'\n\nimport { config } from '~/src/config/index.js'\nimport { type createServer } from '~/src/server/index.js'\nimport {\n  type FormPayload,\n  type FormState,\n  type FormSubmissionError,\n  type FormSubmissionState\n} from '~/src/server/plugins/engine/types.js'\nimport {\n  type FormRequest,\n  type FormRequestPayload\n} from '~/src/server/routes/types.js'\n\nconst partition = 'cache'\n\nexport enum ADDITIONAL_IDENTIFIER {\n  Confirmation = ':confirmation'\n}\n\nexport class CacheService {\n  /**\n   * This service is responsible for getting, storing or deleting a user's session data in the cache. This service has been registered by {@link createServer}\n   */\n  cache\n  generateKey?: (request: Request | FormRequest | FormRequestPayload) => string\n  customFetcher?: (\n    request: Request | FormRequest | FormRequestPayload\n  ) => Promise<FormSubmissionState | null>\n\n  logger: Server['logger']\n\n  constructor({\n    server,\n    cacheName,\n    options\n  }: {\n    server: Server\n    cacheName?: string\n    options?: {\n      keyGenerator?: (\n        request: Request | FormRequest | FormRequestPayload\n      ) => string\n      sessionHydrator?: (\n        request: Request | FormRequest | FormRequestPayload\n      ) => Promise<FormSubmissionState | null>\n    }\n  }) {\n    const { keyGenerator, sessionHydrator } = options ?? {}\n    if (!cacheName) {\n      server.log(\n        'warn',\n        'You are using the default hapi cache. Please provide a cache name in plugin registration options.'\n      )\n    }\n    this.generateKey = keyGenerator ?? this.defaultKeyGenerator.bind(this)\n    this.customFetcher = sessionHydrator ?? undefined\n    this.cache = server.cache({ cache: cacheName, segment: 'formSubmission' })\n    this.logger = server.logger\n  }\n\n  async getState(\n    request: Request | FormRequest | FormRequestPayload\n  ): Promise<FormSubmissionState> {\n    let cached = await this.cache.get(this.Key(request))\n\n    // If nothing in Redis, attempt to rehydrate from backend DB\n    if (!cached && this.customFetcher) {\n      const rehydrated = await this.customFetcher(request)\n\n      if (rehydrated != null) {\n        await this.cache.set(\n          this.Key(request),\n          rehydrated,\n          config.get('sessionTimeout')\n        )\n        cached = await this.getState(request)\n      }\n    }\n\n    return cached ?? {}\n  }\n\n  async setState(\n    request: FormRequest | FormRequestPayload,\n    state: FormSubmissionState\n  ) {\n    const key = this.Key(request)\n    const ttl = config.get('sessionTimeout')\n\n    await this.cache.set(key, state, ttl)\n    return this.getState(request)\n  }\n\n  async getConfirmationState(\n    request: FormRequest | FormRequestPayload\n  ): Promise<{ confirmed?: true }> {\n    const key = this.Key(request, ADDITIONAL_IDENTIFIER.Confirmation)\n    const value = await this.cache.get(key)\n\n    return value ?? {}\n  }\n\n  async setConfirmationState(\n    request: FormRequest | FormRequestPayload,\n    confirmationState: { confirmed?: true }\n  ) {\n    const key = this.Key(request, ADDITIONAL_IDENTIFIER.Confirmation)\n    const ttl = config.get('confirmationSessionTimeout')\n\n    return this.cache.set(key, confirmationState, ttl)\n  }\n\n  async clearState(request: FormRequest | FormRequestPayload) {\n    if (request.yar.id) {\n      await this.cache.drop(this.Key(request))\n    }\n  }\n\n  getFlash(\n    request: FormRequest | FormRequestPayload\n  ): { errors: FormSubmissionError[] } | undefined {\n    const key = this.Key(request)\n    const messages = request.yar.flash(key.id)\n\n    if (Array.isArray(messages) && messages.length) {\n      return messages.at(0) as { errors: FormSubmissionError[] }\n    }\n  }\n\n  setFlash(\n    request: FormRequest | FormRequestPayload,\n    message: { errors: FormSubmissionError[] }\n  ) {\n    const key = this.Key(request)\n\n    request.yar.flash(key.id, message)\n  }\n\n  private defaultKeyGenerator(\n    request: Request | FormRequest | FormRequestPayload\n  ): string {\n    if (!request.yar.id) {\n      throw new Error('No session ID found')\n    }\n\n    const state = request.params.state ?? ''\n    const slug = request.params.slug ?? ''\n    return `${request.yar.id}:${state}:${slug}:`\n  }\n\n  /**\n   * The key used to store user session data against.\n   * If there are multiple forms on the same runner instance, for example `form-a` and `form-a-feedback` this will prevent CacheService from clearing data from `form-a` if a user gave feedback before they finished `form-a`\n   * @param request - hapi request object\n   * @param additionalIdentifier - appended to the id\n   */\n  Key(\n    request: Request | FormRequest | FormRequestPayload,\n    additionalIdentifier?: ADDITIONAL_IDENTIFIER\n  ) {\n    const baseKey = this.generateKey\n      ? this.generateKey(request)\n      : this.defaultKeyGenerator(request)\n\n    return {\n      segment: partition,\n      id: `${baseKey}${additionalIdentifier ?? ''}`\n    }\n  }\n}\n\n/**\n * State merge helper\n * 1. Merges objects (form fields)\n * 2. Overwrites arrays\n */\nexport function merge<StateType extends FormState | FormPayload>(\n  state: StateType,\n  update: object\n): StateType {\n  return Hoek.merge(state, update, {\n    mergeArrays: false\n  })\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"cacheService.js","names":["Hoek","config","partition","ADDITIONAL_IDENTIFIER","CacheService","cache","generateKey","customFetcher","customPersister","logger","constructor","server","cacheName","options","keyGenerator","sessionHydrator","sessionPersister","log","defaultKeyGenerator","bind","undefined","segment","getState","request","key","Key","cached","get","rehydrated","set","setState","state","ttl","getConfirmationState","Confirmation","value","setConfirmationState","confirmationState","clearState","yar","id","drop","getFlash","messages","flash","Array","isArray","length","at","setFlash","message","Error","params","slug","additionalIdentifier","baseKey","merge","update","mergeArrays"],"sources":["../../../src/server/services/cacheService.ts"],"sourcesContent":["import { type Request, type Server } from '@hapi/hapi'\nimport * as Hoek from '@hapi/hoek'\n\nimport { config } from '~/src/config/index.js'\nimport { type createServer } from '~/src/server/index.js'\nimport {\n  type FormPayload,\n  type FormState,\n  type FormSubmissionError,\n  type FormSubmissionState\n} from '~/src/server/plugins/engine/types.js'\nimport {\n  type FormRequest,\n  type FormRequestPayload\n} from '~/src/server/routes/types.js'\n\nconst partition = 'cache'\n\nexport enum ADDITIONAL_IDENTIFIER {\n  Confirmation = ':confirmation'\n}\n\nexport class CacheService {\n  /**\n   * This service is responsible for getting, storing or deleting a user's session data in the cache. This service has been registered by {@link createServer}\n   */\n  cache\n  generateKey?: (request: Request | FormRequest | FormRequestPayload) => string\n  customFetcher?: (\n    request: Request | FormRequest | FormRequestPayload\n  ) => Promise<FormSubmissionState | null>\n\n  customPersister?: (\n    key: string,\n    state: FormSubmissionState,\n    request: Request | FormRequest | FormRequestPayload\n  ) => Promise<void>\n\n  logger: Server['logger']\n\n  constructor({\n    server,\n    cacheName,\n    options\n  }: {\n    server: Server\n    cacheName?: string\n    options?: {\n      keyGenerator?: (\n        request: Request | FormRequest | FormRequestPayload\n      ) => string\n      sessionHydrator?: (\n        request: Request | FormRequest | FormRequestPayload\n      ) => Promise<FormSubmissionState | null>\n      sessionPersister?: (\n        key: string,\n        state: FormSubmissionState,\n        request: Request | FormRequest | FormRequestPayload\n      ) => Promise<void>\n    }\n  }) {\n    const { keyGenerator, sessionHydrator, sessionPersister } = options ?? {}\n    if (!cacheName) {\n      server.log(\n        'warn',\n        'You are using the default hapi cache. Please provide a cache name in plugin registration options.'\n      )\n    }\n    this.generateKey = keyGenerator ?? this.defaultKeyGenerator.bind(this)\n    this.customFetcher = sessionHydrator ?? undefined\n    this.customPersister = sessionPersister ?? undefined\n    this.cache = server.cache({ cache: cacheName, segment: 'formSubmission' })\n    this.logger = server.logger\n  }\n\n  async getState(\n    request: Request | FormRequest | FormRequestPayload\n  ): Promise<FormSubmissionState> {\n    const key = this.Key(request)\n\n    let cached = await this.cache.get(key)\n\n    // If nothing in Redis, attempt to rehydrate from backend DB\n    if (!cached && this.customFetcher) {\n      const rehydrated = await this.customFetcher(request)\n\n      if (rehydrated != null) {\n        await this.cache.set(key, rehydrated, config.get('sessionTimeout'))\n        cached = await this.getState(request)\n      }\n    }\n\n    return cached ?? {}\n  }\n\n  async setState(\n    request: FormRequest | FormRequestPayload,\n    state: FormSubmissionState\n  ) {\n    const key = this.Key(request)\n    const ttl = config.get('sessionTimeout')\n\n    await this.cache.set(key, state, ttl)\n\n    return this.getState(request)\n  }\n\n  async getConfirmationState(\n    request: FormRequest | FormRequestPayload\n  ): Promise<{ confirmed?: true }> {\n    const key = this.Key(request, ADDITIONAL_IDENTIFIER.Confirmation)\n    const value = await this.cache.get(key)\n\n    return value ?? {}\n  }\n\n  async setConfirmationState(\n    request: FormRequest | FormRequestPayload,\n    confirmationState: { confirmed?: true }\n  ) {\n    const key = this.Key(request, ADDITIONAL_IDENTIFIER.Confirmation)\n    const ttl = config.get('confirmationSessionTimeout')\n\n    return this.cache.set(key, confirmationState, ttl)\n  }\n\n  async clearState(request: FormRequest | FormRequestPayload) {\n    if (request.yar.id) {\n      await this.cache.drop(this.Key(request))\n    }\n  }\n\n  getFlash(\n    request: FormRequest | FormRequestPayload\n  ): { errors: FormSubmissionError[] } | undefined {\n    const key = this.Key(request)\n    const messages = request.yar.flash(key.id)\n\n    if (Array.isArray(messages) && messages.length) {\n      return messages.at(0) as { errors: FormSubmissionError[] }\n    }\n  }\n\n  setFlash(\n    request: FormRequest | FormRequestPayload,\n    message: { errors: FormSubmissionError[] }\n  ) {\n    const key = this.Key(request)\n\n    request.yar.flash(key.id, message)\n  }\n\n  private defaultKeyGenerator(\n    request: Request | FormRequest | FormRequestPayload\n  ): string {\n    if (!request.yar.id) {\n      throw new Error('No session ID found')\n    }\n\n    const state = (request.params.state as string) || ''\n    const slug = (request.params.slug as string) || ''\n    return `${request.yar.id}:${state}:${slug}:`\n  }\n\n  /**\n   * The key used to store user session data against.\n   * If there are multiple forms on the same runner instance, for example `form-a` and `form-a-feedback` this will prevent CacheService from clearing data from `form-a` if a user gave feedback before they finished `form-a`\n   * @param request - hapi request object\n   * @param additionalIdentifier - appended to the id\n   */\n  Key(\n    request: Request | FormRequest | FormRequestPayload,\n    additionalIdentifier?: ADDITIONAL_IDENTIFIER\n  ) {\n    const baseKey = this.generateKey\n      ? this.generateKey(request)\n      : this.defaultKeyGenerator(request)\n\n    return {\n      segment: partition,\n      id: `${baseKey}${additionalIdentifier ?? ''}`\n    }\n  }\n}\n\n/**\n * State merge helper\n * 1. Merges objects (form fields)\n * 2. Overwrites arrays\n */\nexport function merge<StateType extends FormState | FormPayload>(\n  state: StateType,\n  update: object\n): StateType {\n  return Hoek.merge(state, update, {\n    mergeArrays: false\n  })\n}\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defra/forms-engine-plugin",
-  "version": "1.3.1",
+  "version": "1.4.1",
   "description": "Defra forms engine",
   "type": "module",
   "files": [

package/src/server/index.test.ts

@@ -639,3 +639,42 @@ describe('prepareEnvironment', () => {
     )
   })
 })
+
+describe('Exit route handlers', () => {
+  let server: Server
+
+  beforeAll(async () => {
+    server = await createServer({
+      services: defaultServices
+    })
+    await server.initialize()
+  })
+
+  afterAll(async () => {
+    await server.stop()
+  })
+
+  beforeEach(() => {
+    jest.mocked(getFormMetadata).mockResolvedValue(fixtures.form.metadata)
+    server.app.models.clear()
+  })
+
+  test('GET /exit returns 200 with exit page content', async () => {
+    jest.mocked(getFormMetadata).mockResolvedValueOnce({
+      ...fixtures.form.metadata,
+      live: fixtures.form.state
+    })
+
+    jest.mocked(getFormDefinition).mockResolvedValue(fixtures.form.definition)
+
+    const options = {
+      method: 'GET',
+      url: `${FORM_PREFIX}/slug/exit`
+    }
+
+    const res = await server.inject(options)
+
+    expect(res.statusCode).toBe(StatusCodes.OK)
+    expect(res.result).toContain('Your progress has been saved')
+  })
+})

package/src/server/plugins/engine/components/helpers.test.ts

@@ -1,5 +1,6 @@
 import { type ComponentDef } from '@defra/forms-model'
 
+import { ComponentBase } from '~/src/server/plugins/engine/components/ComponentBase.js'
 import { createComponent } from '~/src/server/plugins/engine/components/helpers.js'
 import { FormModel } from '~/src/server/plugins/engine/models/FormModel.js'
 import definition from '~/test/form/definitions/basic.js'
@@ -22,3 +23,33 @@ describe('helpers tests', () => {
     ).toThrow('Component type invalid-type does not exist')
   })
 })
+
+describe('ComponentBase tests', () => {
+  test('should handle save and return functionality', () => {
+    const mockComponentDef = {
+      type: 'TextField',
+      name: 'testField',
+      title: 'Test Field'
+    } as ComponentDef
+
+    const component = new ComponentBase(mockComponentDef, { model: formModel })
+
+    expect(component.name).toBe('testField')
+    expect(component.title).toBe('Test Field')
+    expect(component.type).toBe('TextField')
+  })
+
+  test('should handle context correctly', () => {
+    const mockComponentDef = {
+      type: 'TextField',
+      name: 'contextField',
+      title: 'Context Field'
+    } as ComponentDef
+
+    const component = new ComponentBase(mockComponentDef, { model: formModel })
+
+    expect(component.model).toBe(formModel)
+    expect(component.name).toBe('contextField')
+    expect(component.title).toBe('Context Field')
+  })
+})

package/src/server/plugins/engine/index.ts

@@ -33,9 +33,7 @@ export const prepareNunjucksEnvironment = function (
     env.addFilter(name, nunjucksFilter)
   }
 
-  env.addFilter('markdown', (text: string) =>
-    markdownToHtml(text, pluginOptions.baseUrl)
-  )
+  env.addFilter('markdown', (text: string) => markdownToHtml(text))
 
   for (const [name, nunjucksGlobal] of Object.entries(globals)) {
     env.addGlobal(name, nunjucksGlobal)

package/src/server/plugins/engine/models/FormModel.test.ts

@@ -12,7 +12,7 @@ import definition from '~/test/form/definitions/conditions-escaping.js'
 import conditionsListDefinition from '~/test/form/definitions/conditions-list.js'
 import relativeDatesDefinition from '~/test/form/definitions/conditions-relative-dates-v2.js'
 import fieldsRequiredDefinition from '~/test/form/definitions/fields-required.js'
-import joinedConditionsDefinition from '~/test/form/definitions/joined-conditions-test.js'
+import joinedConditionsDefinition from '~/test/form/definitions/joined-conditions-simple-v2.js'
 
 jest.mock('~/src/server/plugins/engine/date-helper.ts')
 
@@ -357,15 +357,15 @@ describe('FormModel - Joined Conditions', () => {
     const joinedCondition =
       model.conditions['db43c6bc-9ce6-478b-8345-4fff5eff2ba3']
     expect(joinedCondition).toBeDefined()
-    expect(joinedCondition?.displayName).toBe('joined condition')
+    expect(joinedCondition?.displayName).toBe('is Bob AND over 18')
 
-    const stateAllTrue = { fsZNJr: 'Bob', DaBGpS: true }
+    const stateAllTrue = { userName: 'Bob', isOverEighteen: true }
     expect(joinedCondition?.fn(stateAllTrue)).toBe(true)
 
-    const statePartialTrue = { fsZNJr: 'Alice', DaBGpS: true }
+    const statePartialTrue = { userName: 'Alice', isOverEighteen: true }
     expect(joinedCondition?.fn(statePartialTrue)).toBe(false)
 
-    const stateFalse = { fsZNJr: 'Alice', DaBGpS: false }
+    const stateFalse = { userName: 'Alice', isOverEighteen: false }
     expect(joinedCondition?.fn(stateFalse)).toBe(false)
   })
 
@@ -379,18 +379,92 @@ describe('FormModel - Joined Conditions', () => {
     })
 
     const joinedConditionPage = model.pages.find(
-      (page) => page.path === '/joined-condition-page'
+      (page) => page.path === '/simple-and-page'
     )
 
     expect(joinedConditionPage?.condition).toBeDefined()
 
-    const trueState = { fsZNJr: 'Bob', DaBGpS: true }
+    const trueState = { userName: 'Bob', isOverEighteen: true }
     expect(joinedConditionPage?.condition?.fn(trueState)).toBe(true)
 
-    const falseState = { fsZNJr: 'Bob', DaBGpS: false }
+    const falseState = { userName: 'Bob', isOverEighteen: false }
     expect(joinedConditionPage?.condition?.fn(falseState)).toBe(false)
   })
 
+  it('should handle V1 joined conditions without aliases', () => {
+    formDefinitionV2Schema.validate = jest
+      .fn()
+      .mockReturnValue({ value: definition })
+
+    const model = new FormModel(definition, {
+      basePath: 'test'
+    })
+
+    expect(model.conditions).toBeDefined()
+    expect(Object.keys(model.conditions)).toHaveLength(1)
+
+    const joinedCondition = model.conditions.ZCXeMz
+    expect(joinedCondition).toBeDefined()
+    expect(joinedCondition?.displayName).toBe('test')
+
+    const testState = { NIJphU: "ap'ostrophe's", iraEpG: "shouldn't've" }
+    expect(joinedCondition?.fn(testState)).toBe(true)
+
+    const testStateFalse = { NIJphU: 'other', iraEpG: "shouldn't've" }
+    expect(joinedCondition?.fn(testStateFalse)).toBe(false)
+
+    const context = model.toConditionContext(testState, model.conditions)
+
+    expect(context).not.toHaveProperty('cond_ZCXeMz')
+
+    expect(context).toHaveProperty('ZCXeMz')
+
+    expect(context).toHaveProperty('NIJphU', "ap'ostrophe's")
+    expect(context).toHaveProperty('iraEpG', "shouldn't've")
+  })
+
+  it('should use schema version to determine condition aliases', () => {
+    const v1Definition = { ...definition, schema: SchemaVersion.V1 }
+    formDefinitionV2Schema.validate = jest
+      .fn()
+      .mockReturnValue({ value: v1Definition })
+
+    const v1Model = new FormModel(v1Definition, { basePath: 'test' })
+    expect(v1Model.schemaVersion).toBe(SchemaVersion.V1)
+
+    const v1TestState = { NIJphU: "ap'ostrophe's", iraEpG: "shouldn't've" }
+    const v1Context = v1Model.toConditionContext(
+      v1TestState,
+      v1Model.conditions
+    )
+
+    expect(v1Context).toHaveProperty('ZCXeMz')
+    expect(v1Context).not.toHaveProperty('cond_ZCXeMz')
+
+    formDefinitionV2Schema.validate = jest
+      .fn()
+      .mockReturnValue({ value: joinedConditionsDefinition })
+
+    const v2Model = new FormModel(joinedConditionsDefinition, {
+      basePath: 'test'
+    })
+    expect(v2Model.schemaVersion).toBe(SchemaVersion.V2)
+
+    const v2TestState = { userName: 'Bob', isOverEighteen: true }
+    const v2Context = v2Model.toConditionContext(
+      v2TestState,
+      v2Model.conditions
+    )
+
+    expect(v2Context).toHaveProperty('cond_d15aff7a622440a28e5f51a5af2f7910')
+    expect(v2Context).toHaveProperty('cond_d1f9fcc7f09847e79d314f5ee57ba985')
+    expect(v2Context).toHaveProperty('cond_db43c6bc9ce6478b83454fff5eff2ba3')
+
+    expect(v2Context).not.toHaveProperty('d15aff7a-6224-40a2-8e5f-51a5af2f7910')
+    expect(v2Context).not.toHaveProperty('d1f9fcc7-f098-47e7-9d31-4f5ee57ba985')
+    expect(v2Context).not.toHaveProperty('db43c6bc-9ce6-478b-8345-4fff5eff2ba3')
+  })
+
   describe('generateConditionAlias', () => {
     it('should generate valid JavaScript identifiers from condition IDs', () => {
       formDefinitionV2Schema.validate = jest
@@ -401,7 +475,7 @@ describe('FormModel - Joined Conditions', () => {
         basePath: 'test'
       })
 
-      const evaluationState = { fsZNJr: 'Bob', DaBGpS: true }
+      const evaluationState = { userName: 'Bob', isOverEighteen: true }
 
       const context = model.toConditionContext(
         evaluationState,
@@ -428,8 +502,8 @@ describe('FormModel - Joined Conditions', () => {
         model.conditions['db43c6bc-9ce6-478b-8345-4fff5eff2ba3']
       expect(joinedCondition).toBeDefined()
 
-      const stateTrue = { fsZNJr: 'Bob', DaBGpS: true }
-      const stateFalse = { fsZNJr: 'Alice', DaBGpS: false }
+      const stateTrue = { userName: 'Bob', isOverEighteen: true }
+      const stateFalse = { userName: 'Alice', isOverEighteen: false }
 
       expect(joinedCondition?.fn(stateTrue)).toBe(true)
       expect(joinedCondition?.fn(stateFalse)).toBe(false)

package/src/server/plugins/engine/models/FormModel.ts

@@ -278,9 +278,12 @@ export class FormModel {
     const context = { ...evaluationState }
 
     for (const conditionId in conditions) {
-      const alias = generateConditionAlias(conditionId)
+      const propertyName =
+        this.schemaVersion === SchemaVersion.V2
+          ? generateConditionAlias(conditionId)
+          : conditionId
 
-      Object.defineProperty(context, alias, {
+      Object.defineProperty(context, propertyName, {
         get() {
           return conditions[conditionId]?.fn(evaluationState)
         }

package/src/server/plugins/engine/models/SummaryViewModel.test.ts

@@ -3,6 +3,7 @@ import {
   FormModel,
   SummaryViewModel
 } from '~/src/server/plugins/engine/models/index.js'
+import { SummaryPageController } from '~/src/server/plugins/engine/pageControllers/SummaryPageController.js'
 import {
   createPage,
   type PageControllerClass
@@ -249,3 +250,61 @@ describe('SummaryViewModel', () => {
     })
   })
 })
+
+describe('SummaryPageController', () => {
+  let model: FormModel
+  let controller: SummaryPageController
+  let request: FormContextRequest
+
+  beforeEach(() => {
+    model = new FormModel(definition, {
+      basePath: `${FORM_PREFIX}/test`
+    })
+
+    controller = new SummaryPageController(model, definition.pages[2])
+
+    request = {
+      method: 'get',
+      url: new URL('http://example.com/repeat/pizza-order/summary'),
+      path: '/repeat/pizza-order/summary',
+      params: {
+        path: 'pizza-order',
+        slug: 'repeat'
+      },
+      query: {},
+      app: { model }
+    }
+  })
+
+  describe('Save and Return functionality', () => {
+    it('should show save and return button on summary page', () => {
+      expect(controller.shouldShowSaveAndReturn()).toBe(true)
+    })
+
+    it('should handle save and return from summary page', () => {
+      const state: FormState = {
+        $$__referenceNumber: 'foobar',
+        orderType: 'collection',
+        pizza: []
+      }
+
+      const context = model.getFormContext(request, state)
+      const viewModel = controller.getViewModel(request, context)
+
+      expect(viewModel).toHaveProperty('allowSaveAndReturn', true)
+    })
+
+    it('should display correct page title', () => {
+      const state: FormState = {
+        $$__referenceNumber: 'foobar',
+        orderType: 'collection',
+        pizza: []
+      }
+
+      const context = model.getFormContext(request, state)
+      const viewModel = controller.getViewModel(request, context)
+
+      expect(viewModel.pageTitle).toBe('Check your answers')
+    })
+  })
+})

package/src/server/plugins/engine/models/SummaryViewModel.ts

@@ -51,6 +51,7 @@ export class SummaryViewModel {
   serviceUrl: string
   hasMissingNotificationEmail?: boolean
   components?: ComponentViewModel[]
+  allowSaveAndReturn?: boolean
 
   constructor(
     request: FormContextRequest,

package/src/server/plugins/engine/options.js

@@ -19,7 +19,10 @@ const pluginRegistrationOptionsSchema = Joi.object({
   viewContext: Joi.function().required(),
   preparePageEventRequestOptions: Joi.function().optional(),
   onRequest: Joi.function().optional(),
-  baseUrl: Joi.string().uri().required()
+  baseUrl: Joi.string().uri().required(),
+  keyGenerator: Joi.function().optional(),
+  sessionHydrator: Joi.function().optional(),
+  sessionPersister: Joi.function().optional()
 })
 
 /**

package/src/server/plugins/engine/options.test.js

@@ -16,6 +16,26 @@ describe('validatePluginOptions', () => {
     expect(validatePluginOptions(validOptions)).toEqual(validOptions)
   })
 
+  it('accepts optional properties keyGenerator, sessionHydrator, and sessionPersister', () => {
+    const validOptionsWithOptionals = {
+      nunjucks: {
+        baseLayoutPath: 'dxt-devtool-baselayout.html',
+        paths: ['src/server/devserver']
+      },
+      viewContext: () => {
+        return { hello: 'world' }
+      },
+      baseUrl: 'http://localhost:3009',
+      keyGenerator: () => 'test-key',
+      sessionHydrator: () => Promise.resolve({ someState: 'value' }),
+      sessionPersister: () => Promise.resolve(undefined)
+    }
+
+    expect(validatePluginOptions(validOptionsWithOptionals)).toEqual(
+      validOptionsWithOptionals
+    )
+  })
+
   /**
    * tsc would usually check compliance with the type, but given a user might be using plain JS we still want a test
    */

package/src/server/plugins/engine/pageControllers/PageController.test.ts

@@ -204,5 +204,30 @@ describe('PageController', () => {
         'Unsupported POST route handler for this page'
       )
     })
+
+    it('supports save and return functionality', async () => {
+      const mockRequest = {
+        ...request,
+        payload: { saveAndReturn: true }
+      } as FormRequest
+
+      const mockResponse = {
+        redirect: jest.fn(),
+        view: jest.fn()
+      } as unknown as ResponseToolkit
+
+      await controller1.makeGetRouteHandler()(
+        mockRequest,
+        model.getFormContext(mockRequest, { $$__referenceNumber: 'test-ref' }),
+        mockResponse
+      )
+
+      expect(mockResponse.view).toHaveBeenCalledWith(
+        controller1.viewName,
+        expect.objectContaining({
+          pageTitle: 'Buy a rod fishing licence'
+        })
+      )
+    })
   })
 })

package/src/server/plugins/engine/pageControllers/QuestionPageController.test.ts

@@ -10,7 +10,10 @@ import {
   type FormState,
   type FormSubmissionState
 } from '~/src/server/plugins/engine/types.js'
-import { type FormRequest } from '~/src/server/routes/types.js'
+import {
+  type FormRequest,
+  type FormRequestPayload
+} from '~/src/server/routes/types.js'
 import { CacheService } from '~/src/server/services/cacheService.js'
 import conditionalReveal from '~/test/form/definitions/conditional-reveal.js'
 import definitionConditionsBasic, {
@@ -1274,3 +1277,177 @@ describe('QuestionPageController V2', () => {
     })
   })
 })
+
+describe('Save and Return functionality', () => {
+  let model: FormModel
+  let controller1: QuestionPageController
+  let requestPage1: FormRequest
+
+  beforeEach(() => {
+    const { pages } = definitionConditionsBasic
+
+    model = new FormModel(definitionConditionsBasic, {
+      basePath: 'test'
+    })
+
+    controller1 = new QuestionPageController(model, pages[0])
+
+    requestPage1 = {
+      method: 'get',
+      url: new URL('http://example.com/test/first-page'),
+      path: '/test/first-page',
+      params: {
+        path: 'first-page',
+        slug: 'test'
+      },
+      query: {},
+      app: { model }
+    } as FormRequest
+  })
+
+  const response = {
+    code: jest.fn().mockImplementation(() => response)
+  }
+
+  const h: Pick<ResponseToolkit, 'redirect' | 'view'> = {
+    redirect: jest.fn().mockReturnValue(response),
+    view: jest.fn()
+  }
+
+  beforeEach(() => {
+    jest.clearAllMocks()
+    jest.spyOn(CacheService.prototype, 'setState')
+  })
+
+  describe('shouldShowSaveAndReturn', () => {
+    it('should return true by default', () => {
+      expect(controller1.shouldShowSaveAndReturn()).toBe(true)
+    })
+  })
+
+  describe('handleSaveAndReturn', () => {
+    it('should save state and redirect to exit page', async () => {
+      const state: FormSubmissionState = {
+        $$__referenceNumber: 'foobar',
+        yesNoField: true
+      }
+      const request = {
+        ...requestPage1,
+        method: 'post',
+        payload: { yesNoField: true, action: 'save-and-return' }
+      } as unknown as FormRequestPayload
+
+      const context = model.getFormContext(request, state)
+
+      jest.spyOn(controller1, 'setState').mockResolvedValue(state)
+
+      await controller1.handleSaveAndReturn(request, context, h)
+
+      expect(controller1.setState).toHaveBeenCalledWith(request, state)
+      expect(h.redirect).toHaveBeenCalledWith('/test/exit')
+    })
+
+    it('should handle save-and-return with incomplete data', async () => {
+      const state: FormSubmissionState = {
+        $$__referenceNumber: 'foobar',
+        yesNoField: null
+      }
+      const request = {
+        ...requestPage1,
+        method: 'post',
+        payload: { yesNoField: '', action: 'save-and-return' }
+      } as unknown as FormRequestPayload
+
+      const context = model.getFormContext(request, state)
+
+      jest.spyOn(controller1, 'setState').mockResolvedValue(state)
+
+      await controller1.handleSaveAndReturn(request, context, h)
+
+      expect(controller1.setState).toHaveBeenCalledWith(request, state)
+      expect(h.redirect).toHaveBeenCalledWith('/test/exit')
+    })
+
+    it('should handle save-and-return with validation errors', async () => {
+      const state: FormSubmissionState = { $$__referenceNumber: 'foobar' }
+      const request = {
+        ...requestPage1,
+        method: 'post',
+        payload: { action: 'save-and-return' }
+      } as unknown as FormRequestPayload
+
+      const context = model.getFormContext(request, state)
+
+      jest.spyOn(controller1, 'setState').mockResolvedValue(state)
+
+      await controller1.handleSaveAndReturn(request, context, h)
+
+      expect(controller1.setState).toHaveBeenCalledWith(request, state)
+      expect(h.redirect).toHaveBeenCalledWith('/test/exit')
+    })
+  })
+
+  describe('POST handler with save-and-return action', () => {
+    it('should handle FormAction.SaveAndReturn', async () => {
+      const state: FormSubmissionState = {
+        $$__referenceNumber: 'foobar',
+        yesNoField: true
+      }
+      const request = {
+        ...requestPage1,
+        method: 'post',
+        payload: { yesNoField: true, action: 'save-and-return' }
+      } as unknown as FormRequestPayload
+
+      const context = model.getFormContext(request, state)
+
+      jest.spyOn(controller1, 'getState').mockResolvedValue({})
+      jest
+        .spyOn(controller1, 'handleSaveAndReturn')
+        .mockResolvedValue(h.redirect('/test/exit'))
+
+      const postHandler = controller1.makePostRouteHandler()
+      await postHandler(request, context, h)
+
+      expect(controller1.handleSaveAndReturn).toHaveBeenCalledWith(
+        request,
+        context,
+        h
+      )
+    })
+
+    it('should not call handleSaveAndReturn for continue action', async () => {
+      const state: FormSubmissionState = {
+        $$__referenceNumber: 'foobar',
+        yesNoField: true
+      }
+      const request = {
+        ...requestPage1,
+        method: 'post',
+        payload: { yesNoField: true, action: 'continue' }
+      } as unknown as FormRequestPayload
+
+      const context = model.getFormContext(request, state)
+
+      jest.spyOn(controller1, 'getState').mockResolvedValue({})
+      jest
+        .spyOn(controller1, 'handleSaveAndReturn')
+        .mockResolvedValue(h.redirect('/test/exit'))
+      jest.spyOn(controller1, 'setState').mockResolvedValue(state)
+
+      const mockResponse = {
+        code: jest.fn().mockReturnValue({ redirect: jest.fn() })
+      }
+
+      const mockH = {
+        redirect: jest.fn().mockReturnValue(mockResponse),
+        view: jest.fn()
+      }
+
+      const postHandler = controller1.makePostRouteHandler()
+      await postHandler(request, context, mockH)
+
+      expect(controller1.handleSaveAndReturn).not.toHaveBeenCalled()
+    })
+  })
+})