@defra/forms-engine-plugin 2.1.9 → 3.0.0

package/src/server/plugins/engine/pageControllers/SummaryPageController.ts

@@ -5,7 +5,7 @@ import {
   type SubmitPayload
 } from '@defra/forms-model'
 import Boom from '@hapi/boom'
-import { type ResponseToolkit, type RouteOptions } from '@hapi/hapi'
+import { type RouteOptions } from '@hapi/hapi'
 
 import { ComponentCollection } from '~/src/server/plugins/engine/components/ComponentCollection.js'
 import { FileUploadField } from '~/src/server/plugins/engine/components/FileUploadField.js'
@@ -30,13 +30,16 @@ import {
   type FormSubmissionState
 } from '~/src/server/plugins/engine/types.js'
 import {
+  FormAction,
   type FormRequest,
   type FormRequestPayload,
-  type FormRequestPayloadRefs
+  type FormRequestPayloadRefs,
+  type FormResponseToolkit
 } from '~/src/server/routes/types.js'
 
 export class SummaryPageController extends QuestionPageController {
   declare pageDef: Page
+  allowSaveAndExit = true
 
   /**
    * The controller which is used when Page["controller"] is defined as "./pages/summary.js"
@@ -69,7 +72,7 @@ export class SummaryPageController extends QuestionPageController {
     viewModel.feedbackLink = this.feedbackLink
     viewModel.phaseTag = this.phaseTag
     viewModel.components = components
-    viewModel.allowSaveAndReturn = this.shouldShowSaveAndReturn(request.server)
+    viewModel.allowSaveAndExit = this.shouldShowSaveAndExit(request.server)
 
     return viewModel
   }
@@ -81,7 +84,7 @@ export class SummaryPageController extends QuestionPageController {
     return async (
       request: FormRequest,
       context: FormContext,
-      h: Pick<ResponseToolkit, 'redirect' | 'view'>
+      h: FormResponseToolkit
     ) => {
       const { viewName } = this
 
@@ -102,10 +105,17 @@ export class SummaryPageController extends QuestionPageController {
     return async (
       request: FormRequestPayload,
       context: FormContext,
-      h: Pick<ResponseToolkit, 'redirect' | 'view'>
+      h: FormResponseToolkit
     ) => {
       const { model } = this
       const { params } = request
+
+      // Check if this is a save-and-exit action
+      const { action } = request.payload
+      if (action === FormAction.SaveAndExit) {
+        return this.handleSaveAndExit(request, context, h)
+      }
+
       const cacheService = getCacheService(request.server)
 
       const { formsService } = this.model.services

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

@@ -1,6 +1,6 @@
 import { FormModel } from '~/src/server/plugins/engine/models/FormModel.js'
 import { TerminalPageController } from '~/src/server/plugins/engine/pageControllers/TerminalPageController.js'
-import { serverWithSaveAndReturn } from '~/src/server/plugins/engine/pageControllers/__stubs__/server.js'
+import { serverWithSaveAndExit } from '~/src/server/plugins/engine/pageControllers/__stubs__/server.js'
 import definition from '~/test/form/definitions/basic.js'
 
 describe('TerminalController', () => {
@@ -27,9 +27,9 @@ describe('TerminalController', () => {
     })
   })
 
-  describe('shouldShowSaveAndReturn', () => {
-    it('should return false (TerminalPageController does not allow save and return)', () => {
-      expect(controller1.shouldShowSaveAndReturn(serverWithSaveAndReturn)).toBe(
+  describe('shouldShowSaveAndExit', () => {
+    it('should return false (TerminalPageController does not allow save and exit)', () => {
+      expect(controller1.shouldShowSaveAndExit(serverWithSaveAndExit)).toBe(
         false
       )
     })

package/src/server/plugins/engine/pageControllers/TerminalPageController.ts

@@ -1,19 +1,22 @@
 import { type PageTerminal } from '@defra/forms-model'
 import Boom from '@hapi/boom'
-import { type ResponseObject, type ResponseToolkit } from '@hapi/hapi'
+import { type ResponseObject } from '@hapi/hapi'
 
 import { QuestionPageController } from '~/src/server/plugins/engine/pageControllers/QuestionPageController.js'
 import { type FormContext } from '~/src/server/plugins/engine/types.js'
-import { type FormRequestPayload } from '~/src/server/routes/types.js'
+import {
+  type FormRequestPayload,
+  type FormResponseToolkit
+} from '~/src/server/routes/types.js'
 
 export class TerminalPageController extends QuestionPageController {
   declare pageDef: PageTerminal
-  allowSaveAndReturn = false
+  allowSaveAndExit = false
 
   makePostRouteHandler(): (
     request: FormRequestPayload,
     context: FormContext,
-    h: Pick<ResponseToolkit, 'redirect' | 'view'>
+    h: FormResponseToolkit
   ) => Promise<ResponseObject> {
     throw Boom.methodNotAllowed('POST method not allowed for terminal pages')
   }

package/src/server/plugins/engine/pageControllers/__stubs__/server.ts

@@ -12,16 +12,15 @@ export const server: Server = {
   }
 } as Server // only mocking out properties we care about;
 
-export const serverWithSaveAndReturn: Server = {
+export const serverWithSaveAndExit: Server = {
   plugins: {
     ...server.plugins,
     'forms-engine-plugin': {
       ...server.plugins['forms-engine-plugin'],
-      saveAndReturn: {
-        keyGenerator: jest.fn().mockReturnValue('foobar'),
-        sessionHydrator: jest.fn().mockReturnValue({}),
-        sessionPersister: jest.fn().mockImplementation(() => Promise.resolve())
-      } as Pick<PluginOptions, 'saveAndReturn'>
+      saveAndExit: jest.fn().mockReturnValue({}) as Pick<
+        PluginOptions,
+        'saveAndExit'
+      >
     }
   }
 } as Server // only mocking out properties we care about

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

@@ -8,7 +8,6 @@ import {
 
 import { type FormModel } from '~/src/server/plugins/engine/models/index.js'
 import { validatePluginOptions } from '~/src/server/plugins/engine/options.js'
-import { getRoutes as getSaveAndReturnExitRoutes } from '~/src/server/plugins/engine/routes/exit.js'
 import { getRoutes as getFileUploadStatusRoutes } from '~/src/server/plugins/engine/routes/file-upload.js'
 import { makeLoadFormPreHandler } from '~/src/server/plugins/engine/routes/index.js'
 import { getRoutes as getQuestionRoutes } from '~/src/server/plugins/engine/routes/questions.js'
@@ -31,28 +30,24 @@ export const plugin = {
 
     const {
       model,
-      cacheName,
-      saveAndReturn,
+      cache,
+      saveAndExit,
       nunjucks: nunjucksOptions,
       viewContext,
       preparePageEventRequestOptions
     } = options
 
-    const cacheService = new CacheService({
-      server,
-      cacheName,
-      options: {
-        keyGenerator: saveAndReturn?.keyGenerator,
-        sessionHydrator: saveAndReturn?.sessionHydrator
-      }
-    })
+    const cacheService =
+      typeof cache === 'string'
+        ? new CacheService({ server, cacheName: cache })
+        : cache
 
     await registerVision(server, options)
 
     server.expose('baseLayoutPath', nunjucksOptions.baseLayoutPath)
     server.expose('viewContext', viewContext)
     server.expose('cacheService', cacheService)
-    server.expose('saveAndReturn', saveAndReturn)
+    server.expose('saveAndExit', saveAndExit)
 
     server.app.model = model
 
@@ -92,7 +87,6 @@ export const plugin = {
       ),
       ...getRepeaterSummaryRoutes(getRouteOptions, postRouteOptions),
       ...getRepeaterItemDeleteRoutes(getRouteOptions, postRouteOptions),
-      ...getSaveAndReturnExitRoutes(getRouteOptions),
       ...getFileUploadStatusRoutes()
     ]
 

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

@@ -21,17 +21,18 @@ import { type PageControllerClass } from '~/src/server/plugins/engine/pageContro
 import { generateUniqueReference } from '~/src/server/plugins/engine/referenceNumbers.js'
 import * as defaultServices from '~/src/server/plugins/engine/services/index.js'
 import {
+  type AnyFormRequest,
   type FormContext,
   type PluginOptions
 } from '~/src/server/plugins/engine/types.js'
 import {
   type FormRequest,
-  type FormRequestPayload
+  type FormResponseToolkit
 } from '~/src/server/routes/types.js'
 
 export async function redirectOrMakeHandler(
-  request: FormRequest | FormRequestPayload,
-  h: Pick<ResponseToolkit, 'redirect' | 'view'>,
+  request: AnyFormRequest,
+  h: FormResponseToolkit,
   makeHandler: (
     page: PageControllerClass,
     context: FormContext
@@ -92,10 +93,7 @@ export function makeLoadFormPreHandler(server: Server, options: PluginOptions) {
 
   const { formsService } = services
 
-  async function handler(
-    request: FormRequest | FormRequestPayload,
-    h: ResponseToolkit
-  ) {
+  async function handler(request: AnyFormRequest, h: ResponseToolkit) {
     if (server.app.model) {
       request.app.model = server.app.model
 
@@ -181,10 +179,7 @@ export function makeLoadFormPreHandler(server: Server, options: PluginOptions) {
   return handler
 }
 
-export function dispatchHandler(
-  request: FormRequest,
-  h: Pick<ResponseToolkit, 'redirect' | 'view'>
-) {
+export function dispatchHandler(request: FormRequest, h: FormResponseToolkit) {
   const { model } = request.app
 
   const servicePath = model ? `/${model.basePath}` : ''

package/src/server/plugins/engine/routes/questions.test.ts

@@ -1,5 +1,5 @@
 import Boom from '@hapi/boom'
-import { type ResponseObject, type ResponseToolkit } from '@hapi/hapi'
+import { type ResponseObject } from '@hapi/hapi'
 // eslint-disable-next-line n/no-unpublished-import
 import nock from 'nock'
 
@@ -10,10 +10,14 @@ import {
   makeGetHandler,
   makePostHandler
 } from '~/src/server/plugins/engine/routes/questions.js'
-import { type FormContext } from '~/src/server/plugins/engine/types.js'
+import {
+  type AnyFormRequest,
+  type FormContext
+} from '~/src/server/plugins/engine/types.js'
 import {
   type FormRequest,
-  type FormRequestPayload
+  type FormRequestPayload,
+  type FormResponseToolkit
 } from '~/src/server/routes/types.js'
 jest.mock('~/src/server/plugins/engine/models/SummaryViewModel', () => ({
   SummaryViewModel: class {
@@ -35,7 +39,7 @@ jest.mock('~/src/server/plugins/engine/outputFormatters/machine/v1', () => ({
 jest.mock('~/src/server/plugins/engine/routes/index')
 
 describe('makeGetHandler', () => {
-  const hMock: Pick<ResponseToolkit, 'redirect' | 'view'> = {
+  const hMock: FormResponseToolkit = {
     redirect: jest.fn(),
     view: jest.fn()
   }
@@ -64,7 +68,7 @@ describe('makeGetHandler', () => {
       (
         _request: FormRequest,
         context: FormContext,
-        _h: Pick<ResponseToolkit, 'redirect' | 'view'>
+        _h: FormResponseToolkit
       ) => {
         data = context.data
         return Promise.resolve({} as unknown as ResponseObject)
@@ -80,12 +84,8 @@ describe('makeGetHandler', () => {
 
     jest
       .mocked(redirectOrMakeHandler)
-      .mockImplementation(
-        (
-          _req: FormRequest | FormRequestPayload,
-          _h: Pick<ResponseToolkit, 'redirect' | 'view'>,
-          fn
-        ) => Promise.resolve(fn(pageMock, contextMock))
+      .mockImplementation((_req: AnyFormRequest, _h: FormResponseToolkit, fn) =>
+        Promise.resolve(fn(pageMock, contextMock))
       )
 
     await makeGetHandler()(requestMock, hMock)
@@ -108,7 +108,7 @@ describe('makeGetHandler', () => {
       (
         _request: FormRequest,
         context: FormContext,
-        _h: Pick<ResponseToolkit, 'redirect' | 'view'>
+        _h: FormResponseToolkit
       ) => {
         data = context.data
         return Promise.resolve({} as unknown as ResponseObject)
@@ -126,12 +126,8 @@ describe('makeGetHandler', () => {
 
     jest
       .mocked(redirectOrMakeHandler)
-      .mockImplementation(
-        (
-          _req: FormRequest | FormRequestPayload,
-          _h: Pick<ResponseToolkit, 'redirect' | 'view'>,
-          fn
-        ) => Promise.resolve(fn(pageMock, contextMock))
+      .mockImplementation((_req: AnyFormRequest, _h: FormResponseToolkit, fn) =>
+        Promise.resolve(fn(pageMock, contextMock))
       )
 
     await makeGetHandler()(requestMock, hMock)
@@ -152,7 +148,7 @@ describe('makeGetHandler', () => {
       (
         _request: FormRequest,
         _context: FormContext,
-        _h: Pick<ResponseToolkit, 'redirect' | 'view'>
+        _h: FormResponseToolkit
       ) => {
         return Promise.resolve({} as unknown as ResponseObject)
       }
@@ -168,11 +164,7 @@ describe('makeGetHandler', () => {
     jest
       .mocked(redirectOrMakeHandler)
       .mockImplementation(
-        async (
-          _req: FormRequest | FormRequestPayload,
-          _h: Pick<ResponseToolkit, 'redirect' | 'view'>,
-          fn
-        ) => {
+        async (_req: AnyFormRequest, _h: FormResponseToolkit, fn) => {
           try {
             await fn(pageMock, contextMock)
           } catch (err) {
@@ -190,7 +182,7 @@ describe('makeGetHandler', () => {
 })
 
 describe('makePostHandler', () => {
-  const hMock: Pick<ResponseToolkit, 'redirect' | 'view'> = {
+  const hMock: FormResponseToolkit = {
     redirect: jest.fn(),
     view: jest.fn()
   }
@@ -221,7 +213,7 @@ describe('makePostHandler', () => {
       (
         _request: FormRequest,
         _context: FormContext,
-        _h: Pick<ResponseToolkit, 'redirect' | 'view'>
+        _h: FormResponseToolkit
       ) => {
         // do return a valid ResponseObject wrapped in Promise.resolve
         return mockPostResponse
@@ -238,12 +230,8 @@ describe('makePostHandler', () => {
 
     jest
       .mocked(redirectOrMakeHandler)
-      .mockImplementation(
-        (
-          _req: FormRequest | FormRequestPayload,
-          _h: Pick<ResponseToolkit, 'redirect' | 'view'>,
-          fn
-        ) => Promise.resolve(fn(pageMock, contextMock))
+      .mockImplementation((_req: AnyFormRequest, _h: FormResponseToolkit, fn) =>
+        Promise.resolve(fn(pageMock, contextMock))
       )
 
     const response = await makePostHandler()(requestMock, hMock)
@@ -263,7 +251,7 @@ describe('makePostHandler', () => {
       (
         _request: FormRequest,
         _context: FormContext,
-        _h: Pick<ResponseToolkit, 'redirect' | 'view'>
+        _h: FormResponseToolkit
       ) => {
         return Promise.resolve({} as unknown as ResponseObject)
       }
@@ -281,12 +269,8 @@ describe('makePostHandler', () => {
 
     jest
       .mocked(redirectOrMakeHandler)
-      .mockImplementation(
-        (
-          _req: FormRequest | FormRequestPayload,
-          _h: Pick<ResponseToolkit, 'redirect' | 'view'>,
-          fn
-        ) => Promise.resolve(fn(pageMock, contextMock))
+      .mockImplementation((_req: AnyFormRequest, _h: FormResponseToolkit, fn) =>
+        Promise.resolve(fn(pageMock, contextMock))
       )
 
     await makePostHandler()(requestMock, hMock)
@@ -309,7 +293,7 @@ describe('makePostHandler', () => {
       (
         _request: FormRequest,
         _context: FormContext,
-        _h: Pick<ResponseToolkit, 'redirect' | 'view'>
+        _h: FormResponseToolkit
       ) => {
         // do return a valid ResponseObject wrapped in Promise.resolve
         return mockPostResponse
@@ -326,12 +310,8 @@ describe('makePostHandler', () => {
 
     jest
       .mocked(redirectOrMakeHandler)
-      .mockImplementation(
-        (
-          _req: FormRequest | FormRequestPayload,
-          _h: Pick<ResponseToolkit, 'redirect' | 'view'>,
-          fn
-        ) => Promise.resolve(fn(pageMock, contextMock))
+      .mockImplementation((_req: AnyFormRequest, _h: FormResponseToolkit, fn) =>
+        Promise.resolve(fn(pageMock, contextMock))
       )
 
     await makePostHandler()(requestMock, hMock)
@@ -352,7 +332,7 @@ describe('makePostHandler', () => {
       (
         _request: FormRequest,
         _context: FormContext,
-        _h: Pick<ResponseToolkit, 'redirect' | 'view'>
+        _h: FormResponseToolkit
       ) => {
         return Promise.resolve({} as unknown as ResponseObject)
       }
@@ -369,11 +349,7 @@ describe('makePostHandler', () => {
     jest
       .mocked(redirectOrMakeHandler)
       .mockImplementation(
-        async (
-          _req: FormRequest | FormRequestPayload,
-          _h: Pick<ResponseToolkit, 'redirect' | 'view'>,
-          fn
-        ) => {
+        async (_req: AnyFormRequest, _h: FormResponseToolkit, fn) => {
           try {
             await fn(pageMock, contextMock)
           } catch (err) {
@@ -395,7 +371,7 @@ function createMockPageController(
   routeHandler: (
     request: FormRequest,
     context: FormContext,
-    h: Pick<ResponseToolkit, 'redirect' | 'view'>
+    h: FormResponseToolkit
   ) => ResponseObject | Promise<ResponseObject>
 ): PageControllerClass {
   return {

package/src/server/plugins/engine/routes/questions.ts

@@ -2,7 +2,6 @@ import { hasFormComponents, slugSchema, type Event } from '@defra/forms-model'
 import Boom from '@hapi/boom'
 import {
   type ResponseObject,
-  type ResponseToolkit,
   type RouteOptions,
   type ServerRoute
 } from '@hapi/hapi'
@@ -25,6 +24,7 @@ import {
   redirectOrMakeHandler
 } from '~/src/server/plugins/engine/routes/index.js'
 import {
+  type AnyFormRequest,
   type FormContext,
   type PreparePageEventRequestOptions
 } from '~/src/server/plugins/engine/types.js'
@@ -32,7 +32,8 @@ import {
   type FormRequest,
   type FormRequestPayload,
   type FormRequestPayloadRefs,
-  type FormRequestRefs
+  type FormRequestRefs,
+  type FormResponseToolkit
 } from '~/src/server/routes/types.js'
 import {
   actionSchema,
@@ -44,7 +45,7 @@ import {
 import * as httpService from '~/src/server/services/httpService.js'
 
 async function handleHttpEvent(
-  request: FormRequest | FormRequestPayload,
+  request: AnyFormRequest,
   page: PageControllerClass,
   context: FormContext,
   event: Event,
@@ -75,10 +76,7 @@ async function handleHttpEvent(
 export function makeGetHandler(
   preparePageEventRequestOptions?: PreparePageEventRequestOptions
 ) {
-  return function getHandler(
-    request: FormRequest,
-    h: Pick<ResponseToolkit, 'redirect' | 'view'>
-  ) {
+  return function getHandler(request: FormRequest, h: FormResponseToolkit) {
     const { params } = request
 
     if (normalisePath(params.path) === '') {
@@ -116,7 +114,7 @@ export function makePostHandler(
 ) {
   return function postHandler(
     request: FormRequestPayload,
-    h: Pick<ResponseToolkit, 'redirect' | 'view'>
+    h: FormResponseToolkit
   ) {
     const { query } = request
 

package/src/server/plugins/engine/routes/repeaters/item-delete.ts

@@ -1,10 +1,6 @@
 import { slugSchema } from '@defra/forms-model'
 import Boom from '@hapi/boom'
-import {
-  type ResponseToolkit,
-  type RouteOptions,
-  type ServerRoute
-} from '@hapi/hapi'
+import { type RouteOptions, type ServerRoute } from '@hapi/hapi'
 import Joi from 'joi'
 
 import { FileUploadPageController } from '~/src/server/plugins/engine/pageControllers/FileUploadPageController.js'
@@ -14,7 +10,8 @@ import {
   type FormRequest,
   type FormRequestPayload,
   type FormRequestPayloadRefs,
-  type FormRequestRefs
+  type FormRequestRefs,
+  type FormResponseToolkit
 } from '~/src/server/routes/types.js'
 import {
   actionSchema,
@@ -26,10 +23,7 @@ import {
 } from '~/src/server/schemas/index.js'
 
 // Item delete GET route
-function getHandler(
-  request: FormRequest,
-  h: Pick<ResponseToolkit, 'redirect' | 'view'>
-) {
+function getHandler(request: FormRequest, h: FormResponseToolkit) {
   const { params } = request
 
   return redirectOrMakeHandler(request, h, (page, context) => {
@@ -46,10 +40,7 @@ function getHandler(
   })
 }
 
-function postHandler(
-  request: FormRequestPayload,
-  h: Pick<ResponseToolkit, 'redirect' | 'view'>
-) {
+function postHandler(request: FormRequestPayload, h: FormResponseToolkit) {
   const { params } = request
 
   return redirectOrMakeHandler(request, h, (page, context) => {

package/src/server/plugins/engine/routes/repeaters/summary.ts

@@ -1,11 +1,7 @@
 // List summary GET route
 import { slugSchema } from '@defra/forms-model'
 import Boom from '@hapi/boom'
-import {
-  type ResponseToolkit,
-  type RouteOptions,
-  type ServerRoute
-} from '@hapi/hapi'
+import { type RouteOptions, type ServerRoute } from '@hapi/hapi'
 import Joi from 'joi'
 
 import { RepeatPageController } from '~/src/server/plugins/engine/pageControllers/RepeatPageController.js'
@@ -14,7 +10,8 @@ import {
   type FormRequest,
   type FormRequestPayload,
   type FormRequestPayloadRefs,
-  type FormRequestRefs
+  type FormRequestRefs,
+  type FormResponseToolkit
 } from '~/src/server/routes/types.js'
 import {
   actionSchema,
@@ -23,10 +20,7 @@ import {
   stateSchema
 } from '~/src/server/schemas/index.js'
 
-function getHandler(
-  request: FormRequest,
-  h: Pick<ResponseToolkit, 'redirect' | 'view'>
-) {
+function getHandler(request: FormRequest, h: FormResponseToolkit) {
   const { params } = request
 
   return redirectOrMakeHandler(request, h, (page, context) => {
@@ -38,10 +32,7 @@ function getHandler(
   })
 }
 
-function postHandler(
-  request: FormRequestPayload,
-  h: Pick<ResponseToolkit, 'redirect' | 'view'>
-) {
+function postHandler(request: FormRequestPayload, h: FormResponseToolkit) {
   const { params } = request
 
   return redirectOrMakeHandler(request, h, (page, context) => {

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

@@ -1,4 +1,6 @@
 export type {
+  AnyFormRequest,
+  AnyRequest,
   CheckAnswers,
   ErrorMessageTemplate,
   ErrorMessageTemplateList,
@@ -74,7 +76,8 @@ export type {
   FormRequest,
   FormRequestPayload,
   FormRequestPayloadRefs,
-  FormRequestRefs
+  FormRequestRefs,
+  FormResponseToolkit
 } from '~/src/server/routes/types.js'
 
 export { FormAction, FormStatus } from '~/src/server/routes/types.js'

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

@@ -7,7 +7,11 @@ import {
   type List,
   type Page
 } from '@defra/forms-model'
-import { type PluginProperties, type Request } from '@hapi/hapi'
+import {
+  type PluginProperties,
+  type Request,
+  type ResponseObject
+} from '@hapi/hapi'
 import { type JoiExpression, type ValidationErrorItem } from 'joi'
 
 import { FormComponent } from '~/src/server/plugins/engine/components/FormComponent.js'
@@ -36,12 +40,15 @@ import {
   type FormParams,
   type FormRequest,
   type FormRequestPayload,
+  type FormResponseToolkit,
   type FormStatus
 } from '~/src/server/routes/types.js'
+import { type CacheService } from '~/src/server/services/cacheService.js'
 import { type RequestOptions } from '~/src/server/services/httpService.js'
 import { type Services } from '~/src/server/types.js'
 
-type RequestType = Request | FormRequest | FormRequestPayload
+export type AnyFormRequest = FormRequest | FormRequestPayload
+export type AnyRequest = Request | AnyFormRequest
 
 /**
  * Form submission state stores the following in Redis:
@@ -312,7 +319,7 @@ export interface FormPageViewModel extends PageViewModelBase {
   context: FormContext
   errors?: FormSubmissionError[]
   hasMissingNotificationEmail?: boolean
-  allowSaveAndReturn: boolean
+  allowSaveAndExit: boolean
 }
 
 export interface RepeaterSummaryPageViewModel extends PageViewModelBase {
@@ -357,27 +364,26 @@ export type PreparePageEventRequestOptions = (
 ) => void
 
 export type OnRequestCallback = (
-  request: FormRequest | FormRequestPayload,
+  request: AnyFormRequest,
   params: FormParams,
   definition: FormDefinition,
   metadata: FormMetadata
 ) => void
 
+export type SaveAndExitHandler = (
+  request: FormRequestPayload,
+  h: FormResponseToolkit,
+  context: FormContext
+) => ResponseObject
+
 export interface PluginOptions {
   model?: FormModel
   services?: Services
   controllers?: Record<string, typeof PageController>
-  cacheName?: string
+  cache?: CacheService | string
   globals?: Record<string, GlobalFunction>
   filters?: Record<string, FilterFunction>
-  saveAndReturn?: {
-    keyGenerator: (request: RequestType) => string
-    sessionHydrator: (request: RequestType) => Promise<FormSubmissionState>
-    sessionPersister: (
-      state: FormSubmissionState,
-      request: RequestType
-    ) => Promise<void>
-  }
+  saveAndExit?: SaveAndExitHandler
   pluginPath?: string
   nunjucks: {
     baseLayoutPath: string