@hemia/core 0.0.7 → 0.0.10

package/dist/hemia-core.esm.js

@@ -322,6 +322,13 @@ class AppFactory {
         const app = express();
         app.use(express.json(options.jsonOptions));
         app.use(express.urlencoded({ extended: true, ...options.urlencodedOptions }));
+        if (plugins && Array.isArray(plugins) && plugins.length > 0) {
+            for (const plugin of plugins) {
+                if (plugin && typeof plugin === 'function') {
+                    await plugin(container);
+                }
+            }
+        }
         if (options.middlewares && Array.isArray(options.middlewares)) {
             options.middlewares.forEach(middleware => {
                 app.use(middleware);
@@ -344,20 +351,23 @@ class AppFactory {
             }
             next();
         });
-        if (plugins && Array.isArray(plugins) && plugins.length > 0) {
-            for (const plugin of plugins) {
-                if (plugin && typeof plugin === 'function') {
-                    await plugin(container);
-                }
-            }
-        }
         if (!container.isBound(Reflector)) {
             container.bind(Reflector).toSelf().inSingletonScope();
         }
         const autoControllerList = ControllerRegistry.getAll();
+        const validAutoControllers = autoControllerList.filter(controllerClass => {
+            if (container.isBound(controllerClass)) {
+                return true;
+            }
+            const isManual = Reflect.getMetadata(METADATA_KEYS.MANUAL_REGISTER, controllerClass);
+            if (isManual) {
+                return false;
+            }
+            return true;
+        });
         const controllers = Array.from(new Set([
             ...(options.controllers || []),
-            ...autoControllerList,
+            ...validAutoControllers,
         ]));
         controllers.forEach(controllerClass => {
             if (!container.isBound(controllerClass)) {
@@ -461,7 +471,11 @@ let JWTGuard = class JWTGuard {
     }
     async canActivate(context) {
         const request = context.switchToHttp().getRequest();
-        const sessionId = request.headers['x-session'] || request.cookies['x-session'];
+        const cookieName = process.env.AUTH_COOKIE_NAME;
+        if (!cookieName) {
+            return false;
+        }
+        const sessionId = request.headers[cookieName] || request.cookies?.[cookieName];
         if (!sessionId) {
             return false;
         }

package/dist/hemia-core.js

@@ -324,6 +324,13 @@ class AppFactory {
         const app = express();
         app.use(express.json(options.jsonOptions));
         app.use(express.urlencoded({ extended: true, ...options.urlencodedOptions }));
+        if (plugins && Array.isArray(plugins) && plugins.length > 0) {
+            for (const plugin of plugins) {
+                if (plugin && typeof plugin === 'function') {
+                    await plugin(container);
+                }
+            }
+        }
         if (options.middlewares && Array.isArray(options.middlewares)) {
             options.middlewares.forEach(middleware => {
                 app.use(middleware);
@@ -346,20 +353,23 @@ class AppFactory {
             }
             next();
         });
-        if (plugins && Array.isArray(plugins) && plugins.length > 0) {
-            for (const plugin of plugins) {
-                if (plugin && typeof plugin === 'function') {
-                    await plugin(container);
-                }
-            }
-        }
         if (!container.isBound(exports.Reflector)) {
             container.bind(exports.Reflector).toSelf().inSingletonScope();
         }
         const autoControllerList = common.ControllerRegistry.getAll();
+        const validAutoControllers = autoControllerList.filter(controllerClass => {
+            if (container.isBound(controllerClass)) {
+                return true;
+            }
+            const isManual = Reflect.getMetadata(common.METADATA_KEYS.MANUAL_REGISTER, controllerClass);
+            if (isManual) {
+                return false;
+            }
+            return true;
+        });
         const controllers = Array.from(new Set([
             ...(options.controllers || []),
-            ...autoControllerList,
+            ...validAutoControllers,
         ]));
         controllers.forEach(controllerClass => {
             if (!container.isBound(controllerClass)) {
@@ -463,7 +473,11 @@ exports.JWTGuard = class JWTGuard {
     }
     async canActivate(context) {
         const request = context.switchToHttp().getRequest();
-        const sessionId = request.headers['x-session'] || request.cookies['x-session'];
+        const cookieName = process.env.AUTH_COOKIE_NAME;
+        if (!cookieName) {
+            return false;
+        }
+        const sessionId = request.headers[cookieName] || request.cookies?.[cookieName];
         if (!sessionId) {
             return false;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hemia/core",
-  "version": "0.0.7",
+  "version": "0.0.10",
   "description": "Core utilities for Hemia projects",
   "main": "dist/hemia-core.js",
   "module": "dist/hemia-core.esm.js",
@@ -11,16 +11,17 @@
     "build": "npm run clean && npm run tscBuild",
     "test": "jest --detectOpenHandles",
     "test:coverage": "jest --coverage",
-    "test:watch": "jest --watch"
+    "test:watch": "jest --watch",
+    "prepublish": "npm run build"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^26.0.1",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
-    "@hemia/common": "^0.0.9",
+    "@hemia/common": "^0.0.14",
     "@hemia/app-context": "^0.0.6",
     "@hemia/trace-manager": "^0.0.9",
-    "@hemia/auth-sdk": "^0.0.10",
+    "@hemia/auth-sdk": "^0.0.13",
     "@types/express": "^5.0.5",
     "express": "^5.1.0",
     "inversify": "^7.10.4",