midway-fatcms 0.0.1-beta.38 → 0.0.1-beta.40

package/dist/models/SystemEntities.d.ts

@@ -61,13 +61,20 @@ export interface IUpstreamInfo {
     targetList: IUpstreamItem[];
     balanceStrategy: string;
 }
+export declare enum ProxyUserContextEnum {
+    NO_PASS = 0,
+    BASIC_INFO = 1,
+    SESSION_INFO = 2
+}
 export interface IProxyApiEntity extends IApiBaseEntity {
+    proxy_name: string;
+    proxy_code: string;
     path_prefix: string;
     upstream_code: string;
     timeout_ms: number;
     status: number;
     workbench_code_array: string;
-    user_context: number;
+    user_context: ProxyUserContextEnum;
     pass_real_ip: number;
     change_origin: string;
     change_host: string;

package/dist/models/SystemEntities.js

@@ -1,2 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProxyUserContextEnum = void 0;
+var ProxyUserContextEnum;
+(function (ProxyUserContextEnum) {
+    ProxyUserContextEnum[ProxyUserContextEnum["NO_PASS"] = 0] = "NO_PASS";
+    ProxyUserContextEnum[ProxyUserContextEnum["BASIC_INFO"] = 1] = "BASIC_INFO";
+    ProxyUserContextEnum[ProxyUserContextEnum["SESSION_INFO"] = 2] = "SESSION_INFO";
+})(ProxyUserContextEnum = exports.ProxyUserContextEnum || (exports.ProxyUserContextEnum = {}));

package/dist/service/proxyapi/ProxyApiService.js

@@ -16,11 +16,16 @@ const RouteTrie_1 = require("./RouteTrie");
 const exceptions_1 = require("../../libs/crud-pro/exceptions");
 const devops_1 = require("../../models/devops");
 const CurdProService_1 = require("../curd/CurdProService");
+const SystemEntities_1 = require("../../models/SystemEntities");
 const axios_1 = require("axios");
 const fatcms_request_1 = require("../../libs/utils/fatcms-request");
 const ProxyApiUtils_1 = require("./ProxyApiUtils");
 const ProxyApiLoadService_1 = require("./ProxyApiLoadService");
 const ApiBaseService_1 = require("../base/ApiBaseService");
+function toBase64(obj) {
+    const jsonString = JSON.stringify(obj);
+    return Buffer.from(jsonString, 'utf8').toString('base64');
+}
 /**
  * 接口代理
  */
@@ -230,10 +235,25 @@ let ProxyApiService = class ProxyApiService extends ApiBaseService_1.ApiBaseServ
             headers['x-real-ip'] = ctx.headers['x-real-ip'];
             headers['x-forwarded-for'] = ctx.headers['x-forwarded-for'];
         }
-        if (proxyApiEntity.user_context) {
+        // 传递整个用户上下文
+        if (proxyApiEntity.user_context === SystemEntities_1.ProxyUserContextEnum.SESSION_INFO) {
             const isLogin = this.ctx.userSession.isLogin();
             const sessionInfo = this.ctx.userSession.getSessionInfo();
-            headers['x-fatcms-user'] = JSON.stringify({ ...sessionInfo, isLogin });
+            headers['x-fatcms-usercontext'] = toBase64({ ...sessionInfo, isLogin });
+        }
+        // 只传递用户基本信息
+        if (proxyApiEntity.user_context === SystemEntities_1.ProxyUserContextEnum.BASIC_INFO) {
+            const isLogin = this.ctx.userSession.isLogin();
+            const sessionInfo = this.ctx.userSession.getSessionInfo();
+            const userBasicInfo = { isLogin };
+            if (sessionInfo && isLogin) {
+                userBasicInfo.loginName = sessionInfo.loginName;
+                userBasicInfo.sessionId = sessionInfo.sessionId;
+                userBasicInfo.accountId = sessionInfo.accountId;
+                userBasicInfo.workbenchCode = sessionInfo.workbenchCode;
+                userBasicInfo.accountType = sessionInfo.accountType;
+            }
+            headers['x-fatcms-usercontext'] = toBase64(userBasicInfo);
         }
         if (proxyApiEntity.change_host && proxyApiEntity.change_host.length > 0) {
             headers.host = proxyApiEntity.change_host;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "midway-fatcms",
-  "version": "0.0.1-beta.38",
+  "version": "0.0.1-beta.40",
   "description": "This is a midway component sample",
   "main": "dist/index.js",
   "typings": "index.d.ts",