feat: add the throwDoubleConfirmError for risk

Author: Boelroy

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

@@ -1,3 +1,3 @@
 export { default as consoleRequestInterceptor } from './request';
 export { default as consoleResponseInterceptor } from './response';
-export { default as rosRequestInterceptor } from './roa';
+export { default as roaRequestInterceptor } from './roa';

packages/console-utils/xconsole-service/src/interceptors/riskInterceptor/form.tsx

@@ -155,7 +155,7 @@ class VerifyForm extends Component<IProps, IState> {
         >
           <Row>
             <Col>
-              <Input onChange={this.onInputChange} style={{ width: 80 }} />
+              <Input onChange={this.onInputChange} style={{ width: 80, marginRight: 8 }} />
             </Col>
             {verifyType !== 'ga' ? (
               <Col>

packages/console-utils/xconsole-service/src/interceptors/riskInterceptor/handleDoubleConfirm.tsx

@@ -68,7 +68,7 @@ async function handleDoubleConfirm(
       lastRequestId = requestId;
     } catch (e) {
       console.error('[getVerifyInformation] failed: ', e.message);
-      return response;
+      throw e;
     }
 
     try {
@@ -88,7 +88,7 @@ async function handleDoubleConfirm(
       });
     } catch (e) {
       console.error('[verify Request] failed: ', e.message);
-      return response;
+      throw e;
     }
   }
 

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

@@ -7,7 +7,7 @@ async function consoleRiskInterceptor(
 ): Promise<IResponse<IResponseData>> {
   const {
     data: responseData,
-    config: { apiType },
+    config: { apiType, throwDoubleConfirmError },
   } = response;
 
   if (apiType === ApiType.custom) return response;
@@ -26,7 +26,10 @@ async function consoleRiskInterceptor(
         const newResponse = await handleDoubleConfirm(response);
         return newResponse;
       } catch (e) {
-        console.error('[handleDoubleConfirm] failed: ', e.message);
+        if (throwDoubleConfirmError) {
+          e.response = response;
+          throw e;
+        }
         return response;
       }
     case code.forbidden:

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

@@ -4,7 +4,7 @@ import consoleMockInterceptor from './interceptors/mockInterceptor/index';
 import {
   consoleRequestInterceptor,
   consoleResponseInterceptor,
-  rosRequestInterceptor
+  roaRequestInterceptor
 } from './interceptors/consoleInterceptor/index';
 import consoleRiskInterceptor from './interceptors/riskInterceptor/index';
 import {
@@ -33,7 +33,7 @@ export default function createRequest(
     instance.interceptors.request.use(searchParamsInterceptor);
     instance.interceptors.request.use(consoleMockInterceptor);
     instance.interceptors.request.use(consoleRequestInterceptor);
-    instance.interceptors.request.use(rosRequestInterceptor);
+    instance.interceptors.request.use(roaRequestInterceptor);
     instance.interceptors.request.use(armsRequestInterceptor);
 
     instance.interceptors.response.use(armsResponseInterceptor);

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

@@ -45,6 +45,7 @@ export interface IOptions extends AxiosRequestConfig {
   mock?: boolean;
   region?: string;
   rawResponseData?: boolean;
+  throwDoubleConfirmError?: boolean;
 }
 
 export interface IResponseData<D = any> {

packages/console-utils/xconsole-service/stories/index.stories.tsx

@@ -1,18 +1,30 @@
 import React, { useEffect } from 'react';
 import { select, withKnobs } from '@storybook/addon-knobs';
-import withAxiosDecorator from 'storybook-axios';
+// import withAxiosDecorator from 'storybook-axios';
 import { storiesOf } from '@storybook/react';
 import { createService, useOpenApi, useRoaApi, defaultAxiosRequest } from '../src/index'
 import { ApiType } from '../src/const';
+import '@alicloud/console-components/dist/wind.css'
+
+// @ts-ignore
+defaultAxiosRequest.interceptors.request.handlers.unshift({
+  fulfilled: (config) => {
+    config.baseURL = 'https://oneapi.alibaba-inc.com/mock/oneconsole';
+    config.method = 'GET'
+    return config;
+  }
+});
 
 storiesOf('XConsole Service', module)
   .addDecorator(withKnobs)
   // @ts-ignore
-  .addDecorator(withAxiosDecorator(defaultAxiosRequest))
+  // .addDecorator(withAxiosDecorator(defaultAxiosRequest))
   .add('AppCode', () => {
     const action = select('action', ['DescribeInstance', 'DescribeAPI'], 'DescribeInstance')
-    const { data } = useOpenApi('ros', action, null, { ignoreError: true })
-    return <div>{JSON.stringify(data)}</div>
+    const { data, error } = useOpenApi('consoledemo', action, null, { throwDoubleConfirmError: true })
+    // @ts-ignore
+    console.log(error?.response)
+    return <div>{JSON.stringify(data)}{JSON.stringify(error)}</div>
   })
   .add('ROA', () => {
     const action = select('action', ['DescribeInstance', 'DescribeAPI'], 'DescribeInstance')