@redneckz/wildless-cms-uni-blocks 0.14.926 → 0.14.927
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.
- package/bundle/bundle.umd.js +50 -34
- package/bundle/bundle.umd.min.js +1 -1
- package/bundle/components/ApplicationLeadForm/useApplicationLeadApi.d.ts +2 -2
- package/bundle/retail/api/checkCode.d.ts +1 -2
- package/bundle/retail/api/sendCode.d.ts +1 -1
- package/bundle/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.d.ts +1 -0
- package/bundle/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.d.ts +3 -2
- package/bundle/retail/utils/saveToken.d.ts +2 -0
- package/dist/components/ApplicationLeadForm/ApplicationLeadForm.js +10 -2
- package/dist/components/ApplicationLeadForm/ApplicationLeadForm.js.map +1 -1
- package/dist/components/ApplicationLeadForm/useApplicationLeadApi.d.ts +2 -2
- package/dist/components/ApplicationLeadForm/useApplicationLeadApi.js +9 -5
- package/dist/components/ApplicationLeadForm/useApplicationLeadApi.js.map +1 -1
- package/dist/retail/api/checkCode.d.ts +1 -2
- package/dist/retail/api/checkCode.js +2 -9
- package/dist/retail/api/checkCode.js.map +1 -1
- package/dist/retail/api/esiaRequestProfile.js +2 -2
- package/dist/retail/api/esiaRequestProfile.js.map +1 -1
- package/dist/retail/api/sendCode.d.ts +1 -1
- package/dist/retail/api/sendCode.js +1 -3
- package/dist/retail/api/sendCode.js.map +1 -1
- package/dist/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.d.ts +1 -0
- package/dist/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.js +8 -4
- package/dist/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.js.map +1 -1
- package/dist/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.d.ts +3 -2
- package/dist/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.js +18 -14
- package/dist/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.js.map +1 -1
- package/dist/retail/utils/mockLocalStorage.js +4 -1
- package/dist/retail/utils/mockLocalStorage.js.map +1 -1
- package/dist/retail/utils/saveToken.d.ts +2 -0
- package/dist/retail/utils/saveToken.js +8 -0
- package/dist/retail/utils/saveToken.js.map +1 -0
- package/lib/components/ApplicationLeadForm/ApplicationLeadForm.js +10 -2
- package/lib/components/ApplicationLeadForm/ApplicationLeadForm.js.map +1 -1
- package/lib/components/ApplicationLeadForm/useApplicationLeadApi.d.ts +2 -2
- package/lib/components/ApplicationLeadForm/useApplicationLeadApi.js +10 -6
- package/lib/components/ApplicationLeadForm/useApplicationLeadApi.js.map +1 -1
- package/lib/retail/api/checkCode.d.ts +1 -2
- package/lib/retail/api/checkCode.js +2 -8
- package/lib/retail/api/checkCode.js.map +1 -1
- package/lib/retail/api/esiaRequestProfile.js +1 -1
- package/lib/retail/api/esiaRequestProfile.js.map +1 -1
- package/lib/retail/api/sendCode.d.ts +1 -1
- package/lib/retail/api/sendCode.js +1 -3
- package/lib/retail/api/sendCode.js.map +1 -1
- package/lib/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.d.ts +1 -0
- package/lib/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.js +8 -4
- package/lib/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.js.map +1 -1
- package/lib/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.d.ts +3 -2
- package/lib/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.js +18 -14
- package/lib/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.js.map +1 -1
- package/lib/retail/utils/mockLocalStorage.js +4 -1
- package/lib/retail/utils/mockLocalStorage.js.map +1 -1
- package/lib/retail/utils/saveToken.d.ts +2 -0
- package/lib/retail/utils/saveToken.js +5 -0
- package/lib/retail/utils/saveToken.js.map +1 -0
- package/mobile/bundle/bundle.umd.js +50 -34
- package/mobile/bundle/bundle.umd.min.js +1 -1
- package/mobile/bundle/components/ApplicationLeadForm/useApplicationLeadApi.d.ts +2 -2
- package/mobile/bundle/retail/api/checkCode.d.ts +1 -2
- package/mobile/bundle/retail/api/sendCode.d.ts +1 -1
- package/mobile/bundle/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.d.ts +1 -0
- package/mobile/bundle/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.d.ts +3 -2
- package/mobile/bundle/retail/utils/saveToken.d.ts +2 -0
- package/mobile/dist/components/ApplicationLeadForm/ApplicationLeadForm.js +10 -2
- package/mobile/dist/components/ApplicationLeadForm/ApplicationLeadForm.js.map +1 -1
- package/mobile/dist/components/ApplicationLeadForm/useApplicationLeadApi.d.ts +2 -2
- package/mobile/dist/components/ApplicationLeadForm/useApplicationLeadApi.js +9 -5
- package/mobile/dist/components/ApplicationLeadForm/useApplicationLeadApi.js.map +1 -1
- package/mobile/dist/retail/api/checkCode.d.ts +1 -2
- package/mobile/dist/retail/api/checkCode.js +2 -9
- package/mobile/dist/retail/api/checkCode.js.map +1 -1
- package/mobile/dist/retail/api/esiaRequestProfile.js +2 -2
- package/mobile/dist/retail/api/esiaRequestProfile.js.map +1 -1
- package/mobile/dist/retail/api/sendCode.d.ts +1 -1
- package/mobile/dist/retail/api/sendCode.js +1 -3
- package/mobile/dist/retail/api/sendCode.js.map +1 -1
- package/mobile/dist/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.d.ts +1 -0
- package/mobile/dist/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.js +8 -4
- package/mobile/dist/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.js.map +1 -1
- package/mobile/dist/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.d.ts +3 -2
- package/mobile/dist/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.js +18 -14
- package/mobile/dist/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.js.map +1 -1
- package/mobile/dist/retail/utils/mockLocalStorage.js +4 -1
- package/mobile/dist/retail/utils/mockLocalStorage.js.map +1 -1
- package/mobile/dist/retail/utils/saveToken.d.ts +2 -0
- package/mobile/dist/retail/utils/saveToken.js +8 -0
- package/mobile/dist/retail/utils/saveToken.js.map +1 -0
- package/mobile/lib/components/ApplicationLeadForm/ApplicationLeadForm.js +10 -2
- package/mobile/lib/components/ApplicationLeadForm/ApplicationLeadForm.js.map +1 -1
- package/mobile/lib/components/ApplicationLeadForm/useApplicationLeadApi.d.ts +2 -2
- package/mobile/lib/components/ApplicationLeadForm/useApplicationLeadApi.js +10 -6
- package/mobile/lib/components/ApplicationLeadForm/useApplicationLeadApi.js.map +1 -1
- package/mobile/lib/retail/api/checkCode.d.ts +1 -2
- package/mobile/lib/retail/api/checkCode.js +2 -8
- package/mobile/lib/retail/api/checkCode.js.map +1 -1
- package/mobile/lib/retail/api/esiaRequestProfile.js +1 -1
- package/mobile/lib/retail/api/esiaRequestProfile.js.map +1 -1
- package/mobile/lib/retail/api/sendCode.d.ts +1 -1
- package/mobile/lib/retail/api/sendCode.js +1 -3
- package/mobile/lib/retail/api/sendCode.js.map +1 -1
- package/mobile/lib/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.d.ts +1 -0
- package/mobile/lib/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.js +8 -4
- package/mobile/lib/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.js.map +1 -1
- package/mobile/lib/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.d.ts +3 -2
- package/mobile/lib/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.js +18 -14
- package/mobile/lib/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.js.map +1 -1
- package/mobile/lib/retail/utils/mockLocalStorage.js +4 -1
- package/mobile/lib/retail/utils/mockLocalStorage.js.map +1 -1
- package/mobile/lib/retail/utils/saveToken.d.ts +2 -0
- package/mobile/lib/retail/utils/saveToken.js +5 -0
- package/mobile/lib/retail/utils/saveToken.js.map +1 -0
- package/mobile/src/components/ApplicationLeadForm/ApplicationLeadForm.tsx +10 -2
- package/mobile/src/components/ApplicationLeadForm/useApplicationLeadApi.tsx +11 -5
- package/mobile/src/retail/api/checkCode.ts +2 -9
- package/mobile/src/retail/api/esiaRequestProfile.ts +2 -1
- package/mobile/src/retail/api/sendCode.ts +1 -4
- package/mobile/src/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.tsx +15 -4
- package/mobile/src/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.tsx +22 -15
- package/mobile/src/retail/utils/mockLocalStorage.ts +6 -2
- package/mobile/src/retail/utils/saveToken.ts +6 -0
- package/package.json +1 -1
- package/src/components/ApplicationLeadForm/ApplicationLeadForm.tsx +10 -2
- package/src/components/ApplicationLeadForm/useApplicationLeadApi.tsx +11 -5
- package/src/retail/api/checkCode.ts +2 -9
- package/src/retail/api/esiaRequestProfile.ts +2 -1
- package/src/retail/api/sendCode.ts +1 -4
- package/src/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.tsx +15 -4
- package/src/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.tsx +22 -15
- package/src/retail/utils/mockLocalStorage.ts +6 -2
- package/src/retail/utils/saveToken.ts +6 -0
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/* eslint-disable max-lines */
|
|
2
|
-
import { useCallback
|
|
2
|
+
import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
|
|
3
3
|
import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
|
|
4
4
|
import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
|
|
5
5
|
import { locationNavigator } from '../../external/locationNavigator.js';
|
|
@@ -23,9 +23,8 @@ import { useLeadFormStore } from './useLeadFormStore.js';
|
|
|
23
23
|
import { useSaveUserData } from './useSaveUserData.js';
|
|
24
24
|
import { useSendLeadFormAspects } from './useSendLeadFormAspects.js';
|
|
25
25
|
// eslint-disable-next-line max-lines-per-function
|
|
26
|
-
export const useApplicationLeadApi = ({ programId, nextStepLink, productType, data, }) => {
|
|
26
|
+
export const useApplicationLeadApi = ({ programId, nextStepLink, productType, data, changeSubmitFormStatus, }) => {
|
|
27
27
|
const [isSending, { setTrue: startSending, setFalse: endSending }] = useBool(false);
|
|
28
|
-
const [ok, setOK] = useState();
|
|
29
28
|
const saveUserData = useSaveUserData();
|
|
30
29
|
const sessionStore = useSessionStore();
|
|
31
30
|
const leadFormStore = useLeadFormStore();
|
|
@@ -37,6 +36,10 @@ export const useApplicationLeadApi = ({ programId, nextStepLink, productType, da
|
|
|
37
36
|
const consentBkiDialog = useConsentBkiDialog(goToNextStep);
|
|
38
37
|
const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
|
|
39
38
|
const draftDialog = useDraftDialog();
|
|
39
|
+
const handleFailSendForm = () => {
|
|
40
|
+
verifyPhoneDialog.close();
|
|
41
|
+
changeSubmitFormStatus(false);
|
|
42
|
+
};
|
|
40
43
|
const handleSubmit = useCallback(async (formData) => {
|
|
41
44
|
try {
|
|
42
45
|
startSending();
|
|
@@ -87,7 +90,7 @@ export const useApplicationLeadApi = ({ programId, nextStepLink, productType, da
|
|
|
87
90
|
}
|
|
88
91
|
}
|
|
89
92
|
catch {
|
|
90
|
-
|
|
93
|
+
handleFailSendForm();
|
|
91
94
|
}
|
|
92
95
|
};
|
|
93
96
|
const acceptedConsents = getAcceptedConsents(transformedFormData, productType);
|
|
@@ -95,16 +98,17 @@ export const useApplicationLeadApi = ({ programId, nextStepLink, productType, da
|
|
|
95
98
|
phone: transformedFormData.phone,
|
|
96
99
|
consents: acceptedConsents,
|
|
97
100
|
onSuccess: handleSuccessVerify,
|
|
101
|
+
onFail: handleFailSendForm,
|
|
98
102
|
});
|
|
99
103
|
}
|
|
100
104
|
catch {
|
|
101
|
-
|
|
105
|
+
handleFailSendForm();
|
|
102
106
|
}
|
|
103
107
|
finally {
|
|
104
108
|
endSending();
|
|
105
109
|
}
|
|
106
110
|
}, []);
|
|
107
|
-
return { isSending,
|
|
111
|
+
return { isSending, handleSubmit };
|
|
108
112
|
};
|
|
109
113
|
const getAcceptedConsents = (formData, productType) => {
|
|
110
114
|
const consents = productTypeToConsentsMap[productType];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useApplicationLeadApi.js","sourceRoot":"","sources":["../../../src/components/ApplicationLeadForm/useApplicationLeadApi.tsx"],"names":[],"mappings":"AAAA,8BAA8B;AAC9B,OAAO,EAAE,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"useApplicationLeadApi.js","sourceRoot":"","sources":["../../../src/components/ApplicationLeadForm/useApplicationLeadApi.tsx"],"names":[],"mappings":"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"}
|
|
@@ -9,5 +9,4 @@ export declare type CheckCodeResponse = {
|
|
|
9
9
|
expires_in: number;
|
|
10
10
|
refresh_token: string;
|
|
11
11
|
};
|
|
12
|
-
export declare const checkCode: (body: CheckCodeBody) => Promise<
|
|
13
|
-
export declare const saveToken: (data: CheckCodeResponse | null) => void;
|
|
12
|
+
export declare const checkCode: (body: CheckCodeBody) => Promise<Response>;
|
|
@@ -1,9 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export const checkCode = async (body) =>
|
|
3
|
-
export const saveToken = (data) => {
|
|
4
|
-
if (data?.access_token && data?.refresh_token) {
|
|
5
|
-
globalThis.sessionStorage.setItem('accessToken', data.access_token);
|
|
6
|
-
globalThis.sessionStorage.setItem('refreshToken', data.refresh_token);
|
|
7
|
-
}
|
|
8
|
-
};
|
|
1
|
+
import { doRequest } from './doRequest.js';
|
|
2
|
+
export const checkCode = async (body) => await doRequest('/sms/checkCode', 'POST', body);
|
|
9
3
|
//# sourceMappingURL=checkCode.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkCode.js","sourceRoot":"","sources":["../../../src/retail/api/checkCode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"checkCode.js","sourceRoot":"","sources":["../../../src/retail/api/checkCode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAexC,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAAE,IAAmB,EAAE,EAAE,CACrD,MAAM,SAAS,CAAC,gBAAgB,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { saveToken } from '
|
|
1
|
+
import { saveToken } from '../utils/saveToken.js';
|
|
2
2
|
import { fetchRetailJSON } from './doRequest.js';
|
|
3
3
|
import { updateRefreshToken } from './updateRefreshToken.js';
|
|
4
4
|
export const esiaRequestProfile = (body) => fetchRetailJSON('/esia/requestProfile', 'POST', body).then((res) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"esiaRequestProfile.js","sourceRoot":"","sources":["../../../src/retail/api/esiaRequestProfile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"esiaRequestProfile.js","sourceRoot":"","sources":["../../../src/retail/api/esiaRequestProfile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAsF1D,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,IAA4B,EAAE,EAAE,CACjE,eAAe,CAA6B,sBAAsB,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;IAC7F,IAAI,GAAG,EAAE,YAAY,IAAI,GAAG,EAAE,aAAa,EAAE;QAC3C,SAAS,CAAC,GAAG,CAAC,CAAC;QACf,kBAAkB,CAAC,IAAI,CAAC,CAAC;KAC1B;IAED,OAAO,GAAG,CAAC;AACb,CAAC,CAAC,CAAC"}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
1
|
import { doRequest } from './doRequest.js';
|
|
2
|
-
export const sendCode = (body) => doRequest('/sms/sendCode', 'POST', body)
|
|
3
|
-
.then((res) => res.text())
|
|
4
|
-
.then((text) => text === 'OK');
|
|
2
|
+
export const sendCode = (body) => doRequest('/sms/sendCode', 'POST', body);
|
|
5
3
|
//# sourceMappingURL=sendCode.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sendCode.js","sourceRoot":"","sources":["../../../src/retail/api/sendCode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AASxC,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,IAAkB,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"sendCode.js","sourceRoot":"","sources":["../../../src/retail/api/sendCode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AASxC,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,IAAkB,EAAE,EAAE,CAAC,SAAS,CAAC,eAAe,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC"}
|
|
@@ -4,5 +4,6 @@ export interface VerifyPhoneDialogProps extends OnCloseProps {
|
|
|
4
4
|
withDescription?: boolean;
|
|
5
5
|
consents?: string[];
|
|
6
6
|
onSuccess?: (smsCode?: string) => void;
|
|
7
|
+
onFail?: () => void;
|
|
7
8
|
}
|
|
8
9
|
export declare const VerifyPhoneDialog: import("@redneckz/uni-jsx").UNIComponent<VerifyPhoneDialogProps, any, any>;
|
|
@@ -12,12 +12,13 @@ import { sendCode } from '../../api/sendCode.js';
|
|
|
12
12
|
import { CaptchaDialog } from '../CaptchaDialog/CaptchaDialog.js';
|
|
13
13
|
import { TIME_TO_RESEND, useVerifyPhoneDialogSubmit, } from './useVerifyPhoneDialogSubmit.js';
|
|
14
14
|
const CODE_LENGTH = 4;
|
|
15
|
-
export const VerifyPhoneDialog = JSX(({ phone, withDescription = true, consents, onSuccess = noop, onClose = noop }) => {
|
|
15
|
+
export const VerifyPhoneDialog = JSX(({ phone, withDescription = true, consents, onSuccess = noop, onClose = noop, onFail = noop, }) => {
|
|
16
16
|
const [values, setValues] = useState(Array(CODE_LENGTH).fill(''));
|
|
17
17
|
const sessionStore = useSessionStore();
|
|
18
18
|
const { handleSubmit, hasError, errorText, isLoading, timeNextReq, isSubmitButtonDisabled, setTimeNextReq, setErrorText, } = useVerifyPhoneDialogSubmit({
|
|
19
19
|
values,
|
|
20
20
|
onSuccess,
|
|
21
|
+
onFail,
|
|
21
22
|
});
|
|
22
23
|
const captchaDialog = useDialog(CaptchaDialog);
|
|
23
24
|
const phoneNumber = formatPhone(phone);
|
|
@@ -27,7 +28,7 @@ export const VerifyPhoneDialog = JSX(({ phone, withDescription = true, consents,
|
|
|
27
28
|
phoneNumber,
|
|
28
29
|
smsCodesSetName: { key: 'AUTHENTICATION' },
|
|
29
30
|
});
|
|
30
|
-
if (response) {
|
|
31
|
+
if (response.ok) {
|
|
31
32
|
setTimeNextReq(TIME_TO_RESEND);
|
|
32
33
|
restartTimer(TIME_TO_RESEND);
|
|
33
34
|
setErrorText('');
|
|
@@ -36,10 +37,13 @@ export const VerifyPhoneDialog = JSX(({ phone, withDescription = true, consents,
|
|
|
36
37
|
attempts: 0,
|
|
37
38
|
};
|
|
38
39
|
}
|
|
39
|
-
else {
|
|
40
|
+
else if (response.status === 429) {
|
|
40
41
|
captchaDialog.open({ phoneNumber, sendCode: handleSendCode });
|
|
41
42
|
}
|
|
42
|
-
|
|
43
|
+
else {
|
|
44
|
+
onFail();
|
|
45
|
+
}
|
|
46
|
+
}, [phoneNumber, restartTimer]);
|
|
43
47
|
useEffect(() => {
|
|
44
48
|
if (!sessionStore.smsCode?.sendTime) {
|
|
45
49
|
handleSendCode();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VerifyPhoneDialog.js","sourceRoot":"","sources":["../../../../src/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAE9E,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,uBAAuB,EAAE,MAAM,iEAAiE,CAAC;AAC1G,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EACL,cAAc,EACd,0BAA0B,GAE3B,MAAM,8BAA8B,CAAC;AAEtC,MAAM,WAAW,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"VerifyPhoneDialog.js","sourceRoot":"","sources":["../../../../src/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
export declare const TIME_TO_RESEND = 180;
|
|
2
2
|
declare type useVerifyPhoneDialogSubmitProps = {
|
|
3
3
|
values: string[];
|
|
4
|
-
onSuccess
|
|
4
|
+
onSuccess: (smsCode?: string) => void;
|
|
5
|
+
onFail: () => void;
|
|
5
6
|
};
|
|
6
7
|
export interface SmsCodeStore {
|
|
7
8
|
smsCode: {
|
|
@@ -9,7 +10,7 @@ export interface SmsCodeStore {
|
|
|
9
10
|
attempts?: number;
|
|
10
11
|
};
|
|
11
12
|
}
|
|
12
|
-
export declare const useVerifyPhoneDialogSubmit: ({ values, onSuccess, }: useVerifyPhoneDialogSubmitProps) => {
|
|
13
|
+
export declare const useVerifyPhoneDialogSubmit: ({ values, onSuccess, onFail, }: useVerifyPhoneDialogSubmitProps) => {
|
|
13
14
|
handleSubmit: () => Promise<void>;
|
|
14
15
|
hasError: boolean;
|
|
15
16
|
errorText: string;
|
|
@@ -3,8 +3,9 @@ import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
|
|
|
3
3
|
import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
|
|
4
4
|
import { getTimer } from '../../../utils/getTimer.js';
|
|
5
5
|
import { checkCode } from '../../api/checkCode.js';
|
|
6
|
+
import { saveToken } from '../../utils/saveToken.js';
|
|
6
7
|
export const TIME_TO_RESEND = 180;
|
|
7
|
-
export const useVerifyPhoneDialogSubmit = ({ values, onSuccess, }) => {
|
|
8
|
+
export const useVerifyPhoneDialogSubmit = ({ values, onSuccess, onFail, }) => {
|
|
8
9
|
const sessionStore = useSessionStore();
|
|
9
10
|
const attempts = sessionStore.smsCode?.attempts || 0;
|
|
10
11
|
const timer = Math.max(getTimer(sessionStore.smsCode?.sendTime || Date.now()), 0);
|
|
@@ -15,27 +16,30 @@ export const useVerifyPhoneDialogSubmit = ({ values, onSuccess, }) => {
|
|
|
15
16
|
const isTimeExpired = Boolean(timeNextReq === 0 && sessionStore.smsCode?.sendTime);
|
|
16
17
|
const isSubmitButtonDisabled = attempts > 2 || isTimeExpired || !values.every(Boolean);
|
|
17
18
|
const handleSubmit = useCallback(async () => {
|
|
18
|
-
|
|
19
|
-
sessionStore.smsCode
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
19
|
+
sessionStore.smsCode = {
|
|
20
|
+
...sessionStore.smsCode,
|
|
21
|
+
attempts: attempts + 1,
|
|
22
|
+
};
|
|
23
|
+
startLoading();
|
|
24
|
+
const response = await checkCode({
|
|
25
|
+
smsText: values.join(''),
|
|
26
|
+
smsCodesSetName: { key: 'AUTHENTICATION' },
|
|
27
|
+
});
|
|
28
|
+
if (response.ok) {
|
|
29
|
+
const data = (await response.json());
|
|
30
|
+
saveToken(data);
|
|
28
31
|
setTimeNextReq(0);
|
|
29
32
|
resetError();
|
|
30
33
|
sessionStore.smsCode = null;
|
|
31
34
|
onSuccess?.(values.join(''));
|
|
32
35
|
}
|
|
33
|
-
|
|
36
|
+
else if (response.status === 403) {
|
|
34
37
|
setErrorText(attempts > 1 ? 'Исчерпан лимит ввода смс-кода' : 'Неверный код');
|
|
35
38
|
}
|
|
36
|
-
|
|
37
|
-
|
|
39
|
+
else {
|
|
40
|
+
onFail();
|
|
38
41
|
}
|
|
42
|
+
endLoading();
|
|
39
43
|
}, [values, attempts]);
|
|
40
44
|
useEffect(() => {
|
|
41
45
|
if (isTimeExpired) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useVerifyPhoneDialogSubmit.js","sourceRoot":"","sources":["../../../../src/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"useVerifyPhoneDialogSubmit.js","sourceRoot":"","sources":["../../../../src/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.tsx"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { checkCode } from '../api/checkCode.js';
|
|
|
2
2
|
import { createDraftTask } from '../api/createDraftTask.js';
|
|
3
3
|
import { createUserProfile } from '../api/createUserProfile.js';
|
|
4
4
|
import { sendCode } from '../api/sendCode.js';
|
|
5
|
+
import { saveToken } from './saveToken.js';
|
|
5
6
|
const PHONE = '+11111111111';
|
|
6
7
|
const PROGRAM_ID = '13';
|
|
7
8
|
export const mockLocalStorage = async () => {
|
|
@@ -12,10 +13,12 @@ export const mockLocalStorage = async () => {
|
|
|
12
13
|
phoneNumber: PHONE,
|
|
13
14
|
smsCodesSetName: { key: 'AUTHENTICATION' },
|
|
14
15
|
});
|
|
15
|
-
await checkCode({
|
|
16
|
+
const response = await checkCode({
|
|
16
17
|
smsCodesSetName: { key: 'AUTHENTICATION' },
|
|
17
18
|
smsText: '1234',
|
|
18
19
|
});
|
|
20
|
+
const data = (await response.json());
|
|
21
|
+
saveToken(data);
|
|
19
22
|
const task = {
|
|
20
23
|
taskId: globalThis.localStorage.getItem('taskId'),
|
|
21
24
|
participantId: globalThis.localStorage.getItem('participantId'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mockLocalStorage.js","sourceRoot":"","sources":["../../../src/retail/utils/mockLocalStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"mockLocalStorage.js","sourceRoot":"","sources":["../../../src/retail/utils/mockLocalStorage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA0B,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,KAAK,GAAG,cAAc,CAAC;AAC7B,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;IACzC,MAAM,SAAS,GAAG,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,UAAU,CAAC;IAE7E,MAAM,SAAS,GACb,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC;QAC5C,CAAC,MAAM,iBAAiB,CAAC,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;IAE3D,MAAM,QAAQ,CAAC;QACb,WAAW,EAAE,KAAK;QAClB,eAAe,EAAE,EAAE,GAAG,EAAE,gBAAgB,EAAE;KAC3C,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC;QAC/B,eAAe,EAAE,EAAE,GAAG,EAAE,gBAAgB,EAAE;QAC1C,OAAO,EAAE,MAAM;KAChB,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAsB,CAAC;IAC1D,SAAS,CAAC,IAAI,CAAC,CAAC;IAEhB,MAAM,IAAI,GAAG;QACX,MAAM,EAAE,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC;QACjD,aAAa,EAAE,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,eAAe,CAAC;KAChE,CAAC;IAEF,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;QACvC,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QACjF,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;KAC5B;IAED,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IACxD,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;IAChE,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAC/D,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,eAAe,EAAE,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;AAC/E,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"saveToken.js","sourceRoot":"","sources":["../../../src/retail/utils/saveToken.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAuB,EAAE,EAAE;IACnD,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IACpE,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,cAAc,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;AACxE,CAAC,CAAC"}
|
|
@@ -45,6 +45,7 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
|
|
|
45
45
|
...rest
|
|
46
46
|
}) => {
|
|
47
47
|
const [esiaStatus, setEsiaStatus] = useState<EsiaStatuses>();
|
|
48
|
+
const [ok, setOK] = useState<boolean | undefined>();
|
|
48
49
|
const [attemptsWithoutConsents, setAttemptsWithoutConsents] = useState(0);
|
|
49
50
|
const leadForm = useRef<HTMLFormElement | null>(null);
|
|
50
51
|
const applicationFormData = useMemo(() => getApplicationFormData(productType), [productType]);
|
|
@@ -56,6 +57,9 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
|
|
|
56
57
|
() => getFormValidator(inputs, extendedValidatorObj),
|
|
57
58
|
[inputs, extendedValidatorObj],
|
|
58
59
|
);
|
|
60
|
+
const changeSubmitFormStatus = (status?: boolean) => {
|
|
61
|
+
setOK(status);
|
|
62
|
+
};
|
|
59
63
|
|
|
60
64
|
const initialFormState = useInitApplicationLead({
|
|
61
65
|
inputs,
|
|
@@ -64,11 +68,12 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
|
|
|
64
68
|
setEsiaStatus,
|
|
65
69
|
esiaAuthSuccess: esiaStatus === EsiaStatuses.Success,
|
|
66
70
|
});
|
|
67
|
-
const { isSending,
|
|
71
|
+
const { isSending, handleSubmit } = useApplicationLeadApi({
|
|
68
72
|
programId,
|
|
69
73
|
nextStepLink,
|
|
70
74
|
productType,
|
|
71
75
|
data,
|
|
76
|
+
changeSubmitFormStatus,
|
|
72
77
|
});
|
|
73
78
|
|
|
74
79
|
const [, { field, onSubmit, reset }] = useForm(initialFormState, {
|
|
@@ -90,7 +95,10 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
|
|
|
90
95
|
const responseTypeDialog = useDialog(ResponseTypeDialog);
|
|
91
96
|
useEffect(() => {
|
|
92
97
|
if (ok !== undefined) {
|
|
93
|
-
responseTypeDialog.open({
|
|
98
|
+
responseTypeDialog.open({
|
|
99
|
+
ok,
|
|
100
|
+
onClose: () => changeSubmitFormStatus(undefined),
|
|
101
|
+
});
|
|
94
102
|
}
|
|
95
103
|
}, [ok]);
|
|
96
104
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/* eslint-disable max-lines */
|
|
2
|
-
import { useCallback
|
|
2
|
+
import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
|
|
3
3
|
import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
|
|
4
4
|
import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
|
|
5
5
|
import { locationNavigator } from '../../external/locationNavigator';
|
|
@@ -32,6 +32,7 @@ interface ApplicationLeadApiProps extends AspectsProps {
|
|
|
32
32
|
programId: string;
|
|
33
33
|
nextStepLink: string;
|
|
34
34
|
productType: ProductType;
|
|
35
|
+
changeSubmitFormStatus: (status?: boolean) => void;
|
|
35
36
|
}
|
|
36
37
|
|
|
37
38
|
// eslint-disable-next-line max-lines-per-function
|
|
@@ -40,9 +41,9 @@ export const useApplicationLeadApi = ({
|
|
|
40
41
|
nextStepLink,
|
|
41
42
|
productType,
|
|
42
43
|
data,
|
|
44
|
+
changeSubmitFormStatus,
|
|
43
45
|
}: ApplicationLeadApiProps) => {
|
|
44
46
|
const [isSending, { setTrue: startSending, setFalse: endSending }] = useBool(false);
|
|
45
|
-
const [ok, setOK] = useState<boolean | undefined>();
|
|
46
47
|
const saveUserData = useSaveUserData();
|
|
47
48
|
const sessionStore = useSessionStore<ApplicationLeadStore>();
|
|
48
49
|
const leadFormStore = useLeadFormStore();
|
|
@@ -57,6 +58,10 @@ export const useApplicationLeadApi = ({
|
|
|
57
58
|
const consentBkiDialog = useConsentBkiDialog(goToNextStep);
|
|
58
59
|
const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
|
|
59
60
|
const draftDialog = useDraftDialog();
|
|
61
|
+
const handleFailSendForm = () => {
|
|
62
|
+
verifyPhoneDialog.close();
|
|
63
|
+
changeSubmitFormStatus(false);
|
|
64
|
+
};
|
|
60
65
|
|
|
61
66
|
const handleSubmit = useCallback(async (formData: LeadFormState) => {
|
|
62
67
|
try {
|
|
@@ -109,7 +114,7 @@ export const useApplicationLeadApi = ({
|
|
|
109
114
|
await sendCurrentTask();
|
|
110
115
|
}
|
|
111
116
|
} catch {
|
|
112
|
-
|
|
117
|
+
handleFailSendForm();
|
|
113
118
|
}
|
|
114
119
|
};
|
|
115
120
|
|
|
@@ -119,15 +124,16 @@ export const useApplicationLeadApi = ({
|
|
|
119
124
|
phone: transformedFormData.phone as string,
|
|
120
125
|
consents: acceptedConsents,
|
|
121
126
|
onSuccess: handleSuccessVerify,
|
|
127
|
+
onFail: handleFailSendForm,
|
|
122
128
|
});
|
|
123
129
|
} catch {
|
|
124
|
-
|
|
130
|
+
handleFailSendForm();
|
|
125
131
|
} finally {
|
|
126
132
|
endSending();
|
|
127
133
|
}
|
|
128
134
|
}, []);
|
|
129
135
|
|
|
130
|
-
return { isSending,
|
|
136
|
+
return { isSending, handleSubmit };
|
|
131
137
|
};
|
|
132
138
|
|
|
133
139
|
const getAcceptedConsents = (formData: LeadFormState, productType: ProductType): string[] => {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { doRequest } from './doRequest';
|
|
2
2
|
|
|
3
3
|
export type CheckCodeBody = {
|
|
4
4
|
smsText: string;
|
|
@@ -14,11 +14,4 @@ export type CheckCodeResponse = {
|
|
|
14
14
|
};
|
|
15
15
|
|
|
16
16
|
export const checkCode = async (body: CheckCodeBody) =>
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
export const saveToken = (data: CheckCodeResponse | null) => {
|
|
20
|
-
if (data?.access_token && data?.refresh_token) {
|
|
21
|
-
globalThis.sessionStorage.setItem('accessToken', data.access_token);
|
|
22
|
-
globalThis.sessionStorage.setItem('refreshToken', data.refresh_token);
|
|
23
|
-
}
|
|
24
|
-
};
|
|
17
|
+
await doRequest('/sms/checkCode', 'POST', body);
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { saveToken
|
|
1
|
+
import { saveToken } from '../utils/saveToken';
|
|
2
|
+
import { type CheckCodeResponse } from './checkCode';
|
|
2
3
|
import { fetchRetailJSON } from './doRequest';
|
|
3
4
|
import { updateRefreshToken } from './updateRefreshToken';
|
|
4
5
|
|
|
@@ -7,7 +7,4 @@ export type SendCodeBody = {
|
|
|
7
7
|
};
|
|
8
8
|
};
|
|
9
9
|
|
|
10
|
-
export const sendCode = (body: SendCodeBody) =>
|
|
11
|
-
doRequest('/sms/sendCode', 'POST', body)
|
|
12
|
-
.then((res) => res.text())
|
|
13
|
-
.then((text) => text === 'OK');
|
|
10
|
+
export const sendCode = (body: SendCodeBody) => doRequest('/sms/sendCode', 'POST', body);
|
|
@@ -23,10 +23,18 @@ export interface VerifyPhoneDialogProps extends OnCloseProps {
|
|
|
23
23
|
withDescription?: boolean;
|
|
24
24
|
consents?: string[];
|
|
25
25
|
onSuccess?: (smsCode?: string) => void;
|
|
26
|
+
onFail?: () => void;
|
|
26
27
|
}
|
|
27
28
|
|
|
28
29
|
export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
|
|
29
|
-
({
|
|
30
|
+
({
|
|
31
|
+
phone,
|
|
32
|
+
withDescription = true,
|
|
33
|
+
consents,
|
|
34
|
+
onSuccess = noop,
|
|
35
|
+
onClose = noop,
|
|
36
|
+
onFail = noop,
|
|
37
|
+
}) => {
|
|
30
38
|
const [values, setValues] = useState<string[]>(Array(CODE_LENGTH).fill('') as string[]);
|
|
31
39
|
const sessionStore = useSessionStore<SmsCodeStore>();
|
|
32
40
|
|
|
@@ -42,6 +50,7 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
|
|
|
42
50
|
} = useVerifyPhoneDialogSubmit({
|
|
43
51
|
values,
|
|
44
52
|
onSuccess,
|
|
53
|
+
onFail,
|
|
45
54
|
});
|
|
46
55
|
|
|
47
56
|
const captchaDialog = useDialog(CaptchaDialog);
|
|
@@ -54,7 +63,7 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
|
|
|
54
63
|
smsCodesSetName: { key: 'AUTHENTICATION' },
|
|
55
64
|
});
|
|
56
65
|
|
|
57
|
-
if (response) {
|
|
66
|
+
if (response.ok) {
|
|
58
67
|
setTimeNextReq(TIME_TO_RESEND);
|
|
59
68
|
restartTimer(TIME_TO_RESEND);
|
|
60
69
|
setErrorText('');
|
|
@@ -62,10 +71,12 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
|
|
|
62
71
|
sendTime: Date.now(),
|
|
63
72
|
attempts: 0,
|
|
64
73
|
};
|
|
65
|
-
} else {
|
|
74
|
+
} else if (response.status === 429) {
|
|
66
75
|
captchaDialog.open({ phoneNumber, sendCode: handleSendCode });
|
|
76
|
+
} else {
|
|
77
|
+
onFail();
|
|
67
78
|
}
|
|
68
|
-
}, [phoneNumber, restartTimer
|
|
79
|
+
}, [phoneNumber, restartTimer]);
|
|
69
80
|
|
|
70
81
|
useEffect(() => {
|
|
71
82
|
if (!sessionStore.smsCode?.sendTime) {
|
|
@@ -2,13 +2,15 @@ import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
|
|
|
2
2
|
import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
|
|
3
3
|
import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
|
|
4
4
|
import { getTimer } from '../../../utils/getTimer';
|
|
5
|
-
import { checkCode } from '../../api/checkCode';
|
|
5
|
+
import { checkCode, type CheckCodeResponse } from '../../api/checkCode';
|
|
6
|
+
import { saveToken } from '../../utils/saveToken';
|
|
6
7
|
|
|
7
8
|
export const TIME_TO_RESEND = 180;
|
|
8
9
|
|
|
9
10
|
type useVerifyPhoneDialogSubmitProps = {
|
|
10
11
|
values: string[];
|
|
11
|
-
onSuccess
|
|
12
|
+
onSuccess: (smsCode?: string) => void;
|
|
13
|
+
onFail: () => void;
|
|
12
14
|
};
|
|
13
15
|
|
|
14
16
|
export interface SmsCodeStore {
|
|
@@ -21,6 +23,7 @@ export interface SmsCodeStore {
|
|
|
21
23
|
export const useVerifyPhoneDialogSubmit = ({
|
|
22
24
|
values,
|
|
23
25
|
onSuccess,
|
|
26
|
+
onFail,
|
|
24
27
|
}: useVerifyPhoneDialogSubmitProps) => {
|
|
25
28
|
const sessionStore = useSessionStore<SmsCodeStore>();
|
|
26
29
|
const attempts = sessionStore.smsCode?.attempts || 0;
|
|
@@ -36,25 +39,29 @@ export const useVerifyPhoneDialogSubmit = ({
|
|
|
36
39
|
const isSubmitButtonDisabled = attempts > 2 || isTimeExpired || !values.every(Boolean);
|
|
37
40
|
|
|
38
41
|
const handleSubmit = useCallback(async () => {
|
|
39
|
-
|
|
40
|
-
sessionStore.smsCode
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
42
|
+
sessionStore.smsCode = {
|
|
43
|
+
...sessionStore.smsCode,
|
|
44
|
+
attempts: attempts + 1,
|
|
45
|
+
};
|
|
46
|
+
startLoading();
|
|
47
|
+
const response = await checkCode({
|
|
48
|
+
smsText: values.join(''),
|
|
49
|
+
smsCodesSetName: { key: 'AUTHENTICATION' },
|
|
50
|
+
});
|
|
51
|
+
|
|
52
|
+
if (response.ok) {
|
|
53
|
+
const data = (await response.json()) as CheckCodeResponse;
|
|
54
|
+
saveToken(data);
|
|
49
55
|
setTimeNextReq(0);
|
|
50
56
|
resetError();
|
|
51
57
|
sessionStore.smsCode = null;
|
|
52
58
|
onSuccess?.(values.join(''));
|
|
53
|
-
}
|
|
59
|
+
} else if (response.status === 403) {
|
|
54
60
|
setErrorText(attempts > 1 ? 'Исчерпан лимит ввода смс-кода' : 'Неверный код');
|
|
55
|
-
}
|
|
56
|
-
|
|
61
|
+
} else {
|
|
62
|
+
onFail();
|
|
57
63
|
}
|
|
64
|
+
endLoading();
|
|
58
65
|
}, [values, attempts]);
|
|
59
66
|
|
|
60
67
|
useEffect(() => {
|