@redneckz/wildless-cms-uni-blocks 0.14.888 → 0.14.889

package/mobile/src/retail/api/checkCode.ts

@@ -1,10 +1,14 @@
+import { LeadServiceAPI, type LeadRequest } from '../../api/LeadServiceAPI';
 import { fetchRetailJSON } from './doRequest';
+const API = LeadServiceAPI();
 
 export type CheckCodeBody = {
   smsText: string;
   smsCodesSetName: {
     key: 'AUTHENTICATION' | 'SEND_TASK';
   };
+  reqId?: string;
+  body?: LeadRequest;
 };
 
 export type CheckCodeResponse = {
@@ -13,8 +17,32 @@ export type CheckCodeResponse = {
   refresh_token: string;
 };
 
-export const checkCode = async (body: CheckCodeBody) =>
-  fetchRetailJSON<CheckCodeResponse>('/sms/checkCode', 'POST', body).then(saveToken);
+type RetailBody = {
+  smsText: string;
+  smsCodesSetName: {
+    key: 'AUTHENTICATION' | 'SEND_TASK';
+  };
+};
+
+export type MainBody = {
+  code: string;
+  reqId: string;
+  body: LeadRequest;
+};
+
+type TransformedBody = RetailBody | MainBody;
+
+export const checkCode = async (body: CheckCodeBody, isRetail: boolean) => {
+  const transformedBody = transformBody(body, isRetail);
+
+  return isRetail
+    ? fetchRetailJSON<CheckCodeResponse>('/sms/checkCode', 'POST', transformedBody).then(saveToken)
+    : fetchMain(transformedBody as MainBody).then((res) => {
+        if (res === null) {
+          throw new Error('Неверный код');
+        }
+      });
+};
 
 export const saveToken = (data: CheckCodeResponse | null) => {
   if (data?.access_token && data?.refresh_token) {
@@ -22,3 +50,20 @@ export const saveToken = (data: CheckCodeResponse | null) => {
     globalThis.sessionStorage.setItem('refreshToken', data.refresh_token);
   }
 };
+
+const fetchMain = (body: MainBody) => API.checkCode(body);
+
+const transformBody = (
+  { smsText, smsCodesSetName, body, reqId }: CheckCodeBody,
+  isRetail: boolean,
+): TransformedBody => {
+  if (isRetail) {
+    return { smsText, smsCodesSetName };
+  }
+
+  if (!reqId || !body) {
+    throw new Error('Произошла ошибка, попробуйте позднее');
+  }
+
+  return { code: smsText, reqId, body };
+};

package/mobile/src/retail/api/sendCode.ts

@@ -1,4 +1,6 @@
+import { LeadServiceAPI } from '../../api/LeadServiceAPI';
 import { doRequest } from './doRequest';
+const API = LeadServiceAPI();
 
 export type SendCodeBody = {
   phoneNumber: string;
@@ -7,7 +9,13 @@ export type SendCodeBody = {
   };
 };
 
-export const sendCode = (body: SendCodeBody) =>
+export const sendCode = (body: SendCodeBody, isRetail: boolean) => {
+  return isRetail ? fetchRetail(body) : fetchMain(body);
+};
+
+const fetchRetail = (body: SendCodeBody) =>
   doRequest('/sms/sendCode', 'POST', body)
     .then((res) => res.text())
     .then((text) => text === 'OK');
+
+const fetchMain = (body: SendCodeBody) => API.sendCode({ phone: body.phoneNumber });

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

@@ -1,8 +1,8 @@
 /* eslint-disable max-lines-per-function */
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
-
 import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
+import { type LeadRequest } from '../../../api/LeadServiceAPI';
 import { Headline } from '../../../components/Headline/Headline';
 import type { OnCloseProps } from '../../../model/OnCloseProps';
 import { Button } from '../../../ui-kit/Button/Button';
@@ -32,10 +32,22 @@ export interface VerifyPhoneDialogProps extends OnCloseProps {
   withDescription?: boolean;
   consents?: string[];
   onSuccess?: (smsCode?: string) => void;
+  formatData?: LeadRequest;
+  reqId?: string;
+  isRetail?: boolean;
 }
 
 export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
-  ({ phone, withDescription = true, consents, onSuccess = noop, onClose = noop }) => {
+  ({
+    phone,
+    withDescription = true,
+    consents,
+    onSuccess = noop,
+    onClose = noop,
+    formatData,
+    reqId,
+    isRetail = true,
+  }) => {
     const [values, setValues] = useState(Array(CODE_LENGTH).fill(''));
     const sessionStore = useSessionStore<SmsCodeStore>();
 
@@ -48,7 +60,13 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
       isSubmitButtonDisabled,
       setTimeNextReq,
       setErrorText,
-    } = useVerifyPhoneDialogSubmit({ values, onSuccess });
+    } = useVerifyPhoneDialogSubmit({
+      values,
+      onSuccess,
+      formatData,
+      reqId,
+      isRetail,
+    });
 
     const captchaDialog = useDialog(CaptchaDialog);
 
@@ -57,10 +75,13 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
     const restartTimer = useCountDownTimer({ seconds: timeNextReq, onTick: setTimeNextReq });
 
     const handleSendCode = useCallback(async () => {
-      const isSuccessSendCode = await sendCode({
-        phoneNumber,
-        smsCodesSetName: { key: 'AUTHENTICATION' },
-      });
+      const isSuccessSendCode = await sendCode(
+        {
+          phoneNumber,
+          smsCodesSetName: { key: 'AUTHENTICATION' },
+        },
+        isRetail,
+      );
 
       if (isSuccessSendCode) {
         setTimeNextReq(TIME_TO_RESEND);
@@ -76,7 +97,7 @@ export const VerifyPhoneDialog = JSX<VerifyPhoneDialogProps>(
     }, [phoneNumber, restartTimer, onClose]);
 
     useEffect(() => {
-      if (!sessionStore.smsCode?.sendTime) {
+      if (!sessionStore.smsCode?.sendTime && isRetail) {
         handleSendCode();
       }
     }, []);

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

@@ -1,13 +1,18 @@
 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 { type LeadRequest } from '../../../api/LeadServiceAPI';
 import { checkCode } from '../../api/checkCode';
 
 export const TIME_TO_RESEND = 180;
+export const TIME_TO_MAIN_EXPIRE = 600;
 
 type useVerifyPhoneDialogSubmitProps = {
   values: string[];
   onSuccess?: (smsCode?: string) => void;
+  formatData?: LeadRequest;
+  reqId?: string;
+  isRetail?: boolean;
 };
 
 export interface SmsCodeStore {
@@ -20,6 +25,9 @@ export interface SmsCodeStore {
 export const useVerifyPhoneDialogSubmit = ({
   values,
   onSuccess,
+  formatData,
+  reqId,
+  isRetail = true,
 }: useVerifyPhoneDialogSubmitProps) => {
   const sessionStore = useSessionStore<SmsCodeStore>();
   const attempts = sessionStore.smsCode?.attempts || 0;
@@ -41,10 +49,15 @@ export const useVerifyPhoneDialogSubmit = ({
         attempts: attempts + 1,
       };
       startLoading();
-      await checkCode({
-        smsText: values.join(''),
-        smsCodesSetName: { key: 'AUTHENTICATION' },
-      });
+      await checkCode(
+        {
+          smsText: values.join(''),
+          smsCodesSetName: { key: 'AUTHENTICATION' },
+          body: isRetail ? undefined : formatData,
+          reqId: isRetail ? undefined : reqId,
+        },
+        isRetail,
+      );
       setTimeNextReq(0);
       resetError();
       sessionStore.smsCode = null;
@@ -57,7 +70,7 @@ export const useVerifyPhoneDialogSubmit = ({
   }, [values, attempts]);
 
   useEffect(() => {
-    if (isTimeExpired) {
+    if (isTimeExpired && isRetail) {
       setErrorText('Код просрочен');
     } else if (attempts > 2) {
       setErrorText('Исчерпан лимит ввода смс-кода');

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

@@ -13,15 +13,21 @@ export const mockLocalStorage = async () => {
     globalThis.localStorage.getItem('profileId') ??
     (await createUserProfile({ profile: { phone: PHONE } }));
 
-  await sendCode({
-    phoneNumber: PHONE,
-    smsCodesSetName: { key: 'AUTHENTICATION' },
-  });
-
-  await checkCode({
-    smsCodesSetName: { key: 'AUTHENTICATION' },
-    smsText: '1234',
-  });
+  await sendCode(
+    {
+      phoneNumber: PHONE,
+      smsCodesSetName: { key: 'AUTHENTICATION' },
+    },
+    true,
+  );
+
+  await checkCode(
+    {
+      smsCodesSetName: { key: 'AUTHENTICATION' },
+      smsText: '1234',
+    },
+    true,
+  );
 
   const task = {
     taskId: globalThis.localStorage.getItem('taskId'),

package/package.json

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

package/src/api/LeadServiceAPI.ts

@@ -1,8 +1,8 @@
 import { type JSONRecord, type JSONScalar } from '@redneckz/json-op';
 import { type Router } from '../external/useRouter';
-import { formatDate } from '../utils/formatDate';
-import { formatPhone } from '../utils/formatPhone';
+import { type MainBody } from '../retail/api/checkCode';
 import { API_BASE_URI } from './apiBaseUrl';
+import { getPhoneBody, getSubmitBody } from './getSubmitBody';
 
 export type LeadRequest = Record<string, JSONRecord | JSONScalar | null> & {
   typeForm?: string;
@@ -17,63 +17,30 @@ export type LeadRequest = Record<string, JSONRecord | JSONScalar | null> & {
   companyNameByInn?: string;
 };
 
-type PFFormData = {
-  innDadata?: string;
-  fullRegion?: string;
-  partnerSymbolCode?: string;
-  companyNameByInn?: string;
+export type CheckCodeProps = MainBody;
+
+type VerifiedLeadRequest = {
+  requestId: string;
+  confirmationCode: string;
+  leadRequest: LeadRequest;
 };
 
+type PhoneOnly = {
+  phone?: string;
+};
+
+type SubmitBody = PhoneOnly | LeadRequest | CheckCodeProps | VerifiedLeadRequest;
+
 export function LeadServiceAPI() {
   async function send(body: LeadRequest, router: Router, isIndividualType = false) {
-    const {
-      typeForm,
-      region,
-      phone = '',
-      email,
-      birthday,
-      desiredMeetingDate,
-      inn,
-      innDadata,
-      fullRegion,
-      addressBranch,
-      secondaryPhone = '',
-      bankEmpolee,
-      applicationDate,
-      serviceDirection,
-      partnerSymbolCode,
-      companyNameByInn,
-      ...staticBody
-    } = body;
+    const { serviceDirection } = body;
+
     const isNaturalPerson = isIndividualType && serviceDirection !== 'Юридическое лицо / ИП';
     const url = `${API_BASE_URI}${isNaturalPerson ? '/lead' : '/sendcorporatelead'}`;
-    const submitBody = {
-      typeForm,
-      ...getRegion(region, isNaturalPerson),
-      ...getEmail(email, isNaturalPerson),
-      ...getPhone(phone),
-      ...getFormatDate(desiredMeetingDate as string, 'desiredMeetingDate'),
-      ...(isNaturalPerson ? getFormatDate(birthday as string) : { inn }),
-      ...(typeForm === 'FEEDBACK'
-        ? {}
-        : {
-            addressBranch,
-            bankEmpolee,
-            applicationDate,
-            ...getSecondaryPhone(secondaryPhone as string),
-          }),
-      ...addPageSlug(typeForm, router),
-      ...formatPFForm(typeForm, { innDadata, fullRegion, partnerSymbolCode, companyNameByInn }),
-      ...staticBody,
-    };
+    const submitBody = getSubmitBody(body, isNaturalPerson, router);
 
     try {
-      const response = await fetch(url, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        mode: 'cors',
-        body: JSON.stringify(submitBody),
-      });
+      const response = await LeadServiceFetch(url, submitBody);
 
       if (!response?.ok) {
         return null;
@@ -85,42 +52,57 @@ export function LeadServiceAPI() {
     }
   }
 
-  return {
-    send,
-  };
-}
+  async function sendCode({ phone }: PhoneOnly) {
+    const submitBody = getPhoneBody(phone);
 
-const getPhone = (phone?: string) => (phone ? { phone: formatPhone(phone) } : {});
+    try {
+      const response = LeadServiceFetch(`${API_BASE_URI}/initCorporateLead`, submitBody).then(
+        async (res) => {
+          if (!res.ok) {
+            throw new Error(`Ошибка HTTP: ${res.status}`);
+          }
 
-const getFormatDate = (date?: string, key = 'birthday') =>
-  date ? { [key]: formatDate(date) } : {};
+          return await res.text();
+        },
+      );
 
-const getRegion = (region: JSONRecord | JSONScalar | null, isNaturalPerson = true) => ({
-  [isNaturalPerson ? 'regionBranch' : 'region']: region,
-});
+      return await response;
+    } catch (e) {
+      return null;
+    }
+  }
 
-const getEmail = (email?: string, isNaturalPerson = true) => ({
-  [isNaturalPerson ? 'email' : 'mail']: email,
-});
+  async function checkCode({ reqId, code, body }: CheckCodeProps) {
+    const submitBody = {
+      requestId: reqId,
+      confimationCode: code,
+      leadRequest: getSubmitBody(body, false),
+    };
 
-const getSecondaryPhone = (secondaryPhone = '') =>
-  !secondaryPhone || secondaryPhone === '+7 ('
-    ? {}
-    : { secondaryPhoneNumber: formatPhone(secondaryPhone) };
+    try {
+      const response = await LeadServiceFetch(`${API_BASE_URI}/confirmCorporateLead`, submitBody);
 
-const formatPFForm = (typeForm?: string, data?: PFFormData) =>
-  typeForm === 'PF'
-    ? {
-        inn: data?.innDadata,
-        region: data?.fullRegion,
-        partnerComments: data?.partnerSymbolCode,
-        fullname: data?.companyNameByInn,
+      if (!response?.ok) {
+        return null;
       }
-    : {};
 
-const addPageSlug = (typeForm?: string, router?: Router) =>
-  typeForm === 'UNIVERSAL'
-    ? {
-        typeForm: router?.pathname?.split('/')?.at(-1) || '/',
-      }
-    : {};
+      return await response.json();
+    } catch (e) {
+      return null;
+    }
+  }
+
+  return {
+    send,
+    sendCode,
+    checkCode,
+  };
+}
+
+const LeadServiceFetch = (url: string, submitBody: SubmitBody) =>
+  fetch(url, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    mode: 'cors',
+    body: JSON.stringify(submitBody),
+  });

package/src/api/getSubmitBody.ts

@@ -0,0 +1,94 @@
+import type { JSONRecord, JSONScalar } from '@redneckz/json-op';
+import type { Router } from '../external/useRouter';
+import { formatDate } from '../utils/formatDate';
+import { formatPhone } from '../utils/formatPhone';
+import { type LeadRequest } from './LeadServiceAPI';
+
+type PFFormData = {
+  innDadata?: string;
+  fullRegion?: string;
+  partnerSymbolCode?: string;
+  companyNameByInn?: string;
+};
+
+export const getSubmitBody = (body: LeadRequest, isNaturalPerson: boolean, router?: Router) => {
+  const {
+    typeForm,
+    region,
+    phone = '',
+    email,
+    birthday,
+    desiredMeetingDate,
+    inn,
+    innDadata,
+    fullRegion,
+    addressBranch,
+    secondaryPhone = '',
+    bankEmpolee,
+    applicationDate,
+    partnerSymbolCode,
+    companyNameByInn,
+    ...staticBody
+  } = body;
+
+  return {
+    typeForm,
+    ...getRegion(region, isNaturalPerson),
+    ...getEmail(email, isNaturalPerson),
+    ...getPhone(phone),
+    ...getFormatDate(desiredMeetingDate as string, 'desiredMeetingDate'),
+    ...(isNaturalPerson ? getFormatDate(birthday as string) : { inn }),
+    ...(typeForm === 'FEEDBACK'
+      ? {}
+      : {
+          addressBranch,
+          bankEmpolee,
+          applicationDate,
+          ...getSecondaryPhone(secondaryPhone as string),
+        }),
+    ...addPageSlug(typeForm, router),
+    ...formatPFForm(typeForm, { innDadata, fullRegion, partnerSymbolCode, companyNameByInn }),
+    ...staticBody,
+  };
+};
+
+export const getPhoneBody = (phone?: string) => {
+  return {
+    ...getPhone(phone),
+  };
+};
+
+export const getPhone = (phone?: string) => (phone ? { phone: formatPhone(phone) } : {});
+
+const getFormatDate = (date?: string, key = 'birthday') =>
+  date ? { [key]: formatDate(date) } : {};
+
+const getRegion = (region: JSONRecord | JSONScalar | null, isNaturalPerson = true) => ({
+  [isNaturalPerson ? 'regionBranch' : 'region']: region,
+});
+
+const getEmail = (email?: string, isNaturalPerson = true) => ({
+  [isNaturalPerson ? 'email' : 'mail']: email,
+});
+
+const getSecondaryPhone = (secondaryPhone = '') =>
+  !secondaryPhone || secondaryPhone === '+7 ('
+    ? {}
+    : { secondaryPhoneNumber: formatPhone(secondaryPhone) };
+
+const formatPFForm = (typeForm?: string, data?: PFFormData) =>
+  typeForm === 'PF'
+    ? {
+        inn: data?.innDadata,
+        region: data?.fullRegion,
+        partnerComments: data?.partnerSymbolCode,
+        fullname: data?.companyNameByInn,
+      }
+    : {};
+
+const addPageSlug = (typeForm?: string, router?: Router) =>
+  typeForm === 'UNIVERSAL'
+    ? {
+        typeForm: router?.pathname?.split('/')?.at(-1) || '/',
+      }
+    : {};

package/src/components/ApplicationForm/ApplicationForm.example.json

@@ -7,7 +7,7 @@
         "padding": "",
         "title": "Заполните онлайн-заявку на эквайринг",
         "typeForm": "ACQR",
-        "endpoint": "sendcorporatelead",
+        "endpoint": "initcorporatelead",
         "sections": [
           {
             "title": "Вид эквайринга и регион",
@@ -533,7 +533,7 @@
         "padding": "",
         "title": "Форма заявка",
         "typeForm": "DPST",
-        "endpoint": "sendcorporatelead",
+        "endpoint": "initcorporatelead",
         "sections": [
           {
             "inputs": [

package/src/components/ApplicationForm/ApplicationForm.fixture.mobile.tsx

@@ -59,7 +59,7 @@ export default {
         className="col-span-12"
         title="Заполните онлайн-заявку на эквайринг"
         typeForm="ACQR"
-        endpoint="sendcorporatelead"
+        endpoint="initcorporatelead"
         sections={[
           {
             title: 'Вид эквайринга и регион',
@@ -359,7 +359,7 @@ export default {
         className="col-span-12"
         title="Форма заявка депозит"
         typeForm="DPST"
-        endpoint="sendcorporatelead"
+        endpoint="initcorporatelead"
         sections={[
           {
             title: 'Оставьте заявку и мы ответим на любые вопросы по депозитам',

package/src/components/ApplicationForm/ApplicationForm.fixture.tsx

@@ -59,7 +59,7 @@ export default {
         className="col-span-12"
         title="Заполните онлайн-заявку на эквайринг"
         typeForm="ACQR"
-        endpoint="sendcorporatelead"
+        endpoint="initcorporatelead"
         sections={[
           {
             title: 'Вид эквайринга и регион',
@@ -355,7 +355,7 @@ export default {
         className="col-span-12"
         title="Форма заявка депозит"
         typeForm="DPST"
-        endpoint="sendcorporatelead"
+        endpoint="initcorporatelead"
         sections={[
           {
             title: 'Оставьте заявку и мы ответим на любые вопросы по депозитам',
@@ -892,6 +892,28 @@ export default {
       <DialogManager />
     </div>
   ),
+  withSms: (
+    <div className="container grid grid-cols-12">
+      <ApplicationForm
+        className="col-span-12"
+        title="Онлайн-заявка от партнера"
+        typeForm="PF"
+        endpoint="initcorporatelead"
+        sections={[
+          {
+            inputs: [
+              { name: 'name', required: true },
+              { name: 'phone', required: true },
+            ],
+          },
+        ]}
+        button={button}
+        link={linkCorp}
+      />
+      <PopupManager />
+      <DialogManager />
+    </div>
+  ),
   rkoApk: (
     <div className="container grid grid-cols-12">
       <ApplicationForm

package/src/components/ApplicationForm/ApplicationForm.tsx

@@ -6,6 +6,7 @@ import { useAspects } from '../../hooks/useAspects/useAspects';
 import { useForm, type FormFieldRegisterer } from '../../hooks/useForm/useForm';
 import { type FormTypeFieldDef } from '../../model/FormTypeFieldDef';
 import { type SectionsProps } from '../../model/InputSectionsType';
+import { VerifyPhoneDialog } from '../../retail/components/VerifyPhoneDialog/VerifyPhoneDialog';
 import { ApplicationFormLayout } from '../../ui-kit/ApplicationFormLayout/ApplicationFormLayout';
 import { useDialog } from '../../ui-kit/DialogManager/useDialog';
 import { getConsentDataProcessing } from '../../ui-kit/FormField/getConsentDataProcessing';
@@ -38,6 +39,7 @@ type renderSectionsType = {
 const API = LeadServiceAPI();
 
 export const ApplicationForm = UniBlock<ApplicationFormProps>(
+  // eslint-disable-next-line max-lines-per-function
   ({
     className,
     title,
@@ -66,14 +68,41 @@ export const ApplicationForm = UniBlock<ApplicationFormProps>(
     const responseTypeDialog = useDialog(ResponseTypeDialog);
     const aspects = useAspects();
 
+    const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
+
     const handleSubmit = useCallback(
       async (formData: FormState, ev: PreventableEventWithTarget) => {
         const formatData = getFormatData({ ...formData, ...additionalParams });
-        const ok = Boolean(await API.send(formatData, router, endpoint === 'lead'));
 
-        responseTypeDialog.open({ ok, typeForm });
-        if (ok) {
-          handleAspects({ aspectsAttributes: data, aspects, ev });
+        if (endpoint === 'initcorporatelead') {
+          const { phone } = formatData;
+
+          const response = await API.sendCode({ phone: String(phone) });
+
+          if (!response) {
+            responseTypeDialog.open({ ok: Boolean(response), typeForm });
+
+            return;
+          }
+
+          verifyPhoneDialog.open({
+            phone,
+            withDescription: false,
+            formatData,
+            reqId: String(response),
+            isRetail: false,
+            onSuccess: () => {
+              verifyPhoneDialog.close();
+              responseTypeDialog.open({ ok: true, typeForm });
+            },
+          });
+        } else {
+          const ok = Boolean(await API.send(formatData, router, endpoint === 'lead'));
+
+          responseTypeDialog.open({ ok, typeForm });
+          if (ok) {
+            handleAspects({ aspectsAttributes: data, aspects, ev });
+          }
         }
       },
       [typeForm],