Merge branch 'master' into feat/fast-login

Author: Boelroy

example/xconsole-example/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xconsole",
-  "version": "2.3.44",
+  "version": "2.3.50",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -20,7 +20,7 @@
   ],
   "author": "",
   "dependencies": {
-    "@alicloud/xconsole": "^2.3.44",
+    "@alicloud/xconsole": "^2.3.50",
     "lodash": "^4.17.4",
     "moment": "^2.22.1",
     "prop-types": "^15.6.1",

lerna.json

@@ -13,6 +13,6 @@
       "tagVersionPrefix": ""
     }
   },
-  "version": "2.3.44",
+  "version": "2.3.50",
   "lerna": "2.11.0"
 }

packages/console-utils/fastlogin/src/index.ts

@@ -57,6 +57,9 @@ const render = async (options: IFastLoginOptions) => {
       target: options.target,
       // @ts-ignore
       type: "one_login", // one_login, password, qr
+      custom: {
+        footerComs: ['third-party']
+      },
       loginCallback: (result) => {
         if (result.success) {
           resolve(result);

packages/console-utils/xconsole-service/src/configuration/config.ts

@@ -3,6 +3,7 @@ const defaultOption = {
     // Empty
   },
   ignoreError: false,
+  fastLogin: false,
 }
 
 export default defaultOption;

packages/console-utils/xconsole-service/src/interceptors/consoleInterceptor/response.ts

@@ -1,16 +1,23 @@
 /* eslint-disable @typescript-eslint/no-throw-literal */
+import qs from 'qs';
 import { IError, IResponse, IResponseData } from '../../types';
 import { ApiType } from '../../const/index';
 import { AxiosResponse } from 'axios';
 
 const injectErrorPromptAdaptor = (error: IError, response: AxiosResponse) => {
+  let body = {};
+  try {
+    body = qs.parse(response?.config?.data)
+  } catch (e){
+    //  nothing
+  }
   error.response = response;
   error.code = response.data?.code;
   error.requestId = response.data?.requestId;
   error.message = response.data?.message;
   error.details = {
     url: response?.config?.url,
-    body: response?.config?.data,
+    body: body,
     method: response?.config?.method
   }
 };

packages/console-utils/xconsole-service/src/interceptors/fastloginInterceptor/index.ts

@@ -1,11 +1,18 @@
 import { ApiType } from '../../const/index';
+import defaultConfig from '../../configuration/config'
 import { IResponse, IResponseData } from '../../types';
 import { login } from './login';
 
 
 async function fastLoginInterceptor(response: IResponse<IResponseData> ): Promise<IResponse<IResponseData>> {
   const { data: responseData, config } = response;
-  const { apiType } = config;
+  const { apiType, fastLogin } = config;
+
+  // 只在开启了 fastLogin 的站点才显示
+  // @ts-ignore
+  if((!fastLogin && !defaultConfig.fastLogin) || window?.ALIYUN_CONSOLE_CONFIG?.CHANNEL !== 'OFFICIAL') {
+    return response;
+  }
 
   if (apiType === ApiType.custom) return response;
 

packages/console-utils/xconsole-service/src/interceptors/fastloginInterceptor/login.tsx

@@ -36,8 +36,7 @@ export const LoginContent: React.FC<any> = (props) => {
       if (ref.current || document.querySelector('#loginContent')) {
         (async () => {
           try {
-            const result = await render({ env: 'prepub', target: ref.current || document.querySelector('#loginContent'), height: 560 });
-            console.log(result)
+            const result = await render({ env: 'prepub', target: ref.current || document.querySelector('#loginContent'), height: 560, width: 501 });
             if (result.success) {
               await refreshToken();
             }
@@ -52,12 +51,12 @@ export const LoginContent: React.FC<any> = (props) => {
 
   return (
     <Dialog visible footer={<div/>} onClose={() => {props.onError()}}>
-      <div style={{height: 660, width: 500, paddingTop: 20}}>
+      <div style={{height: 630, width: 500, paddingTop: 20}}>
         <div ref={ref} id="loginContent" ></div>
         <div style={{textAlign: 'center', width: 500, paddingTop: 20, fontSize: 13}}>
-          <span style={{verticalAlign: 'text-top'}}>快速登录有问题？直接去</span>
-          <Button text type="primary">登录页</Button>
-          <span style={{verticalAlign: 'text-top'}}>登录</span>
+          <span >快速登录有问题？直接去</span>
+          <a href="#" onClick={() => { window.location.reload()}}>登录页</a>
+          <span >登录</span>
         </div>
       </div>
     </Dialog>

packages/console-utils/xconsole-service/src/interceptors/fastloginInterceptor/message.ts

@@ -0,0 +1,17 @@
+import { getLocale } from '../../utils/index';
+
+const locale = getLocale() || 'en-US';
+/* eslint-disable max-len */
+const messages = {
+  'en-US': {
+    
+  },
+
+  // 中文文案
+  'zh-CN': {
+
+  },
+
+};
+
+export default (messages as any)[locale] || messages['en-US'];

packages/console-utils/xconsole-service/src/request.ts

@@ -39,8 +39,8 @@ export default function createRequest(
 
     instance.interceptors.response.use(armsResponseInterceptor);
     instance.interceptors.response.use(fastLoginInterceptor);
-    instance.interceptors.response.use(consoleResponseInterceptor);
     instance.interceptors.response.use(consoleRiskInterceptor);
+    instance.interceptors.response.use(consoleResponseInterceptor);
   }
 
   let requestInterceptor = requestInterceptors.shift();

packages/console-utils/xconsole-service/src/types.ts

@@ -31,6 +31,7 @@ export type Risk = {
 
 export interface IOptions extends AxiosRequestConfig {
   apiType?: ApiType;
+  fastLogin?: boolean;
   ignoreError?: boolean;
   description?: any;
   useCors?: boolean;