hl-core 0.0.10-beta.7 → 0.0.10-beta.70

package/api/interceptors.ts

@@ -1,46 +1,106 @@
-import { AxiosError, type AxiosInstance } from 'axios';
+import { AxiosError, type AxiosInstance, type InternalAxiosRequestConfig, isAxiosError } from 'axios';
 
-export default function (axios: AxiosInstance) {
+/**
+ * Обновляет baseURL в зависимости от текущего хоста
+ */
+function updateBaseUrlForEnvironment(request: InternalAxiosRequestConfig): void {
+  if (!request.url || !request.baseURL) return;
+
+  const host = window.location.hostname;
+
+  if (host.startsWith('bpmsrv02') || host.startsWith('vega')) {
+    if (request.baseURL === getStrValuePerEnv('baseApi')) {
+      request.baseURL = getStrValuePerEnv('baseApiLocal');
+    }
+    if (request.baseURL === getStrValuePerEnv('efoBaseApi')) {
+      request.baseURL = getStrValuePerEnv('efoBaseApiLocal');
+    }
+    if (request.baseURL === getStrValuePerEnv('amlBaseApi')) {
+      request.baseURL = getStrValuePerEnv('amlBaseApiLocal');
+    }
+    if (request.baseURL === getStrValuePerEnv('gatewayApiUrl')) {
+      request.baseURL = getStrValuePerEnv('gatewayApiUrlLocal');
+    }
+  }
+}
+
+/**
+ * Обрабатывает специальную логику для нового API
+ */
+function handleNewApiLogic(request: InternalAxiosRequestConfig): void {
+  if (!request.url || !request.baseURL) return;
+
+  if (import.meta.env.VITE_ON_NEW_API === 'true' && request.url.includes('api/Application')) {
+    if (request.baseURL === 'http://vega:84') {
+      request.baseURL = 'http://efo-dev.halyklife.nb/api';
+    }
+    if (request.baseURL === 'http://bpmsrv02.halyklife.nb') {
+      request.baseURL = 'http://efo-prod.halyklife.nb/api';
+    }
+
+    request.url = request.url.replace('/api/Application', '');
+
+    if (request.baseURL.includes('api/v1/insis')) {
+      request.baseURL = request.baseURL.replace('api/v1/insis', 'efo/api');
+    }
+    if (request.baseURL.includes('api/v1/test/insis')) {
+      request.baseURL = request.baseURL.replace('api/v1/test/insis', 'test/efo/api');
+    }
+  }
+}
+
+/**
+ * Извлекает полезное сообщение об ошибке из ответа
+ */
+function extractErrorMessage(data: any, status: number, dataStore: any): string {
+  // .NET ProblemDetails
+  if (data && typeof data === 'object') {
+    if (data.title || data.detail) {
+      return data.title || data.detail;
+    }
+    // Распространённые поля
+    if (data.message || data.status || data.statusName) {
+      return data.message || data.status || data.statusName;
+    }
+  }
+
+  // Если строка/HTML
+  if (typeof data === 'string') {
+    return data.slice(0, 200);
+  }
+
+  // Фолбэк
+  return status === 500 ? dataStore.t('toaster.serverError') : `HTTP ${status}`;
+}
+
+/**
+ * Настраивает interceptors для axios instance
+ *
+ * @param axios - Экземпляр axios для настройки
+ *
+ * Включает:
+ * - Автоматическое добавление токена авторизации
+ * - Обработку различных окружений (dev/prod)
+ * - Комплексную обработку ошибок с информативными сообщениями
+ * - Защиту от дублирования 401 ошибок
+ */
+export default function setupInterceptors(axios: AxiosInstance): void {
   axios.interceptors.request.use(
-    request => {
+    (request: InternalAxiosRequestConfig) => {
       const dataStore = useDataStore();
+
+      // Добавляем токен авторизации
       if (dataStore.accessToken) {
+        request.headers = request.headers || {};
         request.headers.Authorization = `Bearer ${dataStore.accessToken}`;
       }
-      if (request.url && request.baseURL) {
-        const host = window.location.hostname;
-        if (host.startsWith('bpmsrv02') || host.startsWith('vega')) {
-          if (request.baseURL === getStrValuePerEnv('baseApi')) {
-            request.baseURL = getStrValuePerEnv('baseApiLocal');
-          }
-          if (request.baseURL === getStrValuePerEnv('efoBaseApi')) {
-            request.baseURL = getStrValuePerEnv('efoBaseApiLocal');
-          }
-          if (request.baseURL === getStrValuePerEnv('amlBaseApi')) {
-            request.baseURL = getStrValuePerEnv('amlBaseApiLocal');
-          }
-          if (request.baseURL === getStrValuePerEnv('gatewayApiUrl')) {
-            request.baseURL = getStrValuePerEnv('gatewayApiUrlLocal');
-          }
-        }
-        if (import.meta.env.VITE_ON_NEW_API === 'true') {
-          if (request.url.includes('api/Application')) {
-            if (request.baseURL === 'http://vega:84') {
-              request.baseURL = 'http://efo-dev.halyklife.nb/api';
-            }
-            if (request.baseURL === 'http://bpmsrv02.halyklife.nb') {
-              request.baseURL = 'http://efo-prod.halyklife.nb/api';
-            }
-            request.url = request.url.replace('/api/Application', '');
-            if (request.baseURL.includes('api/v1/insis')) {
-              request.baseURL = request.baseURL.replace('api/v1/insis', 'efo/api');
-            }
-            if (request.baseURL.includes('api/v1/test/insis')) {
-              request.baseURL = request.baseURL.replace('api/v1/test/insis', 'test/efo/api');
-            }
-          }
-        }
-      }
+
+      // Обновляем baseURL для разных окружений
+      updateBaseUrlForEnvironment(request);
+
+      // Обрабатываем логику нового API
+      handleNewApiLogic(request);
+
       return request;
     },
     (error: AxiosError) => {
@@ -48,34 +108,74 @@ export default function (axios: AxiosInstance) {
     },
   );
   axios.interceptors.response.use(
-    response => {
-      return response;
-    },
-    (error: AxiosError) => {
+    response => response,
+    (err: unknown) => {
       const dataStore = useDataStore();
-      if (!dataStore.isCalculator) {
-        const router = useRouter();
-        if (error && error.response && error.response.status) {
-          if (error.response.status === 401) {
-            dataStore.$reset();
-            localStorage.clear();
-            if (dataStore.isBridge) {
-              router.push({ name: 'Auth', query: { error: 401 } });
-            } else {
-              dataStore.sendToParent(constants.postActions.Error401, 401);
-            }
-          }
-          if (error.response.status >= 500) {
-            if (router.currentRoute.value.name !== 'Auth') {
-              dataStore.showToaster('error', error.stack ?? dataStore.t('toaster.error'), 5000);
-            }
-          }
-          if (error.response.status === 403 && error.response.config.url) {
-            dataStore.showToaster('error', `Нет доступа на запрос: ${error.response.config.url.substring(error.response.config.url.lastIndexOf('/') + 1)}`, 5000);
-          }
+
+      // если калькулятор, выходим (твоя логика)
+      if (dataStore.isCalculator) {
+        return Promise.reject(err);
+      }
+
+      // 1) Не-Axios ошибка (например, thrown Error)
+      if (!isAxiosError(err)) {
+        dataStore.showToaster('error', dataStore.t('toaster.unknownError'), 5000);
+        return Promise.reject(err);
+      }
+
+      const { response, request, code, message, config } = err;
+
+      // 2) Нет ответа вообще (timeout, сеть, CORS)
+      if (!response) {
+        const isTimeout = code === 'ECONNABORTED' || /timeout/i.test(String(message));
+        dataStore.showToaster('error', isTimeout ? dataStore.t('toaster.timeout') : dataStore.t('toaster.networkError'), 5000);
+        return Promise.reject(err);
+      }
+
+      const status = response.status;
+      const data = response.data;
+      const isSilent = !!response.config.params?.silent;
+
+      // 3) 401 — простая обработка, показываем ошибку
+      if (status === 401) {
+        dataStore.showToaster('error', dataStore.t('error.401'), 5000);
+        return Promise.reject(err);
+      }
+
+      // 4) 403 — вытаскиваем только path без query/hash
+      if (status === 403) {
+        try {
+          const rawUrl = response.config?.url ?? '';
+          const urlObj = new URL(rawUrl, window.location.origin);
+          const pathSegment = urlObj.pathname.split('/').filter(Boolean).pop() ?? 'resource';
+          dataStore.showToaster('error', dataStore.t('error.403', { text: pathSegment }), 5000);
+        } catch (urlError) {
+          console.warn('Error parsing URL for 403 response:', urlError);
+          dataStore.showToaster('error', dataStore.t('error.403'), 5000);
         }
+        return Promise.reject(err);
       }
-      return Promise.reject(error);
+
+      // 5) 404
+      if (status === 404 && !isSilent) {
+        dataStore.showToaster('error', dataStore.t('error.404'), 5000);
+        return Promise.reject(err);
+      }
+
+      // 6) 413
+      if (status === 413) {
+        dataStore.showToaster('error', dataStore.t('error.exceedUploadLimitFile'), 5000);
+        return Promise.reject(err);
+      }
+
+      // 7) 500 — явная обработка
+      if (status === 500) {
+        const errorMessage = extractErrorMessage(data, status, dataStore);
+        dataStore.showToaster('error', String(errorMessage), 5000);
+        return Promise.reject(err);
+      }
+
+      return Promise.reject(err);
     },
   );
 }

package/components/Dialog/Dialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <v-dialog class="base-dialog" :model-value="Boolean(modelValue)" @update:modelValue="$emit('update:modelValue', $event)" :persistent="true">
+  <v-dialog class="base-dialog" :model-value="Boolean(modelValue)" @update:modelValue="$emit('update:modelValue', $event)" :persistent="persistent">
     <v-card class="self-center w-full sm:w-4/4 md:w-2/3 lg:w-[35%] xl:w-[500px] rounded-lg !p-[36px]">
       <div class="flex sm:flex-row flex-col place-items-center sm:place-items-start">
         <div class="h-20 w-20 place-items-start pt-1">
@@ -44,6 +44,10 @@ export default defineComponent({
       type: Boolean as PropType<boolean | null>,
       default: false,
     },
+    persistent: {
+      type: Boolean as PropType<boolean>,
+      default: true,
+    },
     title: {
       type: String,
       default() {

package/components/Dialog/DigitalDocumentsDialog.vue

@@ -0,0 +1,129 @@
+<template>
+  <div class="flex flex-col gap-[10px] w-full align-center">
+    <v-expansion-panels :flat="true">
+      <v-expansion-panel class="!rounded-[8px]">
+        <v-expansion-panel-title class="!text-[12px] border border-[#00000014]">
+          Как получить цифровой документ
+        </v-expansion-panel-title>
+        <v-expansion-panel-text class="text-[12px] text-[#464f60]">
+          1. Выберите тип документа.<br /><br />
+          2. Через приложение eGov mobile и другие приложения: <br />
+          • Откройте раздел "Цифровые документы". <br />
+          • Выберите нужный документ и откройте доступ. <br />
+          • Введите 6-значный код в поле «Код подтверждения». <br />
+          • Нажмите "Получить документ".<br /><br />
+          3. Через SMS: <br />
+          • Нажмите "Отправить код". <br />
+          • Введите полученный SMS-код. <br />
+          • Нажмите "Получить документ".<br /><br />
+          4. При ошибке нажмите <a href="javascript:void(0);" class="text-blue-600" @click.prevent="emit('updateDigitalDocuments')">обновить профиль</a><br />
+        </v-expansion-panel-text>
+      </v-expansion-panel>
+    </v-expansion-panels>
+    <div class="d-flex flex-col gap-0.5 w-full">
+      <base-rounded-select
+        v-model="documentType"
+        class="document-type-select"
+        :items="documentItems"
+        :label="$dataStore.t('form.documentType')"
+        hide-details
+      />
+      <div class="digital-document-otp flex flex-col">
+        <base-otp-input
+          v-model="otpCode"
+          @keyup.enter.prevent="otpCode.length === otpLength && emitGetCode()"
+        />
+        <span
+          v-if="!loading && otpSendDisabled"
+          class="text-center"
+          :class="[$styles.mutedText]"
+        >
+            Введите код цифрового документа из <span class="underline underline-offset-2">eGov Mobile</span> или <span class="underline underline-offset-2">банковского приложения</span>.
+          </span>
+      </div>
+    </div>
+    <div class="w-full d-flex gap-4">
+      <base-btn
+        v-if="!otpSendDisabled"
+        :disabled="loading"
+        :loading="loading"
+        :btn="$styles.whiteBorderBtn"
+        text="Отправить SMS-код"
+        @click="emitGetCode"
+      />
+      <base-btn
+        :disabled="loading"
+        :loading="loading"
+        text="Получить документ"
+        @click="emitGetDocument"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { DigitalDocTypes } from '../../types';
+
+const props = defineProps({
+  documentItems: {
+    type: Array,
+    required: true,
+  },
+  loading: {
+    type: Boolean,
+    default: false,
+  },
+  otpLength: {
+    type: Number,
+    default: 6,
+  },
+  otpSendDisabled: {
+    type: Boolean,
+    default: false,
+  }
+});
+const emit = defineEmits(['getCode', 'getDigitalDocument', 'updateDigitalDocuments']);
+
+const dataStore = useDataStore();
+const documentType = ref<DigitalDocTypes | null>(null);
+const otpCode = ref<string>('');
+
+const emitGetCode = () => {
+  if (!documentType.value) {
+    dataStore.showToaster('error', 'Выберите тип документа', 3000);
+    return;
+  }
+
+  emit('getCode', documentType.value);
+}
+
+const emitGetDocument = () => {
+  if (!otpCode.value) {
+    dataStore.showToaster('error', 'Введите код подтверждения', 3000);
+    return;
+  }
+
+  emit('getDigitalDocument', otpCode.value);
+}
+</script>
+
+<style scoped>
+:deep(.v-otp-input__content) {
+  max-width: 360px;
+  gap: 12px!important;
+}
+.v-expansion-panel-title {
+  height: 60px!important;
+}
+.v-expansion-panel--active > .v-expansion-panel-title {
+  border-bottom-left-radius: inherit;
+  border-bottom-right-radius: inherit;
+}
+.document-type-select:deep(.v-field) {
+  height: 60px;
+  border: 1px solid #dadada!important;
+}
+.document-type-select:deep(.v-label.v-field-label--floating) {
+  top: 0;
+}
+</style>

package/components/Dialog/FamilyDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <v-list lines="two" v-if="formStore.birthInfos && formStore.birthInfos.length" class="w-full !py-0">
+  <v-list lines="two" v-if="(formStore.birthInfos && formStore.birthInfos.length) || $dataStore.isGons" class="w-full !py-0">
     <v-list-item
       @click="$emit('reset')"
       :append-icon="selected && Object.keys(selected).length === 0 ? `mdi-radiobox-marked ${$styles.greenText}` : 'mdi-radiobox-blank text-[#636363]'"
@@ -10,7 +10,11 @@
       v-for="familyMember of formStore.birthInfos"
       :key="familyMember.childIIN"
       @click="$emit('selectFamilyMember', familyMember)"
-      :append-icon="familyMember && selected && selected.childIIN === familyMember.childIIN ? `mdi-radiobox-marked ${$styles.greenText}` : 'mdi-radiobox-blank text-[#636363]'"
+      :append-icon="
+        familyMember && selected && typeof selected === 'object' && selected.childIIN === familyMember.childIIN
+          ? `mdi-radiobox-marked ${$styles.greenText}`
+          : 'mdi-radiobox-blank text-[#636363]'
+      "
     >
       <v-list-item-title :class="[$styles.greenText, $styles.textTitle]">{{
         `${familyMember.childSurName} ${familyMember.childName} ${familyMember.childPatronymic ? familyMember.childPatronymic : ''}`
@@ -20,6 +24,13 @@
         >{{ ` ${$reformatIin(familyMember.childIIN!)}` }}</v-list-item-subtitle
       >
     </v-list-item>
+    <v-list-item
+      v-if="$dataStore.isGons"
+      @click="$emit('addChild')"
+      :append-icon="selected && selected === $dataStore.t('form.addBeneficiary') ? `mdi-radiobox-marked ${$styles.greenText}` : 'mdi-radiobox-blank text-[#636363]'"
+    >
+      <v-list-item-title :class="[$styles.greenText, $styles.textTitle]">{{ $dataStore.t('form.addBeneficiary') }}</v-list-item-title>
+    </v-list-item>
   </v-list>
   <base-list-empty class="w-full" v-else />
 </template>
@@ -30,10 +41,10 @@ import type { Api } from '../../types';
 export default defineComponent({
   props: {
     selected: {
-      type: Object as PropType<Api.GKB.BirthInfo>,
+      type: [Object, String] as PropType<Api.GKB.BirthInfo | string>,
     },
   },
-  emits: ['selectFamilyMember', 'reset'],
+  emits: ['selectFamilyMember', 'reset', 'addChild'],
   setup() {
     const formStore = useFormStore();
     return {

package/components/Form/DigitalDocument.vue

@@ -0,0 +1,52 @@
+<template>
+  <section v-if="member && member.iin" class="mb-2">
+    <base-form-section :title="`${title} ${number === 0 ? '' : number}`" class="mx-[10px] mt-[14px] d-flex">
+      <base-form-input v-model="member.iin" :label="$dataStore.t('form.iin')" :readonly="true" />
+      <base-form-input v-model.trim="member.longName" :label="$dataStore.t('labels.userFullName')" :readonly="true" />
+      <base-panel-input
+        v-if="!!member.digitalDocument"
+        v-model="member.digitalDocument.fileName"
+        label="Цифровой документ"
+        :readonly="disabled"
+        :clearable="!disabled"
+        append-inner-icon="mdi mdi-chevron-right"
+        @click="$emit('openPanel', member.digitalDocument)"
+      />
+      <base-content-block
+        v-if="!disabled && !member.digitalDocument"
+        class="d-flex align-center justify-between !py-3.5 !pr-5"
+        :class="[$styles.whiteBg]"
+        @click="$emit('openDigitalDocPanel', member.iin)"
+      >
+        <p :class="[$styles.greyText]">Получить цифровой документ</p>
+        <div class="cursor-pointer">
+          <i class="mdi mdi-file-document text-xl" :class="[$styles.blueText]"></i>
+        </div>
+      </base-content-block>
+    </base-form-section>
+  </section>
+</template>
+
+<script setup lang="ts">
+import type { Base } from '../../types';
+
+defineEmits(['openDigitalDocPanel', 'openPanel']);
+defineProps({
+  title: {
+    type: String,
+    default: '',
+  },
+  member: {
+    type: Object as PropType<Base.Document.Digital>,
+    default: null,
+  },
+  number: {
+    type: Number,
+    default: 0,
+  },
+  disabled: {
+    type: Boolean,
+    default: false,
+  },
+});
+</script>

package/components/Form/FormSource.vue

@@ -0,0 +1,30 @@
+<template>
+  <base-panel-input
+    class="source-form-input"
+    v-model="formStore.Source"
+    :value="formStore.Source?.nameRu"
+    :readonly="true"
+    :clearable="false"
+    :label="$dataStore.t('form.source')"
+  />
+</template>
+
+<script lang="ts">
+export default defineComponent({
+  setup(props) {
+    const formStore = useFormStore();
+
+    return {
+      // State
+      formStore,
+    };
+  },
+});
+</script>
+
+<style scoped>
+.source-form-input {
+  border-radius: 4px;
+  border: 1px solid #e5e7eb;
+}
+</style>