message-verify 1.0.1-beta.66 → 1.0.1-beta.68

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/dist/index.d.ts +1 -1
  2. package/dist/index.js +2 -4
  3. package/dist/main.js +1 -1
  4. package/dist/modal/verify-modal.js +8 -38
  5. package/dist/utils/type.d.ts +0 -1
  6. package/package.json +1 -1
  7. package/src/index.tsx +2 -4
  8. package/src/main.tsx +1 -1
  9. package/src/modal/verify-modal.tsx +10 -40
  10. package/src/utils/type.ts +0 -1
package/dist/index.d.ts CHANGED
@@ -2,4 +2,4 @@ import { VerifyModalConfig, LoginModalConfig } from './utils/type.js';
2
2
  export declare const initFingerprint: () => Promise<string>;
3
3
  export declare const createReLoginModal: (modalProps: LoginModalConfig) => void;
4
4
  export declare const getResponse: (response: any) => any;
5
- export declare const VerifyHandler: ({ data, config, http, verifyPromise, sendApi, response }: VerifyModalConfig) => Promise<any>;
5
+ export declare const VerifyHandler: ({ data, config, http, verifyPromise, sendApi }: VerifyModalConfig) => Promise<any>;
package/dist/index.js CHANGED
@@ -63,8 +63,7 @@ export const getResponse = (response) => {
63
63
  return response;
64
64
  // }
65
65
  };
66
- export const VerifyHandler = ({ data, config, http, verifyPromise, sendApi, response }) => {
67
- console.log('VerifyHandler =>', response);
66
+ export const VerifyHandler = ({ data, config, http, verifyPromise, sendApi }) => {
68
67
  fetchUrl = config?.url || '';
69
68
  const toEmpty = () => {
70
69
  verifyPromise.current = null;
@@ -78,8 +77,7 @@ export const VerifyHandler = ({ data, config, http, verifyPromise, sendApi, resp
78
77
  apiResolve: resolve,
79
78
  apiReject: reject,
80
79
  apiPromiseToEmpty: toEmpty,
81
- sendApi,
82
- response
80
+ sendApi
83
81
  });
84
82
  }).finally(toEmpty);
85
83
  }
package/dist/main.js CHANGED
@@ -38,7 +38,7 @@ const config = {
38
38
  };
39
39
  const promise = { current: null };
