Merge pull request #323 from bcgov/chore/cleanup

General application updates

Author: qhanson55

.github/environments/values.dev.yaml

@@ -12,7 +12,7 @@ config:
     FRONTEND_OIDC_CLIENTID: nr-permit-connect-navigator-service-5188
     FRONTEND_OPENSTREETMAP_APIPATH: https://tile.openstreetmap.org
     FRONTEND_ORGBOOK_APIPATH: https://orgbook.gov.bc.ca/api/v4
-    SERVER_APIPATH: /api/v1
+    SERVER_APIPATH: /v1
     SERVER_ATS_APIPATH: https://i1api.nrs.gov.bc.ca/ats-api/v1
     SERVER_ATS_TOKENURL: https://i1api.nrs.gov.bc.ca/oauth2/v1/oauth/token?grant_type=client_credentials&disableDeveloperFilter=true&scope=ATS_API.*
     SERVER_BODYLIMIT: 30mb

.github/environments/values.prod.yaml

@@ -12,7 +12,7 @@ config:
     FRONTEND_OIDC_CLIENTID: nr-permit-connect-navigator-service-5188
     FRONTEND_OPENSTREETMAP_APIPATH: https://tile.openstreetmap.org
     FRONTEND_ORGBOOK_APIPATH: https://orgbook.gov.bc.ca/api/v4
-    SERVER_APIPATH: /api/v1
+    SERVER_APIPATH: /v1
     SERVER_ATS_APIPATH: https://api.nrs.gov.bc.ca/ats-api/v1
     SERVER_ATS_TOKENURL: https://api.nrs.gov.bc.ca/oauth2/v1/oauth/token?grant_type=client_credentials&disableDeveloperFilter=true&scope=ATS_API.*
     SERVER_BODYLIMIT: 30mb

.github/environments/values.test.yaml

@@ -12,7 +12,7 @@ config:
     FRONTEND_OIDC_CLIENTID: nr-permit-connect-navigator-service-5188
     FRONTEND_OPENSTREETMAP_APIPATH: https://tile.openstreetmap.org
     FRONTEND_ORGBOOK_APIPATH: https://orgbook.gov.bc.ca/api/v4
-    SERVER_APIPATH: /api/v1
+    SERVER_APIPATH: /v1
     SERVER_ATS_APIPATH: https://t1api.nrs.gov.bc.ca/ats-api/v1
     SERVER_ATS_TOKENURL: https://t1api.nrs.gov.bc.ca/oauth2/v1/oauth/token?grant_type=client_credentials&disableDeveloperFilter=true&scope=ATS_API.*
     SERVER_BODYLIMIT: 30mb

Dockerfile

@@ -68,4 +68,4 @@ USER 1001
 RUN npm ci --omit=dev && npm run prisma:generate
 
 EXPOSE ${APP_PORT}
-CMD ["node", "./sbin/bin/www"]
+CMD ["node", "--max-old-space-size=50", "./sbin/server.js"]

app/app.ts

@@ -7,12 +7,12 @@ import { join } from 'path';
 import querystring from 'querystring';
 import { randomBytes } from 'crypto';
 
-import { name as appName, version as appVersion } from './package.json';
+import { version as appVersion } from './package.json';
 import { getLogger, httpLogger } from './src/components/log';
-import { DEFAULTCORS } from './src/utils/constants/application';
+import router from './src/routes';
 import { Problem } from './src/utils';
+import { DEFAULTCORS } from './src/utils/constants/application';
 import { readIdpList } from './src/utils/utils';
-import v1Router from './src/routes/v1';
 import { state } from './state';
 
 import type { NextFunction, Request, Response } from 'express';
@@ -21,6 +21,7 @@ const log = getLogger(module.filename);
 
 const appRouter = express.Router();
 const app = express();
+app.disable('x-powered-by');
 app.use(compression());
 app.use(cors(DEFAULTCORS));
 app.use(express.json({ limit: config.get('server.bodyLimit') }));
@@ -29,10 +30,6 @@ app.set('query parser', 'extended');
 
 app.use((_req, res, next) => {
   res.locals.cspNonce = randomBytes(32).toString('hex');
-  next();
-});
-
-app.use(
   helmet({
     contentSecurityPolicy: {
       directives: {
@@ -48,8 +45,9 @@ app.use(
         'script-src': ["'self'", (_req, res: any) => `'nonce-${res.locals.cspNonce}'`] // eslint-disable-line
       }
     }
-  })
-);
+  });
+  next();
+});
 
 // Skip if running tests
 if (process.env.NODE_ENV !== 'test') {
@@ -73,24 +71,6 @@ app.get('/robots.txt', (_req: Request, res: Response): void => {
   res.send('User-agent: *\nDisallow: /');
 });
 
-// Base API Directory
-appRouter.get('/api', (_req: Request, res: Response): void => {
-  if (state.shutdown) {
-    throw new Error('Server shutting down');
-  } else {
-    res.status(200).json({
-      app: {
-        gitRev: state.gitRev,
-        name: appName,
-        nodeVersion: process.version,
-        version: appVersion
-      },
-      endpoints: ['/api/v1'],
-      versions: [1]
-    });
-  }
-});
-
 // Frontend configuration endpoint
 appRouter.get('/config', (_req: Request, res: Response, next: NextFunction): void => {
   try {
@@ -106,8 +86,8 @@ appRouter.get('/config', (_req: Request, res: Response, next: NextFunction): voi
   }
 });
 
-// v1 Router
-appRouter.use(config.get('server.apiPath'), v1Router);
+// Base API Directory
+appRouter.use('/api', router);
 
 // Host the static frontend assets
 // This route assumes being executed from '/sbin'

app/config/default.json

@@ -3,7 +3,7 @@
     "apiPath": "api/v1"
   },
   "server": {
-    "apiPath": "/api/v1",
+    "apiPath": "/v1",
     "bodyLimit": "30mb",
     "db": {
       "database": "pcns",