@lark-apaas/fullstack-nestjs-core 1.1.10-alpha.0 → 1.1.10-alpha.31

package/dist/index.cjs

@@ -32,6 +32,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
+  AutoTrace: () => import_nestjs_common5.AutoTrace,
+  CanRole: () => import_nestjs_authzpaas2.CanRole,
   CsrfMiddleware: () => CsrfMiddleware,
   CsrfTokenMiddleware: () => CsrfTokenMiddleware,
   DevToolsModule: () => import_nestjs_openapi_devtools2.DevToolsModule,
@@ -217,7 +219,7 @@ var ViewContextMiddleware = class _ViewContextMiddleware {
     }
   }
   async use(req, res, next) {
-    const { userId, tenantId, appId } = req.userContext;
+    const { userId, tenantId, appId, loginUrl, userType } = req.userContext;
     const csrfToken = req.csrfToken;
     const appInfo = await this.getAppInfo(appId);
     this.logger.debug(`appInfo: ${JSON.stringify(appInfo)}`);
@@ -228,6 +230,8 @@ var ViewContextMiddleware = class _ViewContextMiddleware {
       appName: appInfo?.app_name ?? "",
       appAvatar: appInfo?.app_avatar ?? "",
       appDescription: appInfo?.app_description ?? "",
+      loginUrl: loginUrl ?? "",
+      userType: userType ?? "",
       tenantId
     };
     res.locals = {
@@ -235,6 +239,8 @@ var ViewContextMiddleware = class _ViewContextMiddleware {
       csrfToken: csrfToken ?? "",
       userId: userId ?? "",
       tenantId: tenantId ?? "",
+      loginUrl: loginUrl ?? "",
+      userType: userType ?? "",
       appId: appId ?? "",
       appName: appInfo?.app_name ?? "\u5999\u642D\u5E94\u7528",
       appAvatar: appInfo?.app_avatar ?? "",
@@ -717,6 +723,7 @@ PlatformHttpClientService = _ts_decorate8([
 ], PlatformHttpClientService);
 
 // src/modules/platform/module.ts
+var import_nestjs_authzpaas = require("@lark-apaas/nestjs-authzpaas");
 function _ts_decorate9(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);
@@ -769,7 +776,9 @@ var PlatformModule = class _PlatformModule {
                 appLogger.log?.("SQL Query " + JSON.stringify({
                   query,
                   params
-                }), "Database");
+                }), {
+                  source_type: "platform"
+                }, "Database");
               }
             };
             return {
@@ -779,7 +788,8 @@ var PlatformModule = class _PlatformModule {
           }, "useFactory")
         }),
         import_nestjs_authnpaas.AuthNPaasModule.forRoot(),
-        import_nestjs_trigger.AutomationModule.forRoot()
+        import_nestjs_trigger.AutomationModule.forRoot(),
+        import_nestjs_authzpaas.AuthZPaasModule.forRoot()
       ],
       providers: [
         {
@@ -807,7 +817,11 @@ var PlatformModule = class _PlatformModule {
             PlatformHttpClientService
           ]
         },
-        HttpInterceptorService
+        HttpInterceptorService,
+        {
+          provide: import_core2.APP_INTERCEPTOR,
+          useClass: import_nestjs_observable.TraceInterceptor
+        }
       ],
       exports: [
         import_config2.ConfigModule,
@@ -827,7 +841,7 @@ var PlatformModule = class _PlatformModule {
     if (process.env.NODE_ENV === "development") {
       consumer.apply(FrameworkDebugMiddleware).forRoutes("/api/__framework__/debug");
     }
-    consumer.apply(UserContextMiddleware, RequestContextMiddleware, import_nestjs_logger2.LoggerContextMiddleware, import_nestjs_datapaas.SqlExecutionContextMiddleware).forRoutes("/*");
+    consumer.apply(UserContextMiddleware, RequestContextMiddleware, import_nestjs_logger2.LoggerContextMiddleware, import_nestjs_observable.ObservableTraceMiddleware, import_nestjs_datapaas.SqlExecutionContextMiddleware).forRoutes("/*");
     consumer.apply(CsrfTokenMiddleware, ViewContextMiddleware).exclude("/api/(.*)").forRoutes("*");
     if (options.enableCsrf !== false) {
       const csrfRoutes = options.csrfRoutes || "/api/*";
@@ -865,11 +879,11 @@ async function configureApp(app, perms = defaultPerms) {
         basePath: process.env.CLIENT_BASE_PATH,
         docsPath: "/api_docs"
       });
+      console.log("App Started Successfully.");
     } catch (err) {
       console.error("[OpenAPI] OpenAPI \u751F\u6210\u5931\u8D25:", err);
     }
   }
