Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions src/server/models/save-and-exit.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import { crumbSchema, stateSchema } from '@defra/forms-engine-plugin/schema.js'
import {
ControllerPath,
SecurityQuestionsEnum,
UNICODE_EMAIL_ERROR_MESSAGE,
preventUnicodeInEmail,
slugSchema
} from '@defra/forms-model'
import Joi from 'joi'
Expand Down Expand Up @@ -243,11 +245,17 @@ export const paramsSchema = Joi.object()
export const payloadSchema = Joi.object()
.keys({
crumb: crumbSchema,
email: Joi.string().email().required().messages({
'string.email':
'Enter an email address in the correct format, for example, hello@example.com',
'*': 'Enter an email address'
}),
email: Joi.string()
.trim()
.email()
.custom((value, helpers) => preventUnicodeInEmail(value, helpers))
.required()
.messages({
'string.email':
'Enter an email address in the correct format, for example, hello@example.com',
'string.unicode': UNICODE_EMAIL_ERROR_MESSAGE,
'*': 'Enter an email address'
}),
emailConfirmation: Joi.string()
.valid(Joi.ref('email'))
.required()
Expand Down
19 changes: 14 additions & 5 deletions src/server/plugins/SummaryPageWithConfirmationEmailController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,26 @@ import {
type FormRequestPayload,
type FormResponseToolkit
} from '@defra/forms-engine-plugin/types'
import { type GovukField } from '@defra/forms-model'
import Joi from 'joi'
import { preventUnicodeInEmail, type GovukField } from '@defra/forms-model'
import Joi, { type CustomHelpers } from 'joi'

export const CONFIRMATION_EMAIL_FIELD_NAME = 'userConfirmationEmailAddress'

const schema = Joi.object().keys({
crumb: crumbSchema,
action: actionSchema,
userConfirmationEmailAddress: Joi.string().email().allow('').messages({
'*': 'Enter an email address in the correct format'
})
userConfirmationEmailAddress: Joi.string()
.email()
.trim()
.custom((value, helpers: CustomHelpers<string>) =>
preventUnicodeInEmail(value, helpers)
)
.allow('')
.messages({
'*': 'Enter an email address in the correct format',
'string.unicode':
'The email address you entered includes invalid characters, for example, long dashes'
})
})

export class SummaryPageWithConfirmationEmailController extends SummaryPageController {
Expand Down
Loading