@lark-apaas/fullstack-nestjs-core 1.1.34-alpha.7 → 1.1.34-alpha.71

package/dist/index.cjs

@@ -20771,9 +20771,9 @@ var require_safe_buffer = __commonJS({
   }
 });
 
-// ../../../node_modules/express/node_modules/content-disposition/index.js
+// ../../../node_modules/content-disposition/index.js
 var require_content_disposition = __commonJS({
-  "../../../node_modules/express/node_modules/content-disposition/index.js"(exports2, module2) {
+  "../../../node_modules/content-disposition/index.js"(exports2, module2) {
     "use strict";
     module2.exports = contentDisposition;
     module2.exports.parse = parse;
@@ -34404,7 +34404,10 @@ var require_express2 = __commonJS({
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
+  AuthZPaasModule: () => import_nestjs_authzpaas2.AuthZPaasModule,
+  AuthorizationSDK: () => import_nestjs_authzpaas2.AuthorizationSDK,
   AutoTrace: () => import_nestjs_common8.AutoTrace,
+  Can: () => import_nestjs_authzpaas2.Can,
   CanRole: () => import_nestjs_authzpaas2.CanRole,
   CsrfMiddleware: () => CsrfMiddleware,
   CsrfTokenMiddleware: () => CsrfTokenMiddleware,
@@ -34413,6 +34416,7 @@ __export(index_exports, {
   FileService: () => FileService,
   HtmlHotUpdateModule: () => HtmlHotUpdateModule,
   HtmlHotUpdateService: () => HtmlHotUpdateService,
+  PERMISSION_RESOLVER_TOKEN: () => import_nestjs_authzpaas2.PERMISSION_RESOLVER_TOKEN,
   PlatformHttpClientService: () => PlatformHttpClientService,
   PlatformModule: () => PlatformModule,
   StaticModule: () => StaticModule,
@@ -34769,18 +34773,24 @@ function createApiNotFoundResponse(req) {
   };
 }
 __name(createApiNotFoundResponse, "createApiNotFoundResponse");
-function getApiPathPrefix() {
+function getApiPathPrefixes() {
   const globalPrefix = process.env.CLIENT_BASE_PATH ?? "";
   if (!globalPrefix) {
-    return "/api/";
+    return [
+      "/api/",
+      "/openapi/"
+    ];
   }
   const normalizedPrefix = globalPrefix.replace(/\/+$/, "");
-  return `${normalizedPrefix}/api/`;
+  return [
+    `${normalizedPrefix}/api/`,
+    `${normalizedPrefix}/openapi/`
+  ];
 }
-__name(getApiPathPrefix, "getApiPathPrefix");
+__name(getApiPathPrefixes, "getApiPathPrefixes");
 function apiResponseInterceptor(req, res, next) {
-  const apiPrefix = getApiPathPrefix();
-  if (!req.baseUrl.startsWith(apiPrefix)) {
+  const apiPrefixes = getApiPathPrefixes();
+  if (!apiPrefixes.some((prefix) => req.baseUrl.startsWith(prefix))) {
     return next();
   }
   res.render = function() {
@@ -34816,6 +34826,8 @@ var RequestContextMiddleware = class {
     const path2 = req.originalUrl ?? req.url;
     const userContext = req.userContext ?? {};
     const ttEnv = req.headers["x-tt-env"];
+    const rawPageRoute = req.get("X-Page-Route");
+    const pageRoute = (0, import_nestjs_common2.stripBasePath)(rawPageRoute, process.env.CLIENT_BASE_PATH) ?? void 0;
     const refererPath = req.headers["rpc-persist-apaas-observability-referer-path"];
     const observabilityApi = req.headers["rpc-persist-apaas-observability-api"];
     this.requestContext.run({
@@ -34826,6 +34838,7 @@ var RequestContextMiddleware = class {
       appId: userContext.appId,
       isSystemAccount: userContext.isSystemAccount,
       ttEnv,
+      pageRoute,
       refererPath,
       observabilityApi
     }, () => next());
@@ -36344,13 +36357,16 @@ var PlatformModule = class _PlatformModule {
               };
               return {
                 connectionString: configService.get("app.databaseUrl") ?? "",
-                logger: drizzleLogger
+                logger: drizzleLogger,
+                connectionTokenFilePath: "/var/run/secrets/zti/credential"
               };
             }, "useFactory")
           })
         ],
         import_nestjs_authnpaas.AuthNPaasModule.forRoot(),
-        import_nestjs_authzpaas.AuthZPaasModule.forRoot(),
+        import_nestjs_authzpaas.AuthZPaasModule.forRoot({
+          ...options.authz || {}
+        }),
         import_nestjs_trigger.AutomationModule.forRoot(),
         import_nestjs_capability.CapabilityModule.forRoot({
           capabilitiesDir: options.capabilitiesDir,
@@ -36427,16 +36443,18 @@ var PlatformModule = class _PlatformModule {
   */
   configure(consumer) {
     const options = _PlatformModule.moduleOptions;
-    consumer.apply(apiResponseInterceptor).forRoutes("/api/*");
+    consumer.apply(apiResponseInterceptor).forRoutes("/api/*", "/openapi/*");
     if (process.env.NODE_ENV === "development") {
       consumer.apply(FrameworkDebugMiddleware).forRoutes("/api/__framework__/debug");
     }
     consumer.apply(UserContextMiddleware, RequestContextMiddleware, import_nestjs_logger2.LoggerContextMiddleware, import_nestjs_observable.ObservableTraceMiddleware, ...DISABLE_DATAPASS ? [] : [
       import_nestjs_datapaas.SqlExecutionContextMiddleware
     ]).forRoutes("/*");
-    consumer.apply(CsrfTokenMiddleware, ViewContextMiddleware, HtmlHotUpdateViewMiddleware).exclude("/api/(.*)", "/static/(.*)").forRoutes("*");
+    consumer.apply(CsrfTokenMiddleware, ViewContextMiddleware, HtmlHotUpdateViewMiddleware).exclude("/api/(.*)", "/openapi/(.*)", "/static/(.*)").forRoutes("*");
     if (options.enableCsrf !== false) {
-      const csrfRoutes = options.csrfRoutes || "/api/*";
+      const csrfRoutes = options.csrfRoutes || [
+        "/api/*"
+      ];
       if (Array.isArray(csrfRoutes)) {
         csrfRoutes.forEach((route) => {
           consumer.apply(CsrfMiddleware).forRoutes(route);
@@ -36541,7 +36559,10 @@ var import_nestjs_common8 = require("@lark-apaas/nestjs-common");
 var import_nestjs_authzpaas2 = require("@lark-apaas/nestjs-authzpaas");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  AuthZPaasModule,
+  AuthorizationSDK,
   AutoTrace,
+  Can,
   CanRole,
   CsrfMiddleware,
   CsrfTokenMiddleware,
@@ -36550,6 +36571,7 @@ var import_nestjs_authzpaas2 = require("@lark-apaas/nestjs-authzpaas");
   FileService,
   HtmlHotUpdateModule,
   HtmlHotUpdateService,
+  PERMISSION_RESOLVER_TOKEN,
   PlatformHttpClientService,
   PlatformModule,
   StaticModule,

package/dist/index.d.cts

@@ -1,5 +1,7 @@
 import { NestModule, DynamicModule, MiddlewareConsumer, OnModuleInit, NestMiddleware } from '@nestjs/common';
 import { HttpClientConfig, PlatformPluginOptions, HttpClient } from '@lark-apaas/http-client';
+import { AuthZPaasModuleOptions } from '@lark-apaas/nestjs-authzpaas';
+export { AddMembersParams, AuthZPaasModule, AuthorizationSDK, Can, CanRole, ChatSimpleDTO, CommonParam, CreateRoleParams, CreateRoleResponse, DepartmentDTO, DepartmentEntity, DepartmentSimpleDTO, FilterParams, ForceRoleDTO, I18nText, IPermissionResolver, ListMembersParams, ListMembersResponse, ListRolesParams, MemberMutationData, MemberType, PERMISSION_RESOLVER_TOKEN, PermissionPoint, PermissionRequirement, PresetGroupDTO, RemoveMembersParams, RoleMemberDTO, SearchChatEntity, SearchParams, SearchResponse, SearchResult, SearchUserEntity, UpdateRoleParams, UserSimpleDTO } from '@lark-apaas/nestjs-authzpaas';
 import { NestExpressApplication } from '@nestjs/platform-express';
 import { PlatformHttpClient, RequestContextService, ObservableService } from '@lark-apaas/nestjs-common';
 export { AutoTrace } from '@lark-apaas/nestjs-common';
@@ -13,7 +15,6 @@ export * from '@lark-apaas/nestjs-capability';
 export * from '@lark-apaas/nestjs-datapaas';
 export * from '@lark-apaas/nestjs-observable';
 export * from '@lark-apaas/nestjs-trigger';
-export { CanRole } from '@lark-apaas/nestjs-authzpaas';
 
 declare global {
   namespace Express {
@@ -72,6 +73,11 @@ interface PlatformModuleOptions {
      * 默认: server/capabilities
      */
     capabilitiesDir?: string;
+    /**
+     * AuthZPaas 模块配置
+     * 可传入 permissionResolver 等选项，透传给 AuthZPaasModule.forRoot()
+     */
+    authz?: AuthZPaasModuleOptions;
 }
 
 declare class PlatformModule implements NestModule {

package/dist/index.d.ts

@@ -1,5 +1,7 @@
 import { NestModule, DynamicModule, MiddlewareConsumer, OnModuleInit, NestMiddleware } from '@nestjs/common';
 import { HttpClientConfig, PlatformPluginOptions, HttpClient } from '@lark-apaas/http-client';
+import { AuthZPaasModuleOptions } from '@lark-apaas/nestjs-authzpaas';
+export { AddMembersParams, AuthZPaasModule, AuthorizationSDK, Can, CanRole, ChatSimpleDTO, CommonParam, CreateRoleParams, CreateRoleResponse, DepartmentDTO, DepartmentEntity, DepartmentSimpleDTO, FilterParams, ForceRoleDTO, I18nText, IPermissionResolver, ListMembersParams, ListMembersResponse, ListRolesParams, MemberMutationData, MemberType, PERMISSION_RESOLVER_TOKEN, PermissionPoint, PermissionRequirement, PresetGroupDTO, RemoveMembersParams, RoleMemberDTO, SearchChatEntity, SearchParams, SearchResponse, SearchResult, SearchUserEntity, UpdateRoleParams, UserSimpleDTO } from '@lark-apaas/nestjs-authzpaas';
 import { NestExpressApplication } from '@nestjs/platform-express';
 import { PlatformHttpClient, RequestContextService, ObservableService } from '@lark-apaas/nestjs-common';
 export { AutoTrace } from '@lark-apaas/nestjs-common';
@@ -13,7 +15,6 @@ export * from '@lark-apaas/nestjs-capability';
 export * from '@lark-apaas/nestjs-datapaas';
 export * from '@lark-apaas/nestjs-observable';
 export * from '@lark-apaas/nestjs-trigger';
-export { CanRole } from '@lark-apaas/nestjs-authzpaas';
 
 declare global {
   namespace Express {
@@ -72,6 +73,11 @@ interface PlatformModuleOptions {
      * 默认: server/capabilities
      */
     capabilitiesDir?: string;
+    /**
+     * AuthZPaas 模块配置
+     * 可传入 permissionResolver 等选项，透传给 AuthZPaasModule.forRoot()
+     */
+    authz?: AuthZPaasModuleOptions;
 }
 
 declare class PlatformModule implements NestModule {

package/dist/index.js

@@ -20770,9 +20770,9 @@ var require_safe_buffer = __commonJS({
   }
 });
 
-// ../../../node_modules/express/node_modules/content-disposition/index.js
+// ../../../node_modules/content-disposition/index.js
 var require_content_disposition = __commonJS({
-  "../../../node_modules/express/node_modules/content-disposition/index.js"(exports, module) {
+  "../../../node_modules/content-disposition/index.js"(exports, module) {
     "use strict";
     module.exports = contentDisposition;
     module.exports.parse = parse;
@@ -34746,18 +34746,24 @@ function createApiNotFoundResponse(req) {
   };
 }
 __name(createApiNotFoundResponse, "createApiNotFoundResponse");
-function getApiPathPrefix() {
+function getApiPathPrefixes() {
   const globalPrefix = process.env.CLIENT_BASE_PATH ?? "";
   if (!globalPrefix) {
-    return "/api/";
+    return [
+      "/api/",
+      "/openapi/"
+    ];
   }
   const normalizedPrefix = globalPrefix.replace(/\/+$/, "");
-  return `${normalizedPrefix}/api/`;
+  return [
+    `${normalizedPrefix}/api/`,
+    `${normalizedPrefix}/openapi/`
+  ];
 }
-__name(getApiPathPrefix, "getApiPathPrefix");
+__name(getApiPathPrefixes, "getApiPathPrefixes");
 function apiResponseInterceptor(req, res, next) {
-  const apiPrefix = getApiPathPrefix();
-  if (!req.baseUrl.startsWith(apiPrefix)) {
+  const apiPrefixes = getApiPathPrefixes();
+  if (!apiPrefixes.some((prefix) => req.baseUrl.startsWith(prefix))) {
     return next();
   }
   res.render = function() {
@@ -34769,7 +34775,7 @@ __name(apiResponseInterceptor, "apiResponseInterceptor");
 
 // src/middlewares/request-context/index.ts
 import { Injectable as Injectable5 } from "@nestjs/common";
-import { RequestContextService } from "@lark-apaas/nestjs-common";
+import { RequestContextService, stripBasePath } from "@lark-apaas/nestjs-common";
 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);
@@ -34793,6 +34799,8 @@ var RequestContextMiddleware = class {
     const path2 = req.originalUrl ?? req.url;
     const userContext = req.userContext ?? {};
     const ttEnv = req.headers["x-tt-env"];
+    const rawPageRoute = req.get("X-Page-Route");
+    const pageRoute = stripBasePath(rawPageRoute, process.env.CLIENT_BASE_PATH) ?? void 0;
     const refererPath = req.headers["rpc-persist-apaas-observability-referer-path"];
     const observabilityApi = req.headers["rpc-persist-apaas-observability-api"];
     this.requestContext.run({
@@ -34803,6 +34811,7 @@ var RequestContextMiddleware = class {
       appId: userContext.appId,
       isSystemAccount: userContext.isSystemAccount,
       ttEnv,
+      pageRoute,
       refererPath,
       observabilityApi
     }, () => next());
@@ -36321,13 +36330,16 @@ var PlatformModule = class _PlatformModule {
               };
               return {
                 connectionString: configService.get("app.databaseUrl") ?? "",
-                logger: drizzleLogger
+                logger: drizzleLogger,
+                connectionTokenFilePath: "/var/run/secrets/zti/credential"
               };
             }, "useFactory")
           })
         ],
         AuthNPaasModule.forRoot(),
-        AuthZPaasModule.forRoot(),
+        AuthZPaasModule.forRoot({
+          ...options.authz || {}
+        }),
         AutomationModule.forRoot(),
         CapabilityModule.forRoot({
           capabilitiesDir: options.capabilitiesDir,
@@ -36404,16 +36416,18 @@ var PlatformModule = class _PlatformModule {
   */
   configure(consumer) {
     const options = _PlatformModule.moduleOptions;
-    consumer.apply(apiResponseInterceptor).forRoutes("/api/*");
+    consumer.apply(apiResponseInterceptor).forRoutes("/api/*", "/openapi/*");
     if (process.env.NODE_ENV === "development") {
       consumer.apply(FrameworkDebugMiddleware).forRoutes("/api/__framework__/debug");
     }
     consumer.apply(UserContextMiddleware, RequestContextMiddleware, LoggerContextMiddleware, ObservableTraceMiddleware, ...DISABLE_DATAPASS ? [] : [
       SqlExecutionContextMiddleware
     ]).forRoutes("/*");
-    consumer.apply(CsrfTokenMiddleware, ViewContextMiddleware, HtmlHotUpdateViewMiddleware).exclude("/api/(.*)", "/static/(.*)").forRoutes("*");
+    consumer.apply(CsrfTokenMiddleware, ViewContextMiddleware, HtmlHotUpdateViewMiddleware).exclude("/api/(.*)", "/openapi/(.*)", "/static/(.*)").forRoutes("*");
     if (options.enableCsrf !== false) {
-      const csrfRoutes = options.csrfRoutes || "/api/*";
+      const csrfRoutes = options.csrfRoutes || [
+        "/api/*"
+      ];
       if (Array.isArray(csrfRoutes)) {
         csrfRoutes.forEach((route) => {
           consumer.apply(CsrfMiddleware).forRoutes(route);
@@ -36515,9 +36529,12 @@ export * from "@lark-apaas/nestjs-observable";
 export * from "@lark-apaas/nestjs-trigger";
 export * from "@lark-apaas/file-service";
 import { AutoTrace } from "@lark-apaas/nestjs-common";
-import { CanRole } from "@lark-apaas/nestjs-authzpaas";
+import { AuthZPaasModule as AuthZPaasModule2, CanRole, Can, AuthorizationSDK, PERMISSION_RESOLVER_TOKEN } from "@lark-apaas/nestjs-authzpaas";
 export {
+  AuthZPaasModule2 as AuthZPaasModule,
+  AuthorizationSDK,
   AutoTrace,
+  Can,
   CanRole,
   CsrfMiddleware,
   CsrfTokenMiddleware,
@@ -36526,6 +36543,7 @@ export {
   FileService,
   HtmlHotUpdateModule,
   HtmlHotUpdateService,
+  PERMISSION_RESOLVER_TOKEN,
   PlatformHttpClientService,
   PlatformModule,
   StaticModule,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-nestjs-core",
-  "version": "1.1.34-alpha.7",
+  "version": "1.1.34-alpha.71",
   "description": "FullStack Nestjs Core",
   "type": "module",
   "main": "./dist/index.js",
@@ -41,15 +41,15 @@
   "dependencies": {
     "@lark-apaas/file-service": "^0.1.2",
     "@lark-apaas/http-client": "^0.1.2",
-    "@lark-apaas/nestjs-authnpaas": "^1.0.2",
-    "@lark-apaas/nestjs-authzpaas": "0.1.2-alpha.30",
-    "@lark-apaas/nestjs-capability": "0.1.5-alpha.47",
-    "@lark-apaas/nestjs-common": "0.1.4-alpha.30",
-    "@lark-apaas/nestjs-datapaas": "1.0.10-alpha.37",
-    "@lark-apaas/nestjs-logger": "1.0.10-alpha.50",
-    "@lark-apaas/nestjs-observable": "0.0.5-alpha.36",
+    "@lark-apaas/nestjs-authnpaas": "^1.0.3",
+    "@lark-apaas/nestjs-authzpaas": "^0.1.8",
+    "@lark-apaas/nestjs-capability": "^0.1.11",
+    "@lark-apaas/nestjs-common": "^0.1.8",
+    "@lark-apaas/nestjs-datapaas": "^1.0.18",
+    "@lark-apaas/nestjs-logger": "^1.0.16",
+    "@lark-apaas/nestjs-observable": "^0.0.11",
     "@lark-apaas/nestjs-openapi-devtools": "^1.0.10",
-    "@lark-apaas/nestjs-trigger": "0.0.2-alpha.7",
+    "@lark-apaas/nestjs-trigger": "^0.0.3",
     "@nestjs/axios": "^4.0.1",
     "axios": "^1.13.2",
     "cookie-parser": "^1.4.7"