hof 22.8.5-fix-error-title-beta.4 → 22.8.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/middleware/errors.js +9 -13
- package/package.json +1 -1
- package/.nyc_output/75f28c1e-980b-46e1-8feb-1f046b6decdc.json +0 -1
- package/.nyc_output/processinfo/75f28c1e-980b-46e1-8feb-1f046b6decdc.json +0 -1
- package/.nyc_output/processinfo/index.json +0 -1
- package/frontend/govuk-template/govuk_template_generated.html +0 -102
- package/sandbox/.env +0 -1
- package/sandbox/apps/sandbox/translations/en/default.json +0 -245
- package/sandbox/public/css/app.css +0 -9552
- package/sandbox/public/images/icons/icon-caret-left.png +0 -0
- package/sandbox/public/images/icons/icon-complete.png +0 -0
- package/sandbox/public/images/icons/icon-cross-remove-sign.png +0 -0
- package/sandbox/public/js/bundle.js +0 -47603
package/middleware/errors.js
CHANGED
|
@@ -13,25 +13,23 @@ const getContent = (err, translate) => {
|
|
|
13
13
|
// Helper to safely call translate if it's a function
|
|
14
14
|
const t = key => (typeof translate === 'function' ? translate(key) : undefined);
|
|
15
15
|
|
|
16
|
-
//
|
|
17
|
-
|
|
18
|
-
const getServiceName = t => {
|
|
16
|
+
// Check whether a service name has been set in the journey.json file
|
|
17
|
+
const getServiceName = () => {
|
|
19
18
|
const serviceName = t('journey.serviceName');
|
|
20
19
|
const header = t('journey.header');
|
|
21
|
-
|
|
22
|
-
// Return serviceName if it's translated, otherwise fallback to header
|
|
20
|
+
|
|
21
|
+
// Return serviceName if it's translated, otherwise fallback to journey header
|
|
23
22
|
return serviceName && serviceName !== 'journey.serviceName' ? serviceName : header;
|
|
24
23
|
};
|
|
25
|
-
|
|
24
|
+
|
|
25
|
+
const serviceName = getServiceName();
|
|
26
26
|
|
|
27
27
|
if (err.code === 'SESSION_TIMEOUT') {
|
|
28
28
|
err.status = 401;
|
|
29
29
|
err.template = 'session-timeout';
|
|
30
|
-
// err.serviceName = isServiceNameSet ? t('journey.serviceName') : t('journey.header');
|
|
31
30
|
err.serviceName = serviceName;
|
|
32
31
|
err.title = t('errors.session.title');
|
|
33
32
|
err.message = t('errors.session.message');
|
|
34
|
-
// content.serviceName = isServiceNameSet ? t('journey.serviceName') : t('journey.header');
|
|
35
33
|
content.serviceName = serviceName;
|
|
36
34
|
content.title = t('errors.session.title');
|
|
37
35
|
content.message = t('errors.session.message');
|
|
@@ -40,7 +38,7 @@ const getContent = (err, translate) => {
|
|
|
40
38
|
if (err.code === 'NO_COOKIES') {
|
|
41
39
|
err.status = 403;
|
|
42
40
|
err.template = 'cookie-error';
|
|
43
|
-
content.serviceName =
|
|
41
|
+
content.serviceName = serviceName;
|
|
44
42
|
content.title = t('errors.cookies-required.title');
|
|
45
43
|
content.message = t('errors.cookies-required.message');
|
|
46
44
|
}
|
|
@@ -48,7 +46,6 @@ const getContent = (err, translate) => {
|
|
|
48
46
|
if (err.code === 'DDOS_RATE_LIMIT') {
|
|
49
47
|
err.status = 429;
|
|
50
48
|
err.template = 'rate-limit-error';
|
|
51
|
-
// err.serviceName = isServiceNameSet ? t('journey.serviceName') : t('journey.header');
|
|
52
49
|
err.serviceName = serviceName;
|
|
53
50
|
err.title = t('errors.ddos-rate-limit.title');
|
|
54
51
|
err.message = t('errors.ddos-rate-limit.message');
|
|
@@ -56,7 +53,6 @@ const getContent = (err, translate) => {
|
|
|
56
53
|
err.timeToWait = rateLimitsConfig.rateLimits.requests.windowSizeInMinutes;
|
|
57
54
|
err.postTimeToWait = t('errors.ddos-rate-limit.post-time-to-wait');
|
|
58
55
|
content.title = t('errors.ddos-rate-limit.title');
|
|
59
|
-
// content.serviceName = isServiceNameSet ? t('journey.serviceName') : t('journey.header');
|
|
60
56
|
content.serviceName = serviceName;
|
|
61
57
|
content.message = t('errors.ddos-rate-limit.message');
|
|
62
58
|
content.preTimeToWait = t('errors.ddos-rate-limit.pre-time-to-wait');
|
|
@@ -67,13 +63,13 @@ const getContent = (err, translate) => {
|
|
|
67
63
|
if (err.code === 'SUBMISSION_RATE_LIMIT') {
|
|
68
64
|
err.status = 429;
|
|
69
65
|
err.template = 'rate-limit-error';
|
|
70
|
-
err.serviceName =
|
|
66
|
+
err.serviceName = serviceName;
|
|
71
67
|
err.title = t('errors.submission-rate-limit.title');
|
|
72
68
|
err.message = t('errors.submission-rate-limit.message');
|
|
73
69
|
err.preTimeToWait = t('errors.submission-rate-limit.pre-time-to-wait');
|
|
74
70
|
err.timeToWait = rateLimitsConfig.rateLimits.submissions.windowSizeInMinutes;
|
|
75
71
|
err.postTimeToWait = t('errors.submission-rate-limit.post-time-to-wait');
|
|
76
|
-
content.serviceName =
|
|
72
|
+
content.serviceName = serviceName;
|
|
77
73
|
content.title = t('errors.submission-rate-limit.title');
|
|
78
74
|
content.message = t('errors.submission-rate-limit.message');
|
|
79
75
|
content.preTimeToWait = t('errors.submission-rate-limit.pre-time-to-wait');
|