Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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: 14 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
},
"license": "SEE LICENSE IN LICENSE",
"dependencies": {
"@defra/forms-model": "^3.0.597",
"@defra/forms-model": "^3.0.603",
"@defra/hapi-tracing": "^1.29.0",
"@elastic/ecs-pino-format": "^1.5.0",
"@hapi/boom": "^10.0.1",
Expand Down Expand Up @@ -108,6 +108,7 @@
"lodash": "^4.17.21",
"marked": "^15.0.12",
"nunjucks": "^3.2.4",
"obscenity": "^0.4.5",
"outdent": "^0.8.0",
"pino": "^9.14.0",
"pino-pretty": "^13.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ import {
export class StatusPageController extends QuestionPageController {
declare pageDef: PageStatus
allowSaveAndExit = false
showReferenceNumber = false

constructor(model: FormModel, pageDef: PageStatus) {
super(model, pageDef)
this.viewName = 'confirmation'
this.showReferenceNumber = model.def.options?.showReferenceNumber ?? false
}

getRelevantPath() {
Expand Down Expand Up @@ -54,7 +56,9 @@ export class StatusPageController extends QuestionPageController {
return h.view(viewName, {
...viewModel,
submissionGuidance,
formName
formName,
showReferenceNumber: this.showReferenceNumber,
referenceNumber: context.referenceNumber
})
}
}
Expand Down
43 changes: 42 additions & 1 deletion src/server/plugins/engine/referenceNumbers.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import { generateUniqueReference } from '~/src/server/plugins/engine/referenceNumbers.js'
import {
convertToDecAlpha,
generateUniqueReference
} from '~/src/server/plugins/engine/referenceNumbers.js'

describe('generateUniqueReference', () => {
it('should generate a reference number with 3 segments when no prefix is provided', () => {
Expand Down Expand Up @@ -30,4 +33,42 @@ describe('generateUniqueReference', () => {
const referenceNumber2 = generateUniqueReference()
expect(referenceNumber1).not.toBe(referenceNumber2)
})

describe('convertToDecAlpha', () => {
it('should generate correct characters in string', () => {
const allValuesHexPairs = Array.from(Array(256).keys())
expect(convertToDecAlpha(allValuesHexPairs)).toBe(
'AAAAAAAAA' +
'BBBBBBBBB' +
'CCCCCCCC' +
'DDDDDDDDD' +
'EEEEEEEE' +
'FFFFFFFFF' +
'HHHHHHHH' +
'JJJJJJJJJ' +
'KKKKKKKK' +
'LLLLLLLLL' +
'MMMMMMMM' +
'NNNNNNNNN' +
'PPPPPPPP' +
'RRRRRRRRR' +
'SSSSSSSS' +
'TTTTTTTTT' +
'UUUUUUUUU' +
'VVVVVVVV' +
'WWWWWWWWW' +
'XXXXXXXX' +
'YYYYYYYYY' +
'ZZZZZZZZ' +
'222222222' +
'33333333' +
'444444444' +
'55555555' +
'666666666' +
'77777777' +
'888888888' +
'99999999'
)
})
})
})
48 changes: 43 additions & 5 deletions src/server/plugins/engine/referenceNumbers.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,56 @@
import { randomBytes } from 'node:crypto'

import {
RegExpMatcher,
englishDataset,
englishRecommendedTransformers
} from 'obscenity'

/**
* To prevent confusion to users reading the reference number, ambiguous letters and numbers are removed.
* @param strCodes - array of binary input values
*/
export function convertToDecAlpha(strCodes: number[]) {
const validChars = 'ABCDEFHJKLMNPRSTUVWXYZ23456789'
const strLen = validChars.length
const outArray = [] as string[]

strCodes.forEach((code) => {
const pos = (code / 256) * strLen
outArray.push(validChars.charAt(pos))
})

return outArray.join('')
}

/**
* Generates a reference number in the format of `XXX-XXX-XXX`, or `PREFIX-XXX-XXX` if a prefix is provided.
* Provides no guarantee on uniqueness.
* To prevent confusion to users reading the reference number, ambiguous letters and numbers are removed
* (see https://gunkies.org/wiki/DEC_alphabet )
*/
export function generateUniqueReference(prefix?: string) {
const segmentLength = 3
const segmentCount = prefix ? 2 : 3
prefix = prefix ? `${prefix}-` : ''

const segments = Array.from(
{ length: segmentCount },
() => randomBytes(segmentLength).toString('hex').slice(0, segmentLength) // 0-9a-f, might be good enough?
)
const profanityMatcher = new RegExpMatcher({
...englishDataset.build(),
...englishRecommendedTransformers
})
Comment on lines +37 to +40
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice touch


let referenceNumber

do {
const segments = Array.from({ length: segmentCount }, () =>
convertToDecAlpha([...randomBytes(segmentLength)]).slice(
0,
segmentLength * 2
)
)

referenceNumber = `${prefix}${segments.join('-')}`.toUpperCase()
} while (profanityMatcher.hasMatch(referenceNumber.replaceAll('-', '')))

return `${prefix}${segments.join('-')}`.toUpperCase()
return referenceNumber
}
3 changes: 2 additions & 1 deletion src/server/plugins/engine/views/confirmation.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
<div class="govuk-grid-row">
<div class="govuk-grid-column-two-thirds">
{{ govukPanel({
titleText: pageTitle
titleText: pageTitle,
html: "Your reference number<br><strong>" + referenceNumber + "</strong>" if showReferenceNumber
}) }}
<h2 class="govuk-heading-m">What happens next</h2>
<div class="app-prose-scope">
Expand Down
Loading