zyket 1.1.10 → 1.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zyket",
-  "version": "1.1.10",
+  "version": "1.2.1",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -22,6 +22,7 @@
     "cors": "^2.8.6",
     "dotenv": "^17.3.1",
     "express": "^5.2.1",
+    "express-basic-auth": "^1.2.1",
     "fast-glob": "^3.3.3",
     "mariadb": "^3.5.2",
     "minio": "^8.0.7",

package/src/extensions/bullboard/index.js

@@ -2,6 +2,7 @@ const Extension = require('../Extension');
 const { createBullBoard } = require('@bull-board/api')
 const { BullMQAdapter } = require('@bull-board/api/bullMQAdapter')
 const { ExpressAdapter } = require('@bull-board/express')
+const basicAuth = require('express-basic-auth')
 
 module.exports = class BullBoardExtension  extends Extension {
   path;
@@ -23,6 +24,15 @@ module.exports = class BullBoardExtension  extends Extension {
     })
 
     const app = container.get('express').app()
-    app.use(this.path, serverAdapter.getRouter())
+    const middlewares = []
+
+    if (process.env.BULLBOARD_ADMIN_PASSWORD) {
+      middlewares.push(basicAuth({
+        users: { admin: process.env.BULLBOARD_ADMIN_PASSWORD },
+        challenge: true,
+      }))
+    }
+
+    app.use(this.path, ...middlewares, serverAdapter.getRouter())
   }
 }

package/src/services/express/Express.js

@@ -33,7 +33,7 @@ module.exports = class Express extends Service {
 
     const corsOptions = await this.#loadCorsOrCreateDefault();
 
-    this.#app.use(cors(corsOptions));
+    if(corsOptions) this.#app.use(cors(corsOptions));
 
     // Swagger setup
     const swaggerOptions = {
@@ -171,7 +171,7 @@ module.exports = class Express extends Service {
       this.#container.get('logger').info("No CORS configuration found. Creating default config/cors.js");
       fs.mkdirSync(path.join(process.cwd(), "config"), { recursive: true });
       this.#container.get('template-manager').installFile('default/config/cors', corsConfigPath);
-      corsOptions = { origin: '*' };
+      corsOptions = false;
     }
     return corsOptions;
   }