@defra-fish/gafl-webapp-service 1.72.0 → 1.73.0-rc.1
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/README.md +31 -31
- package/package.json +4 -4
- package/src/pages/recurring-payments/cancel/already-cancelled/cancel-rp-already-cancelled.njk +2 -2
- package/src/pages/recurring-payments/cancel/complete/cancel-rp-complete.njk +2 -2
- package/src/pages/recurring-payments/cancel/licence-not-found/cancel-rp-licence-not-found.njk +2 -2
package/README.md
CHANGED
|
@@ -8,37 +8,37 @@ To run from this directory:
|
|
|
8
8
|
|
|
9
9
|
## Environment variables
|
|
10
10
|
|
|
11
|
-
| name | description | required | default |
|
|
12
|
-
| :-------------------------------: | :----------------------------------------------------------------------: | :------: | :-------------------------------------------------------: |
|
|
13
|
-
| NODE_ENV | Node environment | no | | development,
|
|
14
|
-
| HAPI_KEEP_ALIVE_TIMEOUT_MS | Configure the keep-alive timeout on the server listener | no | 1 minute |
|
|
15
|
-
| PORT | The http port the listens on | no | 3000 |
|
|
16
|
-
| REDIS_HOST | Hostname of the redis instance used for session caching | yes | |
|
|
17
|
-
| REDIS_PORT | Port number of the redis instance used for session caching | no | 6379 |
|
|
18
|
-
| REDIS_PASSWORD | Password used to authenticate with the configured redis instance | no | |
|
|
19
|
-
| CHANNEL | The sales channel | no | websales |
|
|
20
|
-
| SESSION_COOKIE_NAME | Name of the session cookie | no | sid |
|
|
21
|
-
| CSRF_TOKEN_COOKIE_NAME | Name of the CSRF token cookie | no | rlsctkn |
|
|
22
|
-
| SESSION_COOKIE_PASSWORD | Encryption key for the session cookie (at least 32 characters) | yes | |
|
|
23
|
-
| SESSION_TTL_MS | Time to live for the session cookie and cache | no | 10800000 |
|
|
24
|
-
| ADDRESS_LOOKUP_URL | OS Places API endpoint URL | no | https://api.os.uk/search/places/v1/postcode |
|
|
25
|
-
| ADDRESS_LOOKUP_KEY | The API key required by OS places | no | |
|
|
26
|
-
| ADDRESS_LOOKUP_TIMEOUT_MS | The timeout in milliseconds for the lookup | no | 10000 |
|
|
27
|
-
| SALES_API_URL | The address of the sales api | no | http://0.0.0.0:4000 |
|
|
28
|
-
| SALES_API_TIMEOUT_MS | The timeout in milliseconds requests to the api | no | 10000 |
|
|
29
|
-
| GOV_PAY_API_URL | The GOV.UK Pay API base url | no | Yes |
|
|
30
|
-
| GOV_PAY_APIKEY | GOV pay access identifier | no | Yes |
|
|
31
|
-
| GOV_PAY_REQUEST_TIMEOUT_MS | Timeout in milliseconds for API requests | no | Yes |
|
|
32
|
-
| FEEDBACK_URI | Location of feedback survey | no | # |
|
|
33
|
-
| ANALYTICS_PRIMARY_PROPERTY | Analytics ID for tracking inc ecommerce | no | |
|
|
34
|
-
| ANALYTICS_PROPERTY_API | Analytics property API key for linking Analytics.google property | no | |
|
|
35
|
-
| SERVICE_PAGE | GOV.UK service page | no | https://www.gov.uk/fishing-licences/buy-a-fishing-licence |
|
|
36
|
-
| AIRBRAKE_HOST | URL of airbrake host | no | |
|
|
37
|
-
| AIRBRAKE_PROJECT_KEY | Project key for airbrake logging | no | |
|
|
38
|
-
| ENABLE_ANALYTICS_OPT_IN_DEBUGGING | Set log if analytics been checked in non-production | no | |
|
|
39
|
-
| ERROR_PAGE_ROUTE | Display error pages to support welsh language | no | |
|
|
40
|
-
| SHOW_CANCELLATION_JOURNEY | Display option to show recurring payments cancellation journey to admin | no | |
|
|
41
|
-
| SHOW_CANCELLATION_JOURNEY_PUBLIC | Display option to show recurring payments cancellation journey to public | no | |
|
|
11
|
+
| name | description | required | default | valid |
|
|
12
|
+
| :-------------------------------: | :----------------------------------------------------------------------: | :------: | :-------------------------------------------------------: | :--------------------: |
|
|
13
|
+
| NODE_ENV | Node environment | no | | development, fsh-{env} |
|
|
14
|
+
| HAPI_KEEP_ALIVE_TIMEOUT_MS | Configure the keep-alive timeout on the server listener | no | 1 minute | |
|
|
15
|
+
| PORT | The http port the listens on | no | 3000 | |
|
|
16
|
+
| REDIS_HOST | Hostname of the redis instance used for session caching | yes | | |
|
|
17
|
+
| REDIS_PORT | Port number of the redis instance used for session caching | no | 6379 | |
|
|
18
|
+
| REDIS_PASSWORD | Password used to authenticate with the configured redis instance | no | | |
|
|
19
|
+
| CHANNEL | The sales channel | no | websales | websales, telesales |
|
|
20
|
+
| SESSION_COOKIE_NAME | Name of the session cookie | no | sid | |
|
|
21
|
+
| CSRF_TOKEN_COOKIE_NAME | Name of the CSRF token cookie | no | rlsctkn | |
|
|
22
|
+
| SESSION_COOKIE_PASSWORD | Encryption key for the session cookie (at least 32 characters) | yes | | |
|
|
23
|
+
| SESSION_TTL_MS | Time to live for the session cookie and cache | no | 10800000 | |
|
|
24
|
+
| ADDRESS_LOOKUP_URL | OS Places API endpoint URL | no | https://api.os.uk/search/places/v1/postcode | |
|
|
25
|
+
| ADDRESS_LOOKUP_KEY | The API key required by OS places | no | | |
|
|
26
|
+
| ADDRESS_LOOKUP_TIMEOUT_MS | The timeout in milliseconds for the lookup | no | 10000 | |
|
|
27
|
+
| SALES_API_URL | The address of the sales api | no | http://0.0.0.0:4000 | |
|
|
28
|
+
| SALES_API_TIMEOUT_MS | The timeout in milliseconds requests to the api | no | 10000 | |
|
|
29
|
+
| GOV_PAY_API_URL | The GOV.UK Pay API base url | no | Yes | |
|
|
30
|
+
| GOV_PAY_APIKEY | GOV pay access identifier | no | Yes | |
|
|
31
|
+
| GOV_PAY_REQUEST_TIMEOUT_MS | Timeout in milliseconds for API requests | no | Yes | |
|
|
32
|
+
| FEEDBACK_URI | Location of feedback survey | no | # | |
|
|
33
|
+
| ANALYTICS_PRIMARY_PROPERTY | Analytics ID for tracking inc ecommerce | no | | |
|
|
34
|
+
| ANALYTICS_PROPERTY_API | Analytics property API key for linking Analytics.google property | no | | |
|
|
35
|
+
| SERVICE_PAGE | GOV.UK service page | no | https://www.gov.uk/fishing-licences/buy-a-fishing-licence | |
|
|
36
|
+
| AIRBRAKE_HOST | URL of airbrake host | no | | |
|
|
37
|
+
| AIRBRAKE_PROJECT_KEY | Project key for airbrake logging | no | | |
|
|
38
|
+
| ENABLE_ANALYTICS_OPT_IN_DEBUGGING | Set log if analytics been checked in non-production | no | | |
|
|
39
|
+
| ERROR_PAGE_ROUTE | Display error pages to support welsh language | no | | |
|
|
40
|
+
| SHOW_CANCELLATION_JOURNEY | Display option to show recurring payments cancellation journey to admin | no | | telesales |
|
|
41
|
+
| SHOW_CANCELLATION_JOURNEY_PUBLIC | Display option to show recurring payments cancellation journey to public | no | | websales |
|
|
42
42
|
|
|
43
43
|
## OS Places address lookup
|
|
44
44
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@defra-fish/gafl-webapp-service",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.73.0-rc.1",
|
|
4
4
|
"description": "The websales frontend for the GAFL service",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"engines": {
|
|
@@ -36,8 +36,8 @@
|
|
|
36
36
|
"prepare": "gulp --gulpfile build/gulpfile.cjs"
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"@defra-fish/business-rules-lib": "1.
|
|
40
|
-
"@defra-fish/connectors-lib": "1.
|
|
39
|
+
"@defra-fish/business-rules-lib": "1.73.0-rc.1",
|
|
40
|
+
"@defra-fish/connectors-lib": "1.73.0-rc.1",
|
|
41
41
|
"@defra/hapi-gapi": "2.0.0",
|
|
42
42
|
"@hapi/boom": "9.1.2",
|
|
43
43
|
"@hapi/catbox-redis": "6.0.2",
|
|
@@ -79,5 +79,5 @@
|
|
|
79
79
|
"./gafl-jest-matchers.js"
|
|
80
80
|
]
|
|
81
81
|
},
|
|
82
|
-
"gitHead": "
|
|
82
|
+
"gitHead": "24f80a049567b03ddf0916c4eefae02f963ae768"
|
|
83
83
|
}
|
package/src/pages/recurring-payments/cancel/already-cancelled/cancel-rp-already-cancelled.njk
CHANGED
|
@@ -14,9 +14,9 @@
|
|
|
14
14
|
</p>
|
|
15
15
|
<p class="govuk-body">
|
|
16
16
|
{{ mssgs.rp_licence_already_cancelled_body_2_1 }}
|
|
17
|
-
<a href="mailto:enquiries@environment-agency.gov.uk"> {{ mssgs.rp_licence_already_cancelled_body_ea_link }}</a>
|
|
17
|
+
<a class="govuk-link" href="mailto:enquiries@environment-agency.gov.uk"> {{ mssgs.rp_licence_already_cancelled_body_ea_link }}</a>
|
|
18
18
|
{{ mssgs.rp_licence_already_cancelled_body_2_2 }}
|
|
19
|
-
<a href="https://www.gov.uk/call-charges" target="_blank" rel="noopener"> {{ mssgs.licence_not_found_rp_body_call_charges_link }}</a>{{ mssgs.full_stop }}
|
|
19
|
+
<a class="govuk-link" href="https://www.gov.uk/call-charges" target="_blank" rel="noopener"> {{ mssgs.licence_not_found_rp_body_call_charges_link }}</a>{{ mssgs.full_stop }}
|
|
20
20
|
</p>
|
|
21
21
|
<p class="govuk-body">
|
|
22
22
|
<a class="govuk-link" href="{{ backRef }}"> {{ mssgs.rp_licence_already_cancelled_body_3_1 }}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
<p class="govuk-body">{{ mssgs.rp_cancel_complete_body_1 }}{{ data.preferredMethodOfContact }}</p>
|
|
16
16
|
<p class="govuk-body">
|
|
17
17
|
{{ mssgs.rp_cancel_complete_body_2_1 }} {{ data.licenceExpiry }} {{ mssgs.rp_cancel_complete_body_2_2 }}
|
|
18
|
-
<a href="https://www.gov.uk/fishing-licences/buy-a-fishing-licence" target="_blank" rel="noopener">{{ mssgs.rp_cancel_complete_body_2_link }}</a>.
|
|
18
|
+
<a class="govuk-link" href="https://www.gov.uk/fishing-licences/buy-a-fishing-licence" target="_blank" rel="noopener">{{ mssgs.rp_cancel_complete_body_2_link }}</a>.
|
|
19
19
|
</p>
|
|
20
20
|
<h2 class="govuk-heading-m">{{ mssgs.rp_cancel_complete_body_3_header }}</h2>
|
|
21
21
|
<p class="govuk-body">
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
<a href="https://www.smartsurvey.co.uk/s/1IB0U5/" class="govuk-link" target="_blank" rel="noopener">{{ mssgs.rp_cancel_complete_body_3_bulletpoint_1_link }}</a>
|
|
27
27
|
- {{ mssgs.rp_cancel_complete_body_3_bulletpoint_1 }}</li>
|
|
28
28
|
<li>
|
|
29
|
-
<a href="https://www.gov.uk/government/collections/fisheries-annual-reports" target="_blank" rel="noopener">{{ mssgs.rp_cancel_complete_body_3_bulletpoint_2_link }}</a>
|
|
29
|
+
<a class="govuk-link" href="https://www.gov.uk/government/collections/fisheries-annual-reports" target="_blank" rel="noopener">{{ mssgs.rp_cancel_complete_body_3_bulletpoint_2_link }}</a>
|
|
30
30
|
{{ mssgs.rp_cancel_complete_body_3_bulletpoint_2 }}</li>
|
|
31
31
|
</ul>
|
|
32
32
|
</div>
|
package/src/pages/recurring-payments/cancel/licence-not-found/cancel-rp-licence-not-found.njk
CHANGED
|
@@ -15,10 +15,10 @@
|
|
|
15
15
|
{{ mssgs.licence_not_found_rp_body_2 }}
|
|
16
16
|
</p>
|
|
17
17
|
<ul class="govuk-list govuk-list--bullet">
|
|
18
|
-
<li> {{ mssgs.licence_not_found_rp_bullet_point_1 }} <a href="mailto:enquiries@environment-agency.gov.uk"> {{ mssgs.licence_not_found_rp_body_ea_link }}
|
|
18
|
+
<li> {{ mssgs.licence_not_found_rp_bullet_point_1 }} <a class="govuk-link" href="mailto:enquiries@environment-agency.gov.uk"> {{ mssgs.licence_not_found_rp_body_ea_link }}
|
|
19
19
|
</a> {{ mssgs.licence_not_found_rp_bullet_point_1_2 }} </li>
|
|
20
20
|
|
|
21
|
-
<li> {{ mssgs.licence_not_found_rp_bullet_point_2 }} <a href="https://www.gov.uk/call-charges" target="_blank" rel="noopener"> {{ mssgs.licence_not_found_rp_body_call_charges_link }}
|
|
21
|
+
<li> {{ mssgs.licence_not_found_rp_bullet_point_2 }} <a class="govuk-link" href="https://www.gov.uk/call-charges" target="_blank" rel="noopener"> {{ mssgs.licence_not_found_rp_body_call_charges_link }}
|
|
22
22
|
</a>{{ mssgs.full_stop }} </li>
|
|
23
23
|
</ul>
|
|
24
24
|
|