Skip to content

Commit e70abac

Browse files
Merge pull request #292 from UKHomeOffice/PAF-397
PAF-397 Remove unused mock upload dependencies and refresh vulnerable package fixes
2 parents 36e7c61 + e1884dc commit e70abac

7 files changed

Lines changed: 514 additions & 904 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN echo "http://uk.alpinelinux.org/alpine/v3.24/main" > /etc/apk/repositories ;
88
apk upgrade --no-cache
99

1010
# Upgrade bundled npm deps so Trivy does not report vulnerable undici from base image toolchain
11-
RUN npm install -g npm@12.0.0 && npm --version
11+
RUN npm install -g npm@12.0.1 && npm --version
1212

1313
# Setup nodejs group & nodejs user
1414
RUN addgroup --system nodejs --gid 998 && \

config.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22
/* eslint no-process-env: 0 */
33

44
const env = process.env.NODE_ENV || 'production';
5-
const useMocks = process.env.USE_MOCKS === 'true' || !env;
65

76
module.exports = {
87
env: env,
98
PRETTY_DATE_FORMAT: 'Do MMMM YYYY',
109
csp: {
1110
imgSrc: ['data:']
1211
},
13-
useMocks: useMocks,
1412
upload: {
1513
maxFileSizeInBytes: 100 * 1024 * 1024, // 100MiB in bytes
1614
maxFileSize: '100mb',
@@ -27,10 +25,7 @@ module.exports = {
2725
'application/vnd.oasis.opendocument.text',
2826
'application/vnd.oasis.opendocument.spreadsheet'
2927
],
30-
// if mocks set use file service served up by app otherwise use filevault's port 3000
31-
hostname: !useMocks && process.env.FILE_VAULT_URL ?
32-
process.env.FILE_VAULT_URL :
33-
`http://localhost:${useMocks ? (process.env.PORT || 8080) : 3000}/file`
28+
hostname: process.env.FILE_VAULT_URL
3429
},
3530
keycloak: {
3631
token: process.env.KEYCLOAK_TOKEN_URL,

mock-apis.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

mocks/image-upload.js

Lines changed: 0 additions & 16 deletions
This file was deleted.

package.json

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,14 @@
1919
"test:ui-integration": "NODE_ENV=test _mocha \"test/_ui-integration/**/*.spec.js\" --exit",
2020
"test:unit": "NODE_ENV=test nyc _mocha \"test/_unit/**/*.spec.js\"",
2121
"build": "hof-build",
22-
"test:snyk": "snyk config set api=SNYK_TOKEN && snyk test",
2322
"postinstall": "yarn run build"
2423
},
2524
"dependencies": {
2625
"accessible-autocomplete": "^3.0.1",
2726
"bl": "^6.1.6",
2827
"busboy": "^1.6.0",
29-
"busboy-body-parser": "^0.3.2",
3028
"form-data": "^4.0.6",
31-
"hof": "~24.4.0",
29+
"hof": "~24.5.0",
3230
"lodash": "^4.18.1",
3331
"moment": "^2.30.1",
3432
"sqs-producer": "^9.0.5",
@@ -38,24 +36,21 @@
3836
"chai": "^6.2.2",
3937
"chai-as-promised": "^8.0.2",
4038
"chai-subset": "^1.6.0",
41-
"chromedriver": "^119.0.1",
4239
"eslint": "^8.57.0",
4340
"eslint-config-hof": "^1.3.4",
44-
"jsdom": "^29.1.1",
41+
"jsdom": "^30.0.0",
4542
"mocha": "^11.7.6",
46-
"mock-fs": "^5.5.0",
4743
"nyc": "^18.0.0",
4844
"proxyquire": "^2.1.3",
49-
"sinon": "^22.0.0",
45+
"sinon": "^22.1.0",
5046
"sinon-chai": "^4.0.1",
51-
"snyk": "^1.1306.0",
5247
"supertest": "^7.2.2",
5348
"supertest-session": "^5.0.1"
5449
},
5550
"resolutions": {
5651
"serialize-javascript": "^7.0.7",
57-
"dicer": "^0.3.1"
58-
52+
"dicer": "^0.3.1",
53+
"brace-expansion": "5.0.8"
5954
},
6055
"mocha": {
6156
"reporter": "spec",

server.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ let settings = require('./hof.settings');
66
const config = require('./config.js');
77
const busboy = require('busboy');
88
const bl = require('bl');
9-
const mockAPIs = require('./mock-apis');
109
const _ = require('lodash');
1110

1211
settings = Object.assign({}, settings, {
@@ -16,9 +15,6 @@ settings = Object.assign({}, settings, {
1615

1716
const app = hof(settings);
1817

19-
if (config.useMocks) {
20-
app.use(mockAPIs);
21-
}
2218

2319
app.use((req, res, next) => {
2420
// Set HTML Language

0 commit comments

Comments
 (0)