40
40
  createRoot(document.getElementById('root')).render(_jsxs(_Fragment, { children: [_jsx("button", { onClick: () => {
41
- return VerifyHandler({ data, config, http: axios, verifyPromise: promise, response: {} });
41
+ return VerifyHandler({ data, config, http: axios, verifyPromise: promise });
42
42
  }, children: "Show verify Modal" }), _jsx("button", { onClick: () => createReLoginModal({
43
43
  goLogin: () => {
44
44
  console.log('goLogin');
package/dist/modal/verify-modal.js CHANGED
@@ -12,8 +12,7 @@ const CreateMessageVerifyModal = ({ props }) => {
12
12
  const [captchaImage, setCaptchaImage] = useState('');
13
13
  const [captchCode, setCaptchCode] = useState('');
14
14
  const [captchaKey, setCaptchaKey] = useState('');
15
- const [resCode, setResCode] = useState(-1);
16
- const { data, http, lang, sendApi = '/admin/sms/send', config, apiResolve, apiPromiseToEmpty, onClose, response } = props || {};
15
+ const { data, http, lang, sendApi = '/admin/sms/send', config, apiResolve, apiPromiseToEmpty, onClose } = props || {};
17
16
  const dataObj = JSON.parse(data || '{}');
18
17
  const { mobile, verifyCodeKey } = dataObj || {};
19
18
  const resolveRef = useRef(null);
@@ -55,14 +54,15 @@ const CreateMessageVerifyModal = ({ props }) => {
55
54
  // 这里处理收到的数据
56
55
  console.log('收到 response 事件:', data);
57
56
  if (data === 0) {
58
- resolveRef.current();
59
- // setVisible(false);
57
+ resolveRef.current({
58
+ code: data,
59
+ });
60
60
  }
61
61
  else {
62
- rejectRef.current();
63
- // setVisible(false);
62
+ rejectRef.current({
63
+ code: data,
64
+ });
64
65
  }
65
- setResCode(data);
66
66
  };
67
67
  eventEmitter.on('response', handler);
68
68
  return () => {
@@ -93,29 +93,6 @@ const CreateMessageVerifyModal = ({ props }) => {
93
93
  setOtp(val);
94
94
  if (val.length === 6) {
95
95
  try {
96
- // const res = await Promise.race([
97
- // new Promise((resolve, reject) => {
98
- // setTimeout(() => {
99
- // reject(new Error('Timeout'));
100
- // }, 1000);
101
- // }),
102
- // new Promise((resolve, reject) => {
103
- // http({
104
- // ...config,
105
- // headers: {
106
- // ...http.defaults.headers.common,
107
- // 'sms-code': val,
108
- // 'sms-code-key': verifyCodeKey,
109
- // 'Content-Type': config.headers['Content-Type'],
110
- // }
111
- // }).then(res => {
112
- // console.log('VerifyHandler => then', response, resCode);
113
- // resolve(res);
114
- // }).catch(err => {
115
- // reject(err);
116
- // })
117
- // })
118
- // ]) as any;
119
96
  const res = await new Promise((resolve, reject) => {
120
97
  resolveRef.current = resolve;
121
98
  rejectRef.current = reject;
@@ -127,15 +104,9 @@ const CreateMessageVerifyModal = ({ props }) => {
127
104
  'sms-code-key': verifyCodeKey,
128
105
  'Content-Type': config.headers['Content-Type'],
129
106
  }
130
- }).then(res => {
131
- console.log('VerifyHandler => then', response, resCode);
132
- resolve(res);
133
- }).catch(err => {
134
- reject(err);
135
107
  });
136
108
  });
137
- console.log('res=====>', res);
138
- if (res?.data?.status?.code === 0) {
109
+ if (res?.code === 0 || res?.data?.status?.code === 0) {
139
110
  apiResolve(res);
140
111
  setVisible(false);
141
112
  }
@@ -145,7 +116,6 @@ const CreateMessageVerifyModal = ({ props }) => {
145
116
  }
146
117
  }
147
118
  catch (error) {
148
- console.log('VerifyHandler => catch', response);
149
119
  console.warn('catch=>error', error);
150
120
  message.error(t('verifyFail', lang));
151
121
  setOtp('');
package/dist/utils/type.d.ts CHANGED
@@ -25,7 +25,6 @@ export type VerifyModalConfig = {
25
25
  verifyPromise: {
26
26
  current: Promise<any> | null;
27
27
  };
28
- response: any;
29
28
  };
30
29
  export type LoginModalConfig = {
31
30
  goLogin: () => void;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "message-verify",
3
- "version": "1.0.1-beta.66",
3
+ "version": "1.0.1-beta.68",
4
4
  "type": "module",
5
5
  "main": "dist/index.js",
6
6
  "dependencies": {
package/src/index.tsx CHANGED
@@ -74,8 +74,7 @@ export const getResponse = (response: any) => {
74
74
  // }
75
75
  }
76
76
 
77
- export const VerifyHandler = ({data, config, http, verifyPromise, sendApi, response}: VerifyModalConfig): Promise<any> => {
78
- console.log('VerifyHandler =>', response);
77
+ export const VerifyHandler = ({data, config, http, verifyPromise, sendApi}: VerifyModalConfig): Promise<any> => {
79
78
  fetchUrl = config?.url as string || '';
80
79
  const toEmpty = () => {
81
80
  verifyPromise.current = null;
@@ -89,8 +88,7 @@ export const VerifyHandler = ({data, config, http, verifyPromise, sendApi, respo
89
88
  apiResolve: resolve,
90
89
  apiReject: reject,
91
90
  apiPromiseToEmpty: toEmpty,
92
- sendApi,
93
- response
91
+ sendApi
94
92
  } as VerifyModalConfig);
95
93
  }).finally(toEmpty);
96
94
  }
package/src/main.tsx CHANGED
@@ -43,7 +43,7 @@ const promise = {current: null};
43
43
  createRoot(document.getElementById('root')!).render(
44
44
  <>
45
45
  <button onClick={() => {
46
- return VerifyHandler({data, config, http: axios, verifyPromise: promise, response: {}});
46
+ return VerifyHandler({data, config, http: axios, verifyPromise: promise});
47
47
  }}>
48
48
  Show verify Modal
49
49
  </button>
package/src/modal/verify-modal.tsx CHANGED
@@ -13,8 +13,7 @@ const CreateMessageVerifyModal = ({ props }: { props: VerifyModalConfig }) => {
13
13
  const [captchaImage, setCaptchaImage] = useState<string>('');
14
14
  const [captchCode, setCaptchCode] = useState<string>('');
15
15
  const [captchaKey, setCaptchaKey] = useState<string>('');
16
- const [resCode, setResCode] = useState<number>(-1);
17
- const { data, http, lang, sendApi = '/admin/sms/send', config, apiResolve, apiPromiseToEmpty, onClose, response } = props || {};
16
+ const { data, http, lang, sendApi = '/admin/sms/send', config, apiResolve, apiPromiseToEmpty, onClose } = props || {};
18
17
  const dataObj = JSON.parse(data || '{}');
19
18
  const { mobile, verifyCodeKey } = dataObj || {};
20
19
  const resolveRef = useRef<any>(null);
@@ -59,19 +58,20 @@ const CreateMessageVerifyModal = ({ props }: { props: VerifyModalConfig }) => {
59
58
  // 这里处理收到的数据
60
59
  console.log('收到 response 事件:', data);
61
60
  if (data === 0) {
62
- resolveRef.current();
63
- // setVisible(false);
61
+ resolveRef.current({
62
+ code: data,
63
+ });
64
64
  } else {
65
- rejectRef.current();
66
- // setVisible(false);
65
+ rejectRef.current({
66
+ code: data,
67
+ });
67
68
  }
68
- setResCode(data);
69
69
  };
70
70
  eventEmitter.on('response', handler);
71
71
  return () => {
72
72
  eventEmitter.off('response', handler);
73
73
  };
74
- }, [])
74
+ }, []);
75
75
 
76
76
  const handleResend = async () => {
77
77
  const formData = new FormData();
@@ -110,29 +110,6 @@ const CreateMessageVerifyModal = ({ props }: { props: VerifyModalConfig }) => {
110
110
  setOtp(val);
111
111
  if (val.length === 6) {
112
112
  try {
113
- // const res = await Promise.race([
114
- // new Promise((resolve, reject) => {
115
- // setTimeout(() => {
116
- // reject(new Error('Timeout'));
117
- // }, 1000);
118
- // }),
119
- // new Promise((resolve, reject) => {
120
- // http({
121
- // ...config,
122
- // headers: {
123
- // ...http.defaults.headers.common,
124
- // 'sms-code': val,
125
- // 'sms-code-key': verifyCodeKey,
126
- // 'Content-Type': config.headers['Content-Type'],
127
- // }
128
- // }).then(res => {
129
- // console.log('VerifyHandler => then', response, resCode);
130
- // resolve(res);
131
- // }).catch(err => {
132
- // reject(err);
133
- // })
134
- // })
135
- // ]) as any;
136
113
  const res = await new Promise((resolve, reject) => {
137
114
  resolveRef.current = resolve;
138
115
  rejectRef.current = reject;
@@ -144,15 +121,9 @@ const CreateMessageVerifyModal = ({ props }: { props: VerifyModalConfig }) => {
144
121
  'sms-code-key': verifyCodeKey,
145
122
  'Content-Type': config.headers['Content-Type'],
146
123
  }
147
- }).then(res => {
148
- console.log('VerifyHandler => then', response, resCode);
149
- resolve(res);
150
- }).catch(err => {
151
- reject(err);
152
- })
124
+ });
153
125
  }) as any;
154
- console.log('res=====>', res);
155
- if (res?.data?.status?.code === 0) {
126
+ if (res?.code === 0 || res?.data?.status?.code === 0) {
156
127
  apiResolve(res);
157
128
  setVisible(false);
158
129
  } else {
@@ -160,7 +131,6 @@ const CreateMessageVerifyModal = ({ props }: { props: VerifyModalConfig }) => {
160
131
  setOtp('');
161
132
  }
162
133
  } catch (error) {
163
- console.log('VerifyHandler => catch', response);
164
134
  console.warn('catch=>error', error);
165
135
  message.error(t('verifyFail', lang));
166
136
  setOtp('');
package/src/utils/type.ts CHANGED
@@ -24,7 +24,6 @@ export type VerifyModalConfig = {
24
24
  apiResolve?: any;
25
25
  apiPromiseToEmpty?: () => void;
26
26
  verifyPromise: {current: Promise<any> | null}
27
- response: any;
28
27
  }
29
28
 
30
29
  export type LoginModalConfig = {