@lark-apaas/fullstack-nestjs-core 1.1.48-alpha.10 → 1.1.48-alpha.11

package/dist/index.cjs

@@ -35082,6 +35082,9 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
       ...baseConfig,
       platform: {
         enabled: true
+      },
+      preInterceptors: {
+        request: this.createClaimsPreInterceptors()
       }
     });
     this.protectedClient = new ProtectedHttpClient(this.client);
@@ -35156,7 +35159,10 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
     };
     return new import_http_client.HttpClient({
       ...mergedConfig,
-      platform: mergedPlatform
+      platform: mergedPlatform,
+      preInterceptors: {
+        request: this.createClaimsPreInterceptors()
+      }
     });
   }
   /**
@@ -35184,6 +35190,36 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
     this.registerInterceptorsForClient(client);
     return client;
   }
+  createClaimsPreInterceptors() {
+    return [
+      {
+        onFulfilled: /* @__PURE__ */ __name((config) => {
+          const userId = this.requestContext.get("userId");
+          const tenantId = this.requestContext.get("tenantId");
+          const contextClaims = {};
+          if (userId) {
+            contextClaims.user_id = userId;
+          }
+          if (tenantId) {
+            contextClaims.tenant_id = tenantId;
+          }
+          if (contextClaims.user_id === void 0 && contextClaims.tenant_id === void 0) {
+            return config;
+          }
+          return {
+            ...config,
+            platformAuth: {
+              ...config.platformAuth,
+              customClaims: {
+                ...contextClaims,
+                ...config.platformAuth?.customClaims || {}
+              }
+            }
+          };
+        }, "onFulfilled")
+      }
+    ];
+  }
   /**
   * 注册全局拦截器（用于单例实例）
   */
@@ -35209,27 +35245,6 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
           "x-tt-env": ttEnv
         };
       }
-      const userId = this.requestContext.get("userId");
-      const tenantIdRaw = this.requestContext.get("tenantId");
-      const contextClaims = {};
-      if (userId) {
-        contextClaims.user_id = userId;
-      }
-      if (tenantIdRaw !== void 0 && tenantIdRaw !== "") {
-        const tenantIdNum = typeof tenantIdRaw === "number" ? tenantIdRaw : Number(tenantIdRaw);
-        if (Number.isFinite(tenantIdNum)) {
-          contextClaims.tenant_id = tenantIdNum;
-        }
-      }
-      if (contextClaims.user_id !== void 0 || contextClaims.tenant_id !== void 0) {
-        config.platformAuth = {
-          ...config.platformAuth,
-          customClaims: {
-            ...contextClaims,
-            ...config.platformAuth?.customClaims || {}
-          }
-        };
-      }
       return config;
     }, (error) => {
       this.logger.error("Server SDK HTTP Request Error", error, "HttpService");

package/dist/index.d.cts

@@ -385,6 +385,7 @@ declare class PlatformHttpClientService {
      * ```
      */
     createWithGlobalInterceptors(options?: PlatformHttpClientOptions): HttpClient;
+    private createClaimsPreInterceptors;
     /**
      * 注册全局拦截器（用于单例实例）
      */

package/dist/index.d.ts

@@ -385,6 +385,7 @@ declare class PlatformHttpClientService {
      * ```
      */
     createWithGlobalInterceptors(options?: PlatformHttpClientOptions): HttpClient;
+    private createClaimsPreInterceptors;
     /**
      * 注册全局拦截器（用于单例实例）
      */

package/dist/index.js

@@ -35055,6 +35055,9 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
       ...baseConfig,
       platform: {
         enabled: true
+      },
+      preInterceptors: {
+        request: this.createClaimsPreInterceptors()
       }
     });
     this.protectedClient = new ProtectedHttpClient(this.client);
@@ -35129,7 +35132,10 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
     };
     return new HttpClient({
       ...mergedConfig,
-      platform: mergedPlatform
+      platform: mergedPlatform,
+      preInterceptors: {
+        request: this.createClaimsPreInterceptors()
+      }
     });
   }
   /**
@@ -35157,6 +35163,36 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
     this.registerInterceptorsForClient(client);
     return client;
   }
+  createClaimsPreInterceptors() {
+    return [
+      {
+        onFulfilled: /* @__PURE__ */ __name((config) => {
+          const userId = this.requestContext.get("userId");
+          const tenantId = this.requestContext.get("tenantId");
+          const contextClaims = {};
+          if (userId) {
+            contextClaims.user_id = userId;
+          }
+          if (tenantId) {
+            contextClaims.tenant_id = tenantId;
+          }
+          if (contextClaims.user_id === void 0 && contextClaims.tenant_id === void 0) {
+            return config;
+          }
+          return {
+            ...config,
+            platformAuth: {
+              ...config.platformAuth,
+              customClaims: {
+                ...contextClaims,
+                ...config.platformAuth?.customClaims || {}
+              }
+            }
+          };
+        }, "onFulfilled")
+      }
+    ];
+  }
   /**
   * 注册全局拦截器（用于单例实例）
   */
@@ -35182,27 +35218,6 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
           "x-tt-env": ttEnv
         };
       }
-      const userId = this.requestContext.get("userId");
-      const tenantIdRaw = this.requestContext.get("tenantId");
-      const contextClaims = {};
-      if (userId) {
-        contextClaims.user_id = userId;
-      }
-      if (tenantIdRaw !== void 0 && tenantIdRaw !== "") {
-        const tenantIdNum = typeof tenantIdRaw === "number" ? tenantIdRaw : Number(tenantIdRaw);
-        if (Number.isFinite(tenantIdNum)) {
-          contextClaims.tenant_id = tenantIdNum;
-        }
-      }
-      if (contextClaims.user_id !== void 0 || contextClaims.tenant_id !== void 0) {
-        config.platformAuth = {
-          ...config.platformAuth,
-          customClaims: {
-            ...contextClaims,
-            ...config.platformAuth?.customClaims || {}
-          }
-        };
-      }
       return config;
     }, (error) => {
       this.logger.error("Server SDK HTTP Request Error", error, "HttpService");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-nestjs-core",
-  "version": "1.1.48-alpha.10",
+  "version": "1.1.48-alpha.11",
   "description": "FullStack Nestjs Core",
   "type": "module",
   "main": "./dist/index.js",
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@lark-apaas/file-service": "^0.1.2",
-    "@lark-apaas/http-client": "^0.1.5",
+    "@lark-apaas/http-client": "0.1.6-alpha.1",
     "@lark-apaas/nestjs-authnpaas": "^1.0.3",
     "@lark-apaas/nestjs-authzpaas": "^0.1.8",
     "@lark-apaas/nestjs-capability": "^0.1.13",