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

package/dist/index.cjs

@@ -34651,6 +34651,7 @@ 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 = req.headers["x-miaoda-custom-host"] ? "/" : `/app/${appId || ""}`;
     const appPublishedData = await this.getAppPublished(appId);
     const appInfo = appPublishedData?.app_info ?? null;
     req.__platform_data__ = {
@@ -34665,7 +34666,8 @@ var ViewContextMiddleware = class _ViewContextMiddleware {
       tenantId,
       environment,
       showBadge: appInfo?.show_badge !== false,
-      appPublished: appPublishedData ?? null
+      appPublished: appPublishedData ?? null,
+      basename
     };
     res.locals = {
       ...res.locals ?? {},
@@ -34678,7 +34680,8 @@ var ViewContextMiddleware = class _ViewContextMiddleware {
       appName: safeEscape(appInfo?.app_name ?? "\u5999\u642D\u5E94\u7528"),
       appAvatar: appInfo?.app_avatar ?? "",
       appDescription: safeEscape(appInfo?.app_description ?? ""),
-      environment
+      environment,
+      basename
     };
     next();
   }
@@ -35081,9 +35084,6 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
       ...baseConfig,
       platform: {
         enabled: true
-      },
-      preInterceptors: {
-        request: this.createClaimsPreInterceptors()
       }
     });
     this.protectedClient = new ProtectedHttpClient(this.client);
@@ -35158,10 +35158,7 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
     };
     return new import_http_client.HttpClient({
       ...mergedConfig,
-      platform: mergedPlatform,
-      preInterceptors: {
-        request: this.createClaimsPreInterceptors()
-      }
+      platform: mergedPlatform
     });
   }
   /**
@@ -35189,36 +35186,6 @@ 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,6 +23,8 @@ declare global {
         userId?: string;
         tenantId?: number;
         csrfToken?: string;
+        /** React Router basename，由 ViewContextMiddleware 注入；自定义域名场景下 = / 或 /<alias>，默认域名 = /app/<appId> */
+        basename?: string;
         [key: string]: unknown;
       };
       userContext: {
@@ -385,7 +387,6 @@ declare class PlatformHttpClientService {
      * ```
      */
     createWithGlobalInterceptors(options?: PlatformHttpClientOptions): HttpClient;
-    private createClaimsPreInterceptors;
     /**
      * 注册全局拦截器（用于单例实例）
      */

package/dist/index.d.ts

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

package/dist/index.js

@@ -34624,6 +34624,7 @@ 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 = req.headers["x-miaoda-custom-host"] ? "/" : `/app/${appId || ""}`;
     const appPublishedData = await this.getAppPublished(appId);
     const appInfo = appPublishedData?.app_info ?? null;
     req.__platform_data__ = {
@@ -34638,7 +34639,8 @@ var ViewContextMiddleware = class _ViewContextMiddleware {
       tenantId,
       environment,
       showBadge: appInfo?.show_badge !== false,
-      appPublished: appPublishedData ?? null
+      appPublished: appPublishedData ?? null,
+      basename
     };
     res.locals = {
       ...res.locals ?? {},
@@ -34651,7 +34653,8 @@ var ViewContextMiddleware = class _ViewContextMiddleware {
       appName: safeEscape(appInfo?.app_name ?? "\u5999\u642D\u5E94\u7528"),
       appAvatar: appInfo?.app_avatar ?? "",
       appDescription: safeEscape(appInfo?.app_description ?? ""),
-      environment
+      environment,
+      basename
     };
     next();
   }
@@ -35054,9 +35057,6 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
       ...baseConfig,
       platform: {
         enabled: true
-      },
-      preInterceptors: {
-        request: this.createClaimsPreInterceptors()
       }
     });
     this.protectedClient = new ProtectedHttpClient(this.client);
@@ -35131,10 +35131,7 @@ var PlatformHttpClientService = class _PlatformHttpClientService {
     };
     return new HttpClient({
       ...mergedConfig,
-      platform: mergedPlatform,
-      preInterceptors: {
-        request: this.createClaimsPreInterceptors()
-      }
+      platform: mergedPlatform
     });
   }
   /**
@@ -35162,36 +35159,6 @@ 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.15",
+  "version": "1.1.48-alpha.16",
   "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.6-alpha.2",
+    "@lark-apaas/http-client": "^0.1.5",
     "@lark-apaas/nestjs-authnpaas": "^1.0.3",
     "@lark-apaas/nestjs-authzpaas": "^0.1.8",
     "@lark-apaas/nestjs-capability": "^0.1.13",