Upgrade to express 5

api/middlewares/parse-form.js

@@ -1,7 +1,6 @@
 const { urlencoded } = require('express');
 
 const parseForm = urlencoded({
-  extended: false,
   limit: '1kb',
 });
 

api/routers/build-log.js

@@ -2,10 +2,6 @@ const router = require('express').Router();
 const BuildLogController = require('../controllers/build-log');
 const { sessionAuth } = require('../middlewares');
 
-router.get(
-  '/build/:build_id/log(/offset/:offset)?',
-  sessionAuth,
-  BuildLogController.find,
-);
+router.get('/build/:build_id/log{/offset/:offset}', sessionAuth, BuildLogController.find);
 
 module.exports = router;

api/routers/build-task.js

@@ -17,6 +17,6 @@ router.post(
 router.put('/tasks/:build_task_id/:token', BuildTaskController.update);
 router.get('/tasks/types', sessionAuth, BuildTaskTypeController.list);
 router.get('/tasks/default-rules', sessionAuth, BuildTaskTypeController.getDefaultRules);
-router.get('/tasks/:task_id/report/:sub_page?', sessionAuth, BuildTaskController.report);
+router.get('/tasks/:task_id/report/{:sub_page}', sessionAuth, BuildTaskController.report);
 
 module.exports = router;

api/routers/main.js

@@ -7,12 +7,12 @@ router.get('/', MainController.home);
 router.get('/system-use', MainController.systemUse);
 
 // add csrf middleware to app route so that we can use request.csrfToken()
-router.get('/organizations(/*)?', csrfProtection, MainController.app);
-router.get('/sites(/*)?', csrfProtection, MainController.app);
+router.get('/organizations{/*splat}', csrfProtection, MainController.app);
+router.get('/sites{/*splat}', csrfProtection, MainController.app);
 router.get('/settings', csrfProtection, MainController.app);
 
 router.get('/robots.txt', MainController.robots);
 
-router.options('(/*)?', (_req, res) => res.notFound());
+router.options('{/*splat}', (_req, res) => res.notFound());
 
 module.exports = router;

api/routers/report.js

@@ -4,6 +4,6 @@ const MainController = require('../controllers/main');
 const { csrfProtection } = require('../middlewares');
 
 // add csrf middleware to app route so that we can use request.csrfToken()
-router.get('/report(/*)?', csrfProtection, MainController.report);
+router.get('/report{*splat}', csrfProtection, MainController.report);
 
 module.exports = router;

docker-compose.uaa.yml

@@ -10,7 +10,7 @@ services:
       dockerfile: ./Dockerfile-uaa
       context: .
     ports:
-      - 9000:8080
+      - 9001:8080
     environment:
       POSTGRES_DB: federalist
       POSTGRES_PORT: 5432
@@ -19,4 +19,4 @@ services:
       POSTGRES_PASSWORD: password
     depends_on:
       - db
-    command: ["/tomcat/bin/catalina.sh", "run"]
+    command: ["/tomcat/bin/catalina.sh", "run"]

docker-compose.yml

@@ -33,7 +33,7 @@ services:
       NODE_ENV: development
       PORT: 1337
       PRODUCT: pages
-      UAA_HOST: http://localhost:9000
+      UAA_HOST: http://localhost:9001
       UAA_HOST_DOCKER_URL: http://uaa:8080
       USER_AUDITOR: federalist
       CLOUD_FOUNDRY_API_HOST: https://api.example.com
@@ -68,7 +68,7 @@ services:
       UAA_CLIENT_ID: pages-client
       UAA_CLIENT_SECRET: client-secret
       UAA_HOST_DOCKER_URL: http://uaa:8080
-      UAA_LOGIN_HOST: http://localhost:9000
+      UAA_LOGIN_HOST: http://localhost:9001
   admin-client:
     build:
       dockerfile: ./admin-client/Dockerfile-admin

package.json

@@ -27,7 +27,7 @@
     "db-migrate-pg": "^1.5.2",
     "deep-extend": "^0.6",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "express": "^4.19.2",
+    "express": "^5.0.1",
     "express-rate-limit": "^5.2.3",
     "express-session": "^1.18.0",
     "express-slow-down": "^1.4.0",