@lark-apaas/fullstack-nestjs-core 1.0.3-alpha.2 → 1.0.3-alpha.3

package/dist/index.cjs

@@ -13510,7 +13510,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/modules/platform/module.ts
-var import_common3 = require("@nestjs/common");
+var import_common5 = require("@nestjs/common");
 var import_core = require("@nestjs/core");
 var import_config2 = __toESM(require_config2(), 1);
 var import_nestjs_logger = require("@lark-apaas/nestjs-logger");
@@ -13621,6 +13621,101 @@ CsrfMiddleware = _ts_decorate2([
   (0, import_common2.Injectable)()
 ], CsrfMiddleware);
 
+// src/middlewares/view-context/index.ts
+var import_common3 = require("@nestjs/common");
+function _ts_decorate3(decorators, target, key, desc) {
+  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+__name(_ts_decorate3, "_ts_decorate");
+var ViewContextMiddleware = class {
+  static {
+    __name(this, "ViewContextMiddleware");
+  }
+  use(req, res, next) {
+    const { userId, tenantId, appId } = req.userContext;
+    const csrfToken = req.csrfToken;
+    res.locals = {
+      csrfToken: csrfToken ?? "",
+      userId: userId ?? "",
+      tenantId: tenantId ?? "",
+      appId: appId ?? "",
+      ...res.locals
+    };
+    next();
+  }
+};
+ViewContextMiddleware = _ts_decorate3([
+  (0, import_common3.Injectable)()
+], ViewContextMiddleware);
+
+// src/middlewares/csrf_token/index.ts
+var import_common4 = require("@nestjs/common");
+
+// src/middlewares/csrf_token/helper.ts
+var import_crypto = __toESM(require("crypto"), 1);
+function resolveCsrfTokenOptions(options) {
+  return {
+    ...options,
+    cookieKey: options.cookieKey ?? "suda-csrf-token",
+    cookieMaxAge: options.cookieMaxAge ?? 1e3 * 60 * 60 * 24 * 30,
+    cookiePath: options.cookiePath ?? "/"
+  };
+}
+__name(resolveCsrfTokenOptions, "resolveCsrfTokenOptions");
+function genToken() {
+  const ts = Math.floor(Date.now() / 1e3);
+  const randInt64 = BigInt("0x" + import_crypto.default.randomBytes(8).toString("hex")).toString();
+  const s = `${randInt64}.${ts}`;
+  const sha1 = import_crypto.default.createHash("sha1");
+  sha1.update(s);
+  return `${sha1.digest("hex")}-${ts}`;
+}
+__name(genToken, "genToken");
+
+// src/middlewares/csrf_token/index.ts
+function _ts_decorate4(decorators, target, key, desc) {
+  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+__name(_ts_decorate4, "_ts_decorate");
+var CsrfTokenMiddleware = class _CsrfTokenMiddleware {
+  static {
+    __name(this, "CsrfTokenMiddleware");
+  }
+  static options = resolveCsrfTokenOptions({});
+  static configure(opts) {
+    this.options = resolveCsrfTokenOptions(opts);
+  }
+  use(req, res, next) {
+    const { cookieKey, cookieMaxAge, cookiePath } = _CsrfTokenMiddleware.options;
+    const originToken = req.cookies[cookieKey.toLowerCase()];
+    if (originToken) {
+      req.csrfToken = originToken;
+      next();
+    } else {
+      const token = genToken();
+      req.csrfToken = token;
+      res.cookie(cookieKey, token, {
+        maxAge: cookieMaxAge,
+        path: cookiePath,
+        httpOnly: true,
+        secure: true,
+        sameSite: "none",
+        partitioned: true
+      });
+      next();
+    }
+  }
+};
+CsrfTokenMiddleware = _ts_decorate4([
+  (0, import_common4.Injectable)()
+], CsrfTokenMiddleware);
+
 // src/modules/platform/config/app.config.ts
 var import_config = __toESM(require_config2(), 1);
 var NAMESPACE = "app";
@@ -13634,13 +13729,13 @@ var app_config_default = (0, import_config.registerAs)(NAMESPACE, () => {
 });
 
 // src/modules/platform/module.ts
-function _ts_decorate3(decorators, target, key, desc) {
+function _ts_decorate5(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name(_ts_decorate3, "_ts_decorate");
+__name(_ts_decorate5, "_ts_decorate");
 var PLATFORM_MODULE_OPTIONS = "PLATFORM_MODULE_OPTIONS";
 var PlatformModule = class _PlatformModule {
   static {
@@ -13700,7 +13795,7 @@ var PlatformModule = class _PlatformModule {
         },
         {
           provide: import_core.APP_PIPE,
-          useClass: import_common3.ValidationPipe
+          useClass: import_common5.ValidationPipe
         }
       ],
       exports: [
@@ -13715,6 +13810,7 @@ var PlatformModule = class _PlatformModule {
   configure(consumer) {
     const options = _PlatformModule.moduleOptions;
     consumer.apply(UserContextMiddleware, import_nestjs_logger.LoggerContextMiddleware, import_nestjs_datapaas.SqlExecutionContextMiddleware).forRoutes("/*");
+    consumer.apply(CsrfTokenMiddleware, ViewContextMiddleware).exclude("/api/*");
     if (options.enableCsrf !== false) {
       const csrfRoutes = options.csrfRoutes || "/api/*";
       if (Array.isArray(csrfRoutes)) {
@@ -13727,9 +13823,9 @@ var PlatformModule = class _PlatformModule {
     }
   }
 };
-PlatformModule = _ts_decorate3([
-  (0, import_common3.Global)(),
-  (0, import_common3.Module)({})
+PlatformModule = _ts_decorate5([
+  (0, import_common5.Global)(),
+  (0, import_common5.Module)({})
 ], PlatformModule);
 
 // src/setup.ts
@@ -13840,71 +13936,6 @@ async function configureApp(app, options) {
   }
 }
 __name(configureApp, "configureApp");
-
-// src/middlewares/csrf_token/index.ts
-var import_common4 = require("@nestjs/common");
-
-// src/middlewares/csrf_token/helper.ts
-var import_crypto = __toESM(require("crypto"), 1);
-function resolveCsrfTokenOptions(options) {
-  return {
-    ...options,
-    cookieKey: options.cookieKey ?? "suda-csrf-token",
-    cookieMaxAge: options.cookieMaxAge ?? 1e3 * 60 * 60 * 24 * 30,
-    cookiePath: options.cookiePath ?? "/"
-  };
-}
-__name(resolveCsrfTokenOptions, "resolveCsrfTokenOptions");
-function genToken() {
-  const ts = Math.floor(Date.now() / 1e3);
-  const randInt64 = BigInt("0x" + import_crypto.default.randomBytes(8).toString("hex")).toString();
-  const s = `${randInt64}.${ts}`;
-  const sha1 = import_crypto.default.createHash("sha1");
-  sha1.update(s);
-  return `${sha1.digest("hex")}-${ts}`;
-}
-__name(genToken, "genToken");
-
-// src/middlewares/csrf_token/index.ts
-function _ts_decorate4(decorators, target, key, desc) {
-  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-  return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-__name(_ts_decorate4, "_ts_decorate");
-var CsrfTokenMiddleware = class _CsrfTokenMiddleware {
-  static {
-    __name(this, "CsrfTokenMiddleware");
-  }
-  static options = resolveCsrfTokenOptions({});
-  static configure(opts) {
-    this.options = resolveCsrfTokenOptions(opts);
-  }
-  use(req, res, next) {
-    const { cookieKey, cookieMaxAge, cookiePath } = _CsrfTokenMiddleware.options;
-    const originToken = req.cookies[cookieKey.toLowerCase()];
-    if (originToken) {
-      req.csrfToken = originToken;
-      next();
-    } else {
-      const token = genToken();
-      req.csrfToken = token;
-      res.cookie(cookieKey, token, {
-        maxAge: cookieMaxAge,
-        path: cookiePath,
-        httpOnly: true,
-        secure: true,
-        sameSite: "none",
-        partitioned: true
-      });
-      next();
-    }
-  }
-};
-CsrfTokenMiddleware = _ts_decorate4([
-  (0, import_common4.Injectable)()
-], CsrfTokenMiddleware);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CsrfMiddleware,

package/dist/index.js

@@ -13609,6 +13609,101 @@ CsrfMiddleware = _ts_decorate2([
   Injectable2()
 ], CsrfMiddleware);
 
+// src/middlewares/view-context/index.ts
+import { Injectable as Injectable3 } from "@nestjs/common";
+function _ts_decorate3(decorators, target, key, desc) {
+  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+__name(_ts_decorate3, "_ts_decorate");
+var ViewContextMiddleware = class {
+  static {
+    __name(this, "ViewContextMiddleware");
+  }
+  use(req, res, next) {
+    const { userId, tenantId, appId } = req.userContext;
+    const csrfToken = req.csrfToken;
+    res.locals = {
+      csrfToken: csrfToken ?? "",
+      userId: userId ?? "",
+      tenantId: tenantId ?? "",
+      appId: appId ?? "",
+      ...res.locals
+    };
+    next();
+  }
+};
+ViewContextMiddleware = _ts_decorate3([
+  Injectable3()
+], ViewContextMiddleware);
+
+// src/middlewares/csrf_token/index.ts
+import { Injectable as Injectable4 } from "@nestjs/common";
+
+// src/middlewares/csrf_token/helper.ts
+import crypto from "crypto";
+function resolveCsrfTokenOptions(options) {
+  return {
+    ...options,
+    cookieKey: options.cookieKey ?? "suda-csrf-token",
+    cookieMaxAge: options.cookieMaxAge ?? 1e3 * 60 * 60 * 24 * 30,
+    cookiePath: options.cookiePath ?? "/"
+  };
+}
+__name(resolveCsrfTokenOptions, "resolveCsrfTokenOptions");
+function genToken() {
+  const ts = Math.floor(Date.now() / 1e3);
+  const randInt64 = BigInt("0x" + crypto.randomBytes(8).toString("hex")).toString();
+  const s = `${randInt64}.${ts}`;
+  const sha1 = crypto.createHash("sha1");
+  sha1.update(s);
+  return `${sha1.digest("hex")}-${ts}`;
+}
+__name(genToken, "genToken");
+
+// src/middlewares/csrf_token/index.ts
+function _ts_decorate4(decorators, target, key, desc) {
+  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+__name(_ts_decorate4, "_ts_decorate");
+var CsrfTokenMiddleware = class _CsrfTokenMiddleware {
+  static {
+    __name(this, "CsrfTokenMiddleware");
+  }
+  static options = resolveCsrfTokenOptions({});
+  static configure(opts) {
+    this.options = resolveCsrfTokenOptions(opts);
+  }
+  use(req, res, next) {
+    const { cookieKey, cookieMaxAge, cookiePath } = _CsrfTokenMiddleware.options;
+    const originToken = req.cookies[cookieKey.toLowerCase()];
+    if (originToken) {
+      req.csrfToken = originToken;
+      next();
+    } else {
+      const token = genToken();
+      req.csrfToken = token;
+      res.cookie(cookieKey, token, {
+        maxAge: cookieMaxAge,
+        path: cookiePath,
+        httpOnly: true,
+        secure: true,
+        sameSite: "none",
+        partitioned: true
+      });
+      next();
+    }
+  }
+};
+CsrfTokenMiddleware = _ts_decorate4([
+  Injectable4()
+], CsrfTokenMiddleware);
+
 // src/modules/platform/config/app.config.ts
 var import_config = __toESM(require_config2(), 1);
 var NAMESPACE = "app";
@@ -13622,13 +13717,13 @@ var app_config_default = (0, import_config.registerAs)(NAMESPACE, () => {
 });
 
 // src/modules/platform/module.ts
-function _ts_decorate3(decorators, target, key, desc) {
+function _ts_decorate5(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-__name(_ts_decorate3, "_ts_decorate");
+__name(_ts_decorate5, "_ts_decorate");
 var PLATFORM_MODULE_OPTIONS = "PLATFORM_MODULE_OPTIONS";
 var PlatformModule = class _PlatformModule {
   static {
@@ -13703,6 +13798,7 @@ var PlatformModule = class _PlatformModule {
   configure(consumer) {
     const options = _PlatformModule.moduleOptions;
     consumer.apply(UserContextMiddleware, LoggerContextMiddleware, SqlExecutionContextMiddleware).forRoutes("/*");
+    consumer.apply(CsrfTokenMiddleware, ViewContextMiddleware).exclude("/api/*");
     if (options.enableCsrf !== false) {
       const csrfRoutes = options.csrfRoutes || "/api/*";
       if (Array.isArray(csrfRoutes)) {
@@ -13715,7 +13811,7 @@ var PlatformModule = class _PlatformModule {
     }
   }
 };
-PlatformModule = _ts_decorate3([
+PlatformModule = _ts_decorate5([
   Global(),
   Module({})
 ], PlatformModule);
@@ -13828,71 +13924,6 @@ async function configureApp(app, options) {
   }
 }
 __name(configureApp, "configureApp");
-
-// src/middlewares/csrf_token/index.ts
-import { Injectable as Injectable3 } from "@nestjs/common";
-
-// src/middlewares/csrf_token/helper.ts
-import crypto from "crypto";
-function resolveCsrfTokenOptions(options) {
-  return {
-    ...options,
-    cookieKey: options.cookieKey ?? "suda-csrf-token",
-    cookieMaxAge: options.cookieMaxAge ?? 1e3 * 60 * 60 * 24 * 30,
-    cookiePath: options.cookiePath ?? "/"
-  };
-}
-__name(resolveCsrfTokenOptions, "resolveCsrfTokenOptions");
-function genToken() {
-  const ts = Math.floor(Date.now() / 1e3);
-  const randInt64 = BigInt("0x" + crypto.randomBytes(8).toString("hex")).toString();
-  const s = `${randInt64}.${ts}`;
-  const sha1 = crypto.createHash("sha1");
-  sha1.update(s);
-  return `${sha1.digest("hex")}-${ts}`;
-}
-__name(genToken, "genToken");
-
-// src/middlewares/csrf_token/index.ts
-function _ts_decorate4(decorators, target, key, desc) {
-  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-  return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-__name(_ts_decorate4, "_ts_decorate");
-var CsrfTokenMiddleware = class _CsrfTokenMiddleware {
-  static {
-    __name(this, "CsrfTokenMiddleware");
-  }
-  static options = resolveCsrfTokenOptions({});
-  static configure(opts) {
-    this.options = resolveCsrfTokenOptions(opts);
-  }
-  use(req, res, next) {
-    const { cookieKey, cookieMaxAge, cookiePath } = _CsrfTokenMiddleware.options;
-    const originToken = req.cookies[cookieKey.toLowerCase()];
-    if (originToken) {
-      req.csrfToken = originToken;
-      next();
-    } else {
-      const token = genToken();
-      req.csrfToken = token;
-      res.cookie(cookieKey, token, {
-        maxAge: cookieMaxAge,
-        path: cookiePath,
-        httpOnly: true,
-        secure: true,
-        sameSite: "none",
-        partitioned: true
-      });
-      next();
-    }
-  }
-};
-CsrfTokenMiddleware = _ts_decorate4([
-  Injectable3()
-], CsrfTokenMiddleware);
 export {
   CsrfMiddleware,
   CsrfTokenMiddleware,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-nestjs-core",
-  "version": "1.0.3-alpha.2",
+  "version": "1.0.3-alpha.3",
   "description": "FullStack Nestjs Core",
   "type": "module",
   "main": "./dist/index.js",
@@ -19,7 +19,9 @@
     "node": ">=18.0.0"
   },
   "files": [
-    "dist"
+    "dist",
+    "templates",
+    "postinstall.config.mjs"
   ],
   "exports": {
     ".": {
@@ -38,6 +40,7 @@
     "lint:fix": "eslint src --ext .ts --fix"
   },
   "dependencies": {
+    "@lark-apaas/fullstack-cli": "workspace:*",
     "@lark-apaas/nestjs-authnpaas": "^1.0.0",
     "@lark-apaas/nestjs-datapaas": "^1.0.1",
     "@lark-apaas/nestjs-logger": "^1.0.0",