@lark-apaas/fullstack-nestjs-core 1.1.48-alpha.13 → 1.1.48-alpha.15

package/dist/index.cjs

@@ -34651,7 +34651,6 @@ var ViewContextMiddleware = class _ViewContextMiddleware {
     const { userId, tenantId, appId, loginUrl, userType } = req.userContext;
     const csrfToken = req.csrfToken;
     const environment = mapToWindowEnvironment(process.env.FORCE_FRAMEWORK_ENVIRONMENT);
-    const basename = resolveBasename(req, appId);
     const appPublishedData = await this.getAppPublished(appId);
     const appInfo = appPublishedData?.app_info ?? null;
     req.__platform_data__ = {
@@ -34666,8 +34665,7 @@ var ViewContextMiddleware = class _ViewContextMiddleware {
       tenantId,
       environment,
       showBadge: appInfo?.show_badge !== false,
-      appPublished: appPublishedData ?? null,
-      basename
+      appPublished: appPublishedData ?? null
     };
     res.locals = {
       ...res.locals ?? {},
@@ -34701,16 +34699,6 @@ function mapToWindowEnvironment(input) {
   return "online";
 }
 __name(mapToWindowEnvironment, "mapToWindowEnvironment");
-var CUSTOM_DOMAINS = new Set((process.env.CUSTOM_DOMAINS || "").split(",").map((d) => d.trim()).filter(Boolean));
-function resolveBasename(req, appId) {
-  const headerValue = req.headers["x-app-basename"];
-  if (typeof headerValue === "string" && headerValue) return headerValue;
-  if (CUSTOM_DOMAINS.size > 0 && CUSTOM_DOMAINS.has(req.hostname)) {
-    return "/";
-  }
-  return appId ? `/app/${appId}` : "/";
-}
-__name(resolveBasename, "resolveBasename");
 
 // src/middlewares/csrf_token/index.ts
 var import_common4 = require("@nestjs/common");
@@ -35093,6 +35081,9 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
       ...baseConfig,
       platform: {
         enabled: true
+      },
+      preInterceptors: {
+        request: this.createClaimsPreInterceptors()
       }
     });
     this.protectedClient = new ProtectedHttpClient(this.client);
@@ -35167,7 +35158,10 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
     };
     return new import_http_client.HttpClient({
       ...mergedConfig,
-      platform: mergedPlatform
+      platform: mergedPlatform,
+      preInterceptors: {
+        request: this.createClaimsPreInterceptors()
+      }
     });
   }
   /**
@@ -35195,6 +35189,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")
+      }
+    ];
+  }
   /**
   * 注册全局拦截器（用于单例实例）
   */

package/dist/index.d.cts

@@ -23,8 +23,6 @@ declare global {
         userId?: string;
         tenantId?: number;
         csrfToken?: string;
-        /** React Router basename，由 ViewContextMiddleware 注入；自定义域名场景下 = / 或 /<alias>，默认域名 = /app/<appId> */
-        basename?: string;
         [key: string]: unknown;
       };
       userContext: {
@@ -387,6 +385,7 @@ declare class PlatformHttpClientService {
      * ```
      */
     createWithGlobalInterceptors(options?: PlatformHttpClientOptions): HttpClient;
+    private createClaimsPreInterceptors;
     /**
      * 注册全局拦截器（用于单例实例）
      */

package/dist/index.d.ts

@@ -23,8 +23,6 @@ declare global {
         userId?: string;
         tenantId?: number;
         csrfToken?: string;
-        /** React Router basename，由 ViewContextMiddleware 注入；自定义域名场景下 = / 或 /<alias>，默认域名 = /app/<appId> */
-        basename?: string;
         [key: string]: unknown;
       };
       userContext: {
@@ -387,6 +385,7 @@ declare class PlatformHttpClientService {
      * ```
      */
     createWithGlobalInterceptors(options?: PlatformHttpClientOptions): HttpClient;
+    private createClaimsPreInterceptors;
     /**
      * 注册全局拦截器（用于单例实例）
      */

package/dist/index.js

@@ -34624,7 +34624,6 @@ var ViewContextMiddleware = class _ViewContextMiddleware {
     const { userId, tenantId, appId, loginUrl, userType } = req.userContext;
     const csrfToken = req.csrfToken;
     const environment = mapToWindowEnvironment(process.env.FORCE_FRAMEWORK_ENVIRONMENT);
-    const basename = resolveBasename(req, appId);
     const appPublishedData = await this.getAppPublished(appId);
     const appInfo = appPublishedData?.app_info ?? null;
     req.__platform_data__ = {
@@ -34639,8 +34638,7 @@ var ViewContextMiddleware = class _ViewContextMiddleware {
       tenantId,
       environment,
       showBadge: appInfo?.show_badge !== false,
-      appPublished: appPublishedData ?? null,
-      basename
+      appPublished: appPublishedData ?? null
     };
     res.locals = {
       ...res.locals ?? {},
@@ -34674,16 +34672,6 @@ function mapToWindowEnvironment(input) {
   return "online";
 }
 __name(mapToWindowEnvironment, "mapToWindowEnvironment");
-var CUSTOM_DOMAINS = new Set((process.env.CUSTOM_DOMAINS || "").split(",").map((d) => d.trim()).filter(Boolean));
-function resolveBasename(req, appId) {
-  const headerValue = req.headers["x-app-basename"];
-  if (typeof headerValue === "string" && headerValue) return headerValue;
-  if (CUSTOM_DOMAINS.size > 0 && CUSTOM_DOMAINS.has(req.hostname)) {
-    return "/";
-  }
-  return appId ? `/app/${appId}` : "/";
-}
-__name(resolveBasename, "resolveBasename");
 
 // src/middlewares/csrf_token/index.ts
 import { Injectable as Injectable4 } from "@nestjs/common";
@@ -35066,6 +35054,9 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
       ...baseConfig,
       platform: {
         enabled: true
+      },
+      preInterceptors: {
+        request: this.createClaimsPreInterceptors()
       }
     });
     this.protectedClient = new ProtectedHttpClient(this.client);
@@ -35140,7 +35131,10 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
     };
     return new HttpClient({
       ...mergedConfig,
-      platform: mergedPlatform
+      platform: mergedPlatform,
+      preInterceptors: {
+        request: this.createClaimsPreInterceptors()
+      }
     });
   }
   /**
@@ -35168,6 +35162,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")
+      }
+    ];
+  }
   /**
   * 注册全局拦截器（用于单例实例）
   */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-nestjs-core",
-  "version": "1.1.48-alpha.13",
+  "version": "1.1.48-alpha.15",
   "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.2",
     "@lark-apaas/nestjs-authnpaas": "^1.0.3",
     "@lark-apaas/nestjs-authzpaas": "^0.1.8",
     "@lark-apaas/nestjs-capability": "^0.1.13",