chore: k1ch / ensure seedKeysIfDbIsEmpty does not cause Unhandled Pro…

…mise Rejection
DMGT-TECH · Oct 8, 2024 · fb04a39 · fb04a39
1 parent ca9d6e7
commit fb04a39
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/database/package-lock.json b/database/package-lock.json
diff --git a/database/package.json b/database/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dmgt-tech/the-usher-server-database",
-  "version": "2.3.0-rc.2",
+  "version": "2.3.0-rc.3",
   "description": "Database layer for TheUsher",
   "scripts": {
     "test": "mocha --exit",

diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/server/package.json b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dmgt-tech/the-usher-server",
-  "version": "2.3.0-rc.2",
+  "version": "2.3.0-rc.3",
   "description": "The Usher Authorization Server",
   "engines": {
     "node": ">=18"

diff --git a/server/the-usher.js b/server/the-usher.js
@@ -16,7 +16,7 @@ const { verifyTokenForAdmin, verifyTokenForSelf, verifyTokenForClientAdmin } = r
 const winstonLogger = require('./src/logging/winston-logger')
 
 // Normalizes a port into a number, string, or false
-function normalizePort (val) {
+function normalizePort(val) {
   var port = parseInt(val, 10)
   if (isNaN(port)) {
     return val // named pipe
@@ -27,7 +27,7 @@ function normalizePort (val) {
   return false
 }
 
-async function seedKeysIfDbIsEmpty () {
+async function seedKeysIfDbIsEmpty() {
   if ((await keystore.selectAllKeys()).length === 0) {
     console.log('Note: There were no keys in the database generating and inserting a new key.')
     keygen.generateAndInsertNewKeys()
@@ -54,7 +54,7 @@ const optionsObject = {
   customErrorHandling: true
 }
 
-function preInitCheck () {
+function preInitCheck() {
   let missingKeyEnvVars = false
   if (!env.ISSUER_WHITELIST) {
     missingKeyEnvVars = true
@@ -115,7 +115,13 @@ expressApp.use(function (req, res, next) {
   res.status(405).send(notFoundResponse)
 })
 
-seedKeysIfDbIsEmpty()
+try {
+  if (process.env.SKIP_KEYS_CHECK === 'true') {
+    seedKeysIfDbIsEmpty()
+  }
+} catch (err) {
+  console.log(`Failed to seedKeysIfDbIsEmpty: ${JSON.stringify(err)}`)
+}
 
 module.exports = { 'the-usher': expressApp } // For deploying to GCP
 // For deploying to AWS Lambda