feat(WIP): fast login

Author: Boelroy

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

@@ -1,29 +1,25 @@
-import { IFastLoginOptions } from './type';
+import { IFastLoginOptions, ILoginCallbackProps } from './type';
 import { ENV } from './env';
 
-let fastLoginClient: typeof window.FastLogin = null;
-
 const loadFastLoginScripts = (options: IFastLoginOptions): Promise<typeof window.FastLogin> => {
   const env = options.env || 'prod';
   const fastLoginUrl = ENV[env] || ENV.prod;
 
   /* eslint-disable no-undef */
   return new Promise((resolve, reject) => {
-    if (fastLoginClient) {
-      resolve(fastLoginClient);
+    if (window.FastLogin) {
+      resolve(window.FastLogin);
       return;
     }
 
     const script = document.createElement('script');
 
     script.onload = () => {
-      fastLoginClient = window.FastLogin;
-      // 必填
       // @ts-ignore
       window.FastLoginContext = {
         tenantName: "console" 
       };
-      resolve(fastLoginClient)
+      resolve(window.FastLogin)
     }
 
     script.onerror = () => {
@@ -40,22 +36,44 @@ const loadFastLoginScripts = (options: IFastLoginOptions): Promise<typeof window
 const open = async (options: IFastLoginOptions) => {
   const fastLogin = await loadFastLoginScripts(options);
 
-  return new Promise<void>((resolve) => {
+  return new Promise<ILoginCallbackProps>((resolve, reject) => {
     fastLogin('show', [{
-      loginCallback: () => {
-        resolve();
+      loginCallback: (result) => {
+        if (result.success) {
+          resolve(result);
+        } else {
+          reject(result)
+        }
       }
     }])
   })
 }
 
 const render = async (options: IFastLoginOptions) => {
   const fastLogin = await loadFastLoginScripts(options);
-  fastLogin('render', [{}])
+  return new Promise<ILoginCallbackProps>((resolve, reject) => {
+    fastLogin('render', [{
+      // @ts-ignore
+      type: "one_login", // one_login, password, qr
+      loginCallback: (result) => {
+        if (result.success) {
+          resolve(result);
+        } else {
+          reject(result)
+        }
+      }
+    }])
+  })
+}
+
+const unmount = async (options: IFastLoginOptions) => {
+  const fastLogin = await loadFastLoginScripts(options);
+  fastLogin('unmountDialog', [{}])
 }
 
 
 export {
   open,
   render,
+  unmount,
 }

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

@@ -1,5 +1,6 @@
 export interface IFastLoginOptions {
   env?: 'prod' | 'prepub';
+  target?: HTMLElement;
 }
 
 export interface ILoginCallbackProps {
@@ -15,6 +16,6 @@ export interface IFastLoginProps {
 
 declare global {
   interface Window {
-    FastLogin: (method: 'render' | 'show', [props]: [IFastLoginProps]) => void;
+    FastLogin: (method: 'render' | 'show' | 'unmountDialog', [props]: [IFastLoginProps]) => void;
   }
 }

packages/console-utils/fastlogin/stories/index.stories.tsx

@@ -1,20 +1,27 @@
 import * as React from 'react';
 import ReactDOM from 'react-dom';
 import { storiesOf } from '@storybook/react';
-import { open } from '../src';
+import { open, unmount } from '../src';
 
 window.React = React;
 window.ReactDOM = ReactDOM;
 
 storiesOf('FastLogin', module)
   .add('FastLogin', () => {
-    const onClick = () => {
-      open({env: 'prepub'})
+    const onClick = async () => {
+      try {
+        const result = await open({ target: document.querySelector('test')});
+        console.log(result)
+        unmount({env: 'prepub'});
+      } catch {
+        unmount({env: 'prepub'}); 
+      }
     }
 
     return (<div id="app-wrapper">
       <div id="app">
         <button onClick={onClick}>open fast login</button>
+        <div id="test"/>
       </div>
     </div>);
   })

packages/console-utils/xconsole-service/package.json

@@ -26,7 +26,8 @@
     "react-dom": "^16.11.0"
   },
   "devDependencies": {
-    "@alicloud/console-components": "alpha",
+    "@alicloud/console-components": "^1.0.0",
+    "@alicloud/console-fastlogin": "^2.0.0",
     "@alicloud/console-toolkit-cli": "^1.0.3",
     "@alicloud/console-toolkit-preset-wind-component": "^1.0.6",
     "@testing-library/react": "^10.4.7",

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

@@ -0,0 +1,32 @@
+import fastLogin from '@alicloud/console-fastlogin';
+import { IResponse, IResponseData } from '../../types';
+import { ApiType } from '../../const/index';
+
+async function consoleRiskInterceptor(
+  response: IResponse<IResponseData>
+): Promise<IResponse<IResponseData>> {
+  const {
+    data: responseData,
+    config: { apiType, throwDoubleConfirmError },
+  } = response;
+
+  if (apiType === ApiType.custom) return response;
+
+  switch (responseData.code) {
+    case 'CONSOLE_NEED_LOGIN':
+      try {
+        const newResponse = await fastLogin.open()
+        return newResponse;
+      } catch (e) {
+        if (throwDoubleConfirmError) {
+          e.response = response;
+          throw e;
+        }
+        return response;
+      }
+    default:
+      return response;
+  }
+}
+
+export default consoleRiskInterceptor;

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

@@ -0,0 +1,5 @@
+import fastLogin from '@alicloud/console-fastlogin';
+
+const login = async () => {
+
+}