@redneckz/wildless-cms-uni-blocks 0.14.926 → 0.14.927

package/mobile/src/retail/utils/mockLocalStorage.ts

@@ -1,7 +1,8 @@
-import { checkCode } from '../api/checkCode';
+import { checkCode, type CheckCodeResponse } from '../api/checkCode';
 import { createDraftTask } from '../api/createDraftTask';
 import { createUserProfile } from '../api/createUserProfile';
 import { sendCode } from '../api/sendCode';
+import { saveToken } from './saveToken';
 
 const PHONE = '+11111111111';
 const PROGRAM_ID = '13';
@@ -18,11 +19,14 @@ export const mockLocalStorage = async () => {
     smsCodesSetName: { key: 'AUTHENTICATION' },
   });
 
-  await checkCode({
+  const response = await checkCode({
     smsCodesSetName: { key: 'AUTHENTICATION' },
     smsText: '1234',
   });
 
+  const data = (await response.json()) as CheckCodeResponse;
+  saveToken(data);
+
   const task = {
     taskId: globalThis.localStorage.getItem('taskId'),
     participantId: globalThis.localStorage.getItem('participantId'),

package/mobile/src/retail/utils/saveToken.ts

@@ -0,0 +1,6 @@
+import { type CheckCodeResponse } from '../api/checkCode';
+
+export const saveToken = (data: CheckCodeResponse) => {
+  globalThis.sessionStorage.setItem('accessToken', data.access_token);
+  globalThis.sessionStorage.setItem('refreshToken', data.refresh_token);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.926",
+  "version": "0.14.927",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/components/ApplicationLeadForm/ApplicationLeadForm.tsx

@@ -45,6 +45,7 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
     ...rest
   }) => {
     const [esiaStatus, setEsiaStatus] = useState<EsiaStatuses>();
+    const [ok, setOK] = useState<boolean | undefined>();
     const [attemptsWithoutConsents, setAttemptsWithoutConsents] = useState(0);
     const leadForm = useRef<HTMLFormElement | null>(null);
     const applicationFormData = useMemo(() => getApplicationFormData(productType), [productType]);
@@ -56,6 +57,9 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
       () => getFormValidator(inputs, extendedValidatorObj),
       [inputs, extendedValidatorObj],
     );
+    const changeSubmitFormStatus = (status?: boolean) => {
+      setOK(status);
+    };
 
     const initialFormState = useInitApplicationLead({
       inputs,
@@ -64,11 +68,12 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
       setEsiaStatus,
       esiaAuthSuccess: esiaStatus === EsiaStatuses.Success,
     });
-    const { isSending, ok, handleSubmit } = useApplicationLeadApi({
+    const { isSending, handleSubmit } = useApplicationLeadApi({
       programId,
       nextStepLink,
       productType,
       data,
+      changeSubmitFormStatus,
     });
 
     const [, { field, onSubmit, reset }] = useForm(initialFormState, {
@@ -90,7 +95,10 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
     const responseTypeDialog = useDialog(ResponseTypeDialog);
     useEffect(() => {
       if (ok !== undefined) {
-        responseTypeDialog.open({ ok });
+        responseTypeDialog.open({
+          ok,
+          onClose: () => changeSubmitFormStatus(undefined),
+        });
       }
     }, [ok]);
 

package/src/components/ApplicationLeadForm/useApplicationLeadApi.tsx

@@ -1,5 +1,5 @@
 /* eslint-disable max-lines */
-import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
 import { locationNavigator } from '../../external/locationNavigator';
@@ -32,6 +32,7 @@ interface ApplicationLeadApiProps extends AspectsProps {
   programId: string;
   nextStepLink: string;
   productType: ProductType;
+  changeSubmitFormStatus: (status?: boolean) => void;
 }
 
 // eslint-disable-next-line max-lines-per-function
@@ -40,9 +41,9 @@ export const useApplicationLeadApi = ({
   nextStepLink,
   productType,
   data,
+  changeSubmitFormStatus,
 }: ApplicationLeadApiProps) => {
   const [isSending, { setTrue: startSending, setFalse: endSending }] = useBool(false);
-  const [ok, setOK] = useState<boolean | undefined>();
   const saveUserData = useSaveUserData();
   const sessionStore = useSessionStore<ApplicationLeadStore>();
   const leadFormStore = useLeadFormStore();
@@ -57,6 +58,10 @@ export const useApplicationLeadApi = ({
   const consentBkiDialog = useConsentBkiDialog(goToNextStep);
   const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
   const draftDialog = useDraftDialog();
+  const handleFailSendForm = () => {
+    verifyPhoneDialog.close();
+    changeSubmitFormStatus(false);
+  };
 
   const handleSubmit = useCallback(async (formData: LeadFormState) => {
     try {
@@ -109,7 +114,7 @@ export const useApplicationLeadApi = ({
             await sendCurrentTask();
           }
         } catch {
-          setOK(false);
+          handleFailSendForm();
         }
       };
 
@@ -119,15 +124,16 @@ export const useApplicationLeadApi = ({
         phone: transformedFormData.phone as string,
         consents: acceptedConsents,
         onSuccess: handleSuccessVerify,
+        onFail: handleFailSendForm,
       });
     } catch {
-      setOK(false);
+      handleFailSendForm();
     } finally {
       endSending();
     }
   }, []);
 
-  return { isSending, ok, handleSubmit };
+  return { isSending, handleSubmit };
 };
 
 const getAcceptedConsents = (formData: LeadFormState, productType: ProductType): string[] => {

package/src/retail/api/checkCode.ts

@@ -1,4 +1,4 @@
-import { fetchRetailJSON } from './doRequest';
+import { doRequest } from './doRequest';
 
 export type CheckCodeBody = {
   smsText: string;
@@ -14,11 +14,4 @@ export type CheckCodeResponse = {
 };
 
 export const checkCode = async (body: CheckCodeBody) =>
-  fetchRetailJSON<CheckCodeResponse>('/sms/checkCode', 'POST', body).then(saveToken);
-
-export const saveToken = (data: CheckCodeResponse | null) => {
-  if (data?.access_token && data?.refresh_token) {
-    globalThis.sessionStorage.setItem('accessToken', data.access_token);
-    globalThis.sessionStorage.setItem('refreshToken', data.refresh_token);
-  }
-};
+  await doRequest('/sms/checkCode', 'POST', body);

package/src/retail/api/esiaRequestProfile.ts

@@ -1,4 +1,5 @@
-import { saveToken, type CheckCodeResponse } from './checkCode';
+import { saveToken } from '../utils/saveToken';
+import { type CheckCodeResponse } from './checkCode';
 import { fetchRetailJSON } from './doRequest';
 import { updateRefreshToken } from './updateRefreshToken';
 

package/src/retail/api/sendCode.ts

@@ -7,7 +7,4 @@ export type SendCodeBody = {
   };
 };
 
-export const sendCode = (body: SendCodeBody) =>
-  doRequest('/sms/sendCode', 'POST', body)
-    .then((res) => res.text())
-    .then((text) => text === 'OK');
+export const sendCode = (body: SendCodeBody) => doRequest('/sms/sendCode', 'POST', body);

package/src/retail/components/VerifyPhoneDialog/VerifyPhoneDialog.tsx

@@ -23,10 +23,18 @@ export interface VerifyPhoneDialogProps extends OnCloseProps {
   withDescription?: boolean;
   consents?: string[];
   onSuccess?: (smsCode?: string) => void;
+  onFail?: () => void;
 }
 
 export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
-  ({ phone, withDescription = true, consents, onSuccess = noop, onClose = noop }) => {
+  ({
+    phone,
+    withDescription = true,
+    consents,
+    onSuccess = noop,
+    onClose = noop,
+    onFail = noop,
+  }) => {
     const [values, setValues] = useState<string[]>(Array(CODE_LENGTH).fill('') as string[]);
     const sessionStore = useSessionStore<SmsCodeStore>();
 
@@ -42,6 +50,7 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
     } = useVerifyPhoneDialogSubmit({
       values,
       onSuccess,
+      onFail,
     });
 
     const captchaDialog = useDialog(CaptchaDialog);
@@ -54,7 +63,7 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
         smsCodesSetName: { key: 'AUTHENTICATION' },
       });
 
-      if (response) {
+      if (response.ok) {
         setTimeNextReq(TIME_TO_RESEND);
         restartTimer(TIME_TO_RESEND);
         setErrorText('');
@@ -62,10 +71,12 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
           sendTime: Date.now(),
           attempts: 0,
         };
-      } else {
+      } else if (response.status === 429) {
         captchaDialog.open({ phoneNumber, sendCode: handleSendCode });
+      } else {
+        onFail();
       }
-    }, [phoneNumber, restartTimer, onClose]);
+    }, [phoneNumber, restartTimer]);
 
     useEffect(() => {
       if (!sessionStore.smsCode?.sendTime) {

package/src/retail/components/VerifyPhoneDialog/useVerifyPhoneDialogSubmit.tsx

@@ -2,13 +2,15 @@ import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
 import { getTimer } from '../../../utils/getTimer';
-import { checkCode } from '../../api/checkCode';
+import { checkCode, type CheckCodeResponse } from '../../api/checkCode';
+import { saveToken } from '../../utils/saveToken';
 
 export const TIME_TO_RESEND = 180;
 
 type useVerifyPhoneDialogSubmitProps = {
   values: string[];
-  onSuccess?: (smsCode?: string) => void;
+  onSuccess: (smsCode?: string) => void;
+  onFail: () => void;
 };
 
 export interface SmsCodeStore {
@@ -21,6 +23,7 @@ export interface SmsCodeStore {
 export const useVerifyPhoneDialogSubmit = ({
   values,
   onSuccess,
+  onFail,
 }: useVerifyPhoneDialogSubmitProps) => {
   const sessionStore = useSessionStore<SmsCodeStore>();
   const attempts = sessionStore.smsCode?.attempts || 0;
@@ -36,25 +39,29 @@ export const useVerifyPhoneDialogSubmit = ({
   const isSubmitButtonDisabled = attempts > 2 || isTimeExpired || !values.every(Boolean);
 
   const handleSubmit = useCallback(async () => {
-    try {
-      sessionStore.smsCode = {
-        ...sessionStore.smsCode,
-        attempts: attempts + 1,
-      };
-      startLoading();
-      await checkCode({
-        smsText: values.join(''),
-        smsCodesSetName: { key: 'AUTHENTICATION' },
-      });
+    sessionStore.smsCode = {
+      ...sessionStore.smsCode,
+      attempts: attempts + 1,
+    };
+    startLoading();
+    const response = await checkCode({
+      smsText: values.join(''),
+      smsCodesSetName: { key: 'AUTHENTICATION' },
+    });
+
+    if (response.ok) {
+      const data = (await response.json()) as CheckCodeResponse;
+      saveToken(data);
       setTimeNextReq(0);
       resetError();
       sessionStore.smsCode = null;
       onSuccess?.(values.join(''));
-    } catch {
+    } else if (response.status === 403) {
       setErrorText(attempts > 1 ? 'Исчерпан лимит ввода смс-кода' : 'Неверный код');
-    } finally {
-      endLoading();
+    } else {
+      onFail();
     }
+    endLoading();
   }, [values, attempts]);
 
   useEffect(() => {

package/src/retail/utils/mockLocalStorage.ts

@@ -1,7 +1,8 @@
-import { checkCode } from '../api/checkCode';
+import { checkCode, type CheckCodeResponse } from '../api/checkCode';
 import { createDraftTask } from '../api/createDraftTask';
 import { createUserProfile } from '../api/createUserProfile';
 import { sendCode } from '../api/sendCode';
+import { saveToken } from './saveToken';
 
 const PHONE = '+11111111111';
 const PROGRAM_ID = '13';
@@ -18,11 +19,14 @@ export const mockLocalStorage = async () => {
     smsCodesSetName: { key: 'AUTHENTICATION' },
   });
 
-  await checkCode({
+  const response = await checkCode({
     smsCodesSetName: { key: 'AUTHENTICATION' },
     smsText: '1234',
   });
 
+  const data = (await response.json()) as CheckCodeResponse;
+  saveToken(data);
+
   const task = {
     taskId: globalThis.localStorage.getItem('taskId'),
     participantId: globalThis.localStorage.getItem('participantId'),

package/src/retail/utils/saveToken.ts

@@ -0,0 +1,6 @@
+import { type CheckCodeResponse } from '../api/checkCode';
+
+export const saveToken = (data: CheckCodeResponse) => {
+  globalThis.sessionStorage.setItem('accessToken', data.access_token);
+  globalThis.sessionStorage.setItem('refreshToken', data.refresh_token);
+};