-  console.log("App Started Successfully.");
 }
 __name(configureApp, "configureApp");
 
@@ -879,8 +893,12 @@ __reExport(index_exports, require("@lark-apaas/nestjs-authnpaas"), module.export
 __reExport(index_exports, require("@lark-apaas/nestjs-datapaas"), module.exports);
 __reExport(index_exports, require("@lark-apaas/nestjs-observable"), module.exports);
 __reExport(index_exports, require("@lark-apaas/nestjs-trigger"), module.exports);
+var import_nestjs_common5 = 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 = {
+  AutoTrace,
+  CanRole,
   CsrfMiddleware,
   CsrfTokenMiddleware,
   DevToolsModule,

package/dist/index.d.cts

@@ -4,10 +4,12 @@ import { NestExpressApplication } from '@nestjs/platform-express';
 export { DevToolsModule, DevToolsOptions, DevToolsV2Module, DevToolsV2Options } from '@lark-apaas/nestjs-openapi-devtools';
 import { Request, Response, NextFunction } from 'express';
 import { PlatformHttpClient } from '@lark-apaas/nestjs-common';
+export { AutoTrace } from '@lark-apaas/nestjs-common';
 export * from '@lark-apaas/nestjs-authnpaas';
 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 {

package/dist/index.d.ts

@@ -4,10 +4,12 @@ import { NestExpressApplication } from '@nestjs/platform-express';
 export { DevToolsModule, DevToolsOptions, DevToolsV2Module, DevToolsV2Options } from '@lark-apaas/nestjs-openapi-devtools';
 import { Request, Response, NextFunction } from 'express';
 import { PlatformHttpClient } from '@lark-apaas/nestjs-common';
+export { AutoTrace } from '@lark-apaas/nestjs-common';
 export * from '@lark-apaas/nestjs-authnpaas';
 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 {

package/dist/index.js

@@ -3,10 +3,10 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
 
 // src/modules/platform/module.ts
 import { Global, Module, ValidationPipe } from "@nestjs/common";
-import { APP_PIPE } from "@nestjs/core";
+import { APP_INTERCEPTOR, APP_PIPE } from "@nestjs/core";
 import { CommonModule, OBSERVABLE_SERVICE } from "@lark-apaas/nestjs-common";
 import { ConfigModule, ConfigService } from "@nestjs/config";
-import { NestjsObservableModule as ObservableModule, Observable } from "@lark-apaas/nestjs-observable";
+import { NestjsObservableModule as ObservableModule, Observable, ObservableTraceMiddleware, TraceInterceptor } from "@lark-apaas/nestjs-observable";
 import { HttpModule } from "@nestjs/axios";
 import { LoggerModule, AppLogger as AppLogger2, LoggerContextMiddleware } from "@lark-apaas/nestjs-logger";
 import { DataPaasModule, SqlExecutionContextMiddleware } from "@lark-apaas/nestjs-datapaas";
@@ -175,7 +175,7 @@ var ViewContextMiddleware = class _ViewContextMiddleware {
     }
   }
   async use(req, res, next) {
-    const { userId, tenantId, appId } = req.userContext;
+    const { userId, tenantId, appId, loginUrl, userType } = req.userContext;
     const csrfToken = req.csrfToken;
     const appInfo = await this.getAppInfo(appId);
     this.logger.debug(`appInfo: ${JSON.stringify(appInfo)}`);
@@ -186,6 +186,8 @@ var ViewContextMiddleware = class _ViewContextMiddleware {
       appName: appInfo?.app_name ?? "",
       appAvatar: appInfo?.app_avatar ?? "",
       appDescription: appInfo?.app_description ?? "",
+      loginUrl: loginUrl ?? "",
+      userType: userType ?? "",
       tenantId
     };
     res.locals = {
@@ -193,6 +195,8 @@ var ViewContextMiddleware = class _ViewContextMiddleware {
       csrfToken: csrfToken ?? "",
       userId: userId ?? "",
       tenantId: tenantId ?? "",
+      loginUrl: loginUrl ?? "",
+      userType: userType ?? "",
       appId: appId ?? "",
       appName: appInfo?.app_name ?? "\u5999\u642D\u5E94\u7528",
       appAvatar: appInfo?.app_avatar ?? "",
@@ -675,6 +679,7 @@ PlatformHttpClientService = _ts_decorate8([
 ], PlatformHttpClientService);
 
 // src/modules/platform/module.ts
+import { AuthZPaasModule } from "@lark-apaas/nestjs-authzpaas";
 function _ts_decorate9(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);
@@ -727,7 +732,9 @@ var PlatformModule = class _PlatformModule {
                 appLogger.log?.("SQL Query " + JSON.stringify({
                   query,
                   params
-                }), "Database");
+                }), {
+                  source_type: "platform"
+                }, "Database");
               }
             };
             return {
@@ -737,7 +744,8 @@ var PlatformModule = class _PlatformModule {
           }, "useFactory")
         }),
         AuthNPaasModule.forRoot(),
-        AutomationModule.forRoot()
+        AutomationModule.forRoot(),
+        AuthZPaasModule.forRoot()
       ],
       providers: [
         {
@@ -765,7 +773,11 @@ var PlatformModule = class _PlatformModule {
             PlatformHttpClientService
           ]
         },
-        HttpInterceptorService
+        HttpInterceptorService,
+        {
+          provide: APP_INTERCEPTOR,
+          useClass: TraceInterceptor
+        }
       ],
       exports: [
         ConfigModule,
@@ -785,7 +797,7 @@ var PlatformModule = class _PlatformModule {
     if (process.env.NODE_ENV === "development") {
       consumer.apply(FrameworkDebugMiddleware).forRoutes("/api/__framework__/debug");
     }
-    consumer.apply(UserContextMiddleware, RequestContextMiddleware, LoggerContextMiddleware, SqlExecutionContextMiddleware).forRoutes("/*");
+    consumer.apply(UserContextMiddleware, RequestContextMiddleware, LoggerContextMiddleware, ObservableTraceMiddleware, SqlExecutionContextMiddleware).forRoutes("/*");
     consumer.apply(CsrfTokenMiddleware, ViewContextMiddleware).exclude("/api/(.*)").forRoutes("*");
     if (options.enableCsrf !== false) {
       const csrfRoutes = options.csrfRoutes || "/api/*";
@@ -823,11 +835,11 @@ async function configureApp(app, perms = defaultPerms) {
         basePath: process.env.CLIENT_BASE_PATH,
         docsPath: "/api_docs"
       });
+      console.log("App Started Successfully.");
     } catch (err) {
       console.error("[OpenAPI] OpenAPI \u751F\u6210\u5931\u8D25:", err);
     }
   }
-  console.log("App Started Successfully.");
 }
 __name(configureApp, "configureApp");
 
@@ -837,7 +849,11 @@ export * from "@lark-apaas/nestjs-authnpaas";
 export * from "@lark-apaas/nestjs-datapaas";
 export * from "@lark-apaas/nestjs-observable";
 export * from "@lark-apaas/nestjs-trigger";
+import { AutoTrace } from "@lark-apaas/nestjs-common";
+import { CanRole } from "@lark-apaas/nestjs-authzpaas";
 export {
+  AutoTrace,
+  CanRole,
   CsrfMiddleware,
   CsrfTokenMiddleware,
   DevToolsModule,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-nestjs-core",
-  "version": "1.1.10-alpha.0",
+  "version": "1.1.10-alpha.31",
   "description": "FullStack Nestjs Core",
   "type": "module",
   "main": "./dist/index.js",
@@ -41,10 +41,11 @@
   "dependencies": {
     "@lark-apaas/http-client": "0.1.2",
     "@lark-apaas/nestjs-authnpaas": "^1.0.2",
-    "@lark-apaas/nestjs-common": "^0.1.0",
-    "@lark-apaas/nestjs-datapaas": "^1.0.6",
-    "@lark-apaas/nestjs-logger": "^1.0.4",
-    "@lark-apaas/nestjs-observable": "^0.0.1",
+    "@lark-apaas/nestjs-authzpaas": "0.1.0-alpha.31",
+    "@lark-apaas/nestjs-common": "0.1.0-alpha.1",
+    "@lark-apaas/nestjs-datapaas": "^1.0.6-alpha.5",
+    "@lark-apaas/nestjs-logger": "1.0.2-alpha.33",
+    "@lark-apaas/nestjs-observable": "0.0.1-alpha.35",
     "@lark-apaas/nestjs-openapi-devtools": "^1.0.9",
     "@lark-apaas/nestjs-trigger": "^0.0.1",
     "@nestjs/axios": "^4.0.1",