hl-core 0.0.9-beta.49 → 0.0.9-beta.50

package/api/base.api.ts

@@ -920,4 +920,16 @@ export class ApiClass {
       },
     });
   }
+
+  async generateShortLink(data: { link: string; priority: string }) {
+    return await this.axiosCall<{
+      id: string;
+      link: string;
+    }>({
+      url: '/notification/shorteners',
+      baseURL: getStrValuePerEnv('gatewayApiUrl'),
+      method: Methods.POST,
+      data: data,
+    });
+  }
 }

package/api/interceptors.ts

@@ -9,26 +9,18 @@ export default function (axios: AxiosInstance) {
       }
       if (request.url && request.baseURL) {
         const host = window.location.hostname;
-        if (host.startsWith('bpmsrv02')) {
-          if (request.baseURL === 'https://products.halyklife.kz/api/v1/insis') {
-            request.baseURL = 'http://bpmsrv02.halyklife.nb';
+        if (host.startsWith('bpmsrv02') || host.startsWith('vega')) {
+          if (request.baseURL === getStrValuePerEnv('baseApi')) {
+            request.baseURL = getStrValuePerEnv('baseApiLocal');
           }
-          if (request.baseURL === 'https://products.halyklife.kz/efo/api') {
-            request.baseURL = 'http://efo-prod.halyklife.nb/api';
+          if (request.baseURL === getStrValuePerEnv('efoBaseApi')) {
+            request.baseURL = getStrValuePerEnv('efoBaseApiLocal');
           }
-          if (request.baseURL === 'https://products.halyklife.kz/aml/api') {
-            request.baseURL = 'http://aml-prod.halyklife.nb/api';
+          if (request.baseURL === getStrValuePerEnv('amlBaseApi')) {
+            request.baseURL = getStrValuePerEnv('amlBaseApiLocal');
           }
-        }
-        if (host.startsWith('vega')) {
-          if (request.baseURL === 'https://products.halyklife.kz/api/v1/test/insis') {
-            request.baseURL = 'http://vega:84';
-          }
-          if (request.baseURL === 'https://products.halyklife.kz/test/efo/api') {
-            request.baseURL = 'http://efo-dev.halyklife.nb/api';
-          }
-          if (request.baseURL === 'https://products.halyklife.kz/test/aml/api') {
-            request.baseURL = 'http://aml-dev.halyklife.nb/api';
+          if (request.baseURL === getStrValuePerEnv('gatewayApiUrl')) {
+            request.baseURL = getStrValuePerEnv('gatewayApiUrlLocal');
           }
         }
         if (import.meta.env.VITE_ON_NEW_API === 'true') {

package/components/Pages/MemberForm.vue

@@ -1010,10 +1010,28 @@ export default {
         isButtonLoading.value = true;
         const parsedDocument = await callDocumentReader(imageDataList.value);
         if (typeof parsedDocument === 'object') {
+          if (
+            member.value.iin &&
+            parsedDocument.iin &&
+            reformatIin(parsedDocument.iin) &&
+            member.value.iin.length === useMask().iin.length &&
+            reformatIin(parsedDocument.iin).length === useMask().iin.length &&
+            member.value.iin !== reformatIin(parsedDocument.iin)
+          ) {
+            dataStore.showToaster('error', 'Не совпадают ИИН');
+            isButtonLoading.value = false;
+            return;
+          }
           formatDateProperty(parsedDocument, 'front');
           member.value.parsedDocument = parsedDocument;
           if (parsedDocument.age) member.value.age = parsedDocument.age;
           if (parsedDocument.iin) member.value.iin = reformatIin(parsedDocument.iin);
+          if (parsedDocument.gender) {
+            if (parsedDocument.gender === 'M' || parsedDocument.gender === 'F') {
+              const gender = dataStore.gender.find((i: Value) => i.id === (parsedDocument.gender === 'M' ? 1 : 2));
+              if (gender) member.value.gender = gender;
+            }
+          }
           if (parsedDocument.birthDate) member.value.birthDate = parsedDocument.birthDate;
           if (parsedDocument.documentIssueDate) member.value.documentDate = parsedDocument.documentIssueDate;
           if (parsedDocument.documentExpireDate) member.value.documentExpire = parsedDocument.documentExpireDate;
@@ -1022,8 +1040,17 @@ export default {
           if (parsedDocument.firstName) member.value.firstName = parsedDocument.firstName;
           if (parsedDocument.middleName) member.value.middleName = parsedDocument.middleName;
           if (parsedDocument.fullName) member.value.longName = parsedDocument.fullName;
+          if (parsedDocument.documentName && parsedDocument.documentName.startsWith('Kazakhstan - Id Card')) {
+            const documentType = dataStore.documentTypes.find((i: Value) => i.ids === '1UDL');
+            if (documentType) member.value.documentType = documentType;
+          }
           if (!!parsedDocument.documentIssuer) {
-            if (parsedDocument.documentIssuer === 'МИНИСТЕРСТВО ВНУТРЕННИХ ДЕЛ РК' || parsedDocument.documentIssuer === 'ҚР ІШКІ ІСТЕР МИНИСТРЛІГІ') {
+            if (
+              parsedDocument.documentIssuer === 'МИНИСТЕРСТВО ВНУТРЕННИХ ДЕЛ РК' ||
+              parsedDocument.documentIssuer === 'ҚР ІШКІ ІСТЕР МИНИСТРЛІГІ' ||
+              /ҚАЗАҚСТАН/gi.test(parsedDocument.documentIssuer) ||
+              /КАЗАХСТАН/gi.test(parsedDocument.documentIssuer)
+            ) {
               const documentIssuer = dataStore.documentIssuers.find(i => (i.nameRu as string).match(new RegExp('МВД РК', 'i')));
               if (documentIssuer) member.value.documentIssuers = documentIssuer;
             } else {

package/components/Panel/PanelHandler.vue

@@ -544,9 +544,10 @@ export default defineComponent({
       await dataStore.generateDocument();
     };
 
-    const convertQr = (url: string | null) => {
+    const convertQr = async (url: string | null) => {
       if (url) {
-        qrUrl.value = url;
+        const shortedUrl = await dataStore.generateShortLink(url);
+        qrUrl.value = typeof shortedUrl === 'string' && !!shortedUrl ? shortedUrl : url;
         isQrDialog.value = true;
       } else {
         dataStore.showToaster('error', dataStore.t('toaster.noUrl'));

package/composables/index.ts

@@ -2,7 +2,7 @@ import { useDisplay } from 'vuetify';
 import jwt_decode from 'jwt-decode';
 import { XMLParser } from 'fast-xml-parser';
 import { AxiosError } from 'axios';
-import { DocumentReaderApi, Scenario, TextFieldType } from '@regulaforensics/document-reader-webclient';
+import { DocumentReaderApi, Scenario, TextFieldType, LCID } from '@regulaforensics/document-reader-webclient';
 import { PolicyholderClass } from '../composables/classes';
 
 export const getBaseCredentials = () => {
@@ -335,7 +335,7 @@ export const getLastDayOfMonth = (year: number, month: number) => {
   return new Date(year, month + 1, 0, (date.getTimezoneOffset() / 60) * -1).toISOString();
 };
 
-type WhichValuePerEnv = 'qrGenUrl';
+type WhichValuePerEnv = 'qrGenUrl' | 'gatewayApiUrl' | 'gatewayApiUrlLocal' | 'baseApi' | 'baseApiLocal' | 'efoBaseApi' | 'efoBaseApiLocal' | 'amlBaseApi' | 'amlBaseApiLocal';
 
 export const getStrValuePerEnv = (which: WhichValuePerEnv) => {
   const valuesPerEnv: {
@@ -348,8 +348,48 @@ export const getStrValuePerEnv = (which: WhichValuePerEnv) => {
       development: 'mobileSign:https://test-sign.halyklife.kz/EgovQrCms',
       test: 'mobileSign:https://test-sign.halyklife.kz/EgovQrCms',
     },
+    gatewayApiUrl: {
+      production: 'https://products.halyklife.kz/gateway',
+      development: 'https://products.halyklife.kz/test/gateway',
+      test: 'https://products.halyklife.kz/test/gateway',
+    },
+    gatewayApiUrlLocal: {
+      production: 'http://products.halyklife.nb/gateway',
+      development: 'http://products.halyklife.nb/test/gateway',
+      test: 'http://products.halyklife.nb/test/gateway',
+    },
+    baseApi: {
+      production: 'https://products.halyklife.kz/api/v1/insis',
+      development: 'https://products.halyklife.kz/api/v1/test/insis',
+      test: 'https://products.halyklife.kz/api/v1/test/insis',
+    },
+    baseApiLocal: {
+      production: 'http://bpmsrv02.halyklife.nb',
+      development: 'http://vega:84',
+      test: 'http://vega:84',
+    },
+    efoBaseApi: {
+      production: 'https://products.halyklife.kz/efo/api',
+      development: 'https://products.halyklife.kz/test/efo/api',
+      test: 'https://products.halyklife.kz/test/efo/api',
+    },
+    efoBaseApiLocal: {
+      production: 'http://efo-prod.halyklife.nb/api',
+      development: 'http://efo-dev.halyklife.nb/api',
+      test: 'http://efo-dev.halyklife.nb/api',
+    },
+    amlBaseApi: {
+      production: 'https://products.halyklife.kz/aml/api',
+      development: 'https://products.halyklife.kz/test/aml/api',
+      test: 'https://products.halyklife.kz/test/aml/api',
+    },
+    amlBaseApiLocal: {
+      production: 'http://aml-prod.halyklife.nb/api',
+      development: 'http://aml-dev.halyklife.nb/api',
+      test: 'http://aml-dev.halyklife.nb/api',
+    },
   };
-  return valuesPerEnv[which][useEnv().envMode];
+  return valuesPerEnv[which][import.meta.env.VITE_MODE];
 };
 
 export const getMainPageRoute = () => {
@@ -413,19 +453,30 @@ export const callDocumentReader = async (imageBase64: string | string[]) => {
   if (!imageBase64) return false;
   const dataStore = useDataStore();
   try {
-    const api = new DocumentReaderApi({ basePath: 'http://10.176.49.47:8080' });
+    const api = new DocumentReaderApi({
+      basePath: `${getStrValuePerEnv('gatewayApiUrl')}/regulaforensics`,
+      baseOptions: { headers: { Authorization: `Bearer ${dataStore.accessToken}` } },
+    });
     const result = await api.process({
       images: Array.isArray(imageBase64) ? imageBase64 : [imageBase64],
       processParam: { scenario: Scenario.FULL_PROCESS, doublePageSpread: true, measureSystem: 0 },
     });
+    const documentName = ref<string | undefined>(undefined);
+    if (result.rawResponse && result.rawResponse.ContainerList) {
+      const dType = result.rawResponse.ContainerList.List.find(i => i.result_type === 9);
+      if (dType && 'OneCandidate' in dType && dType.OneCandidate && dType.OneCandidate.DocumentName) {
+        documentName.value = dType.OneCandidate.DocumentName;
+      }
+    }
     if (result.text) {
       const iin = result.text.getField(TextFieldType.PERSONAL_NUMBER);
-      const lastName = result.text.getField(TextFieldType.SURNAME);
-      const firstName = result.text.getField(TextFieldType.GIVEN_NAMES_RUS) ?? result.text.getField(TextFieldType.GIVEN_NAMES);
-      const middleName = result.text.getField(TextFieldType.FATHERS_NAME_RUS) ?? result.text.getField(TextFieldType.FATHERS_NAME);
-      const fullName = result.text.getField(TextFieldType.SURNAME_AND_GIVEN_NAMES);
+      const lastName = result.text.getField(TextFieldType.SURNAME, LCID.KAZAKH);
+      const firstName = result.text.getField(TextFieldType.GIVEN_NAMES_RUS, LCID.KAZAKH) ?? result.text.getField(TextFieldType.GIVEN_NAMES, LCID.KAZAKH);
+      const middleName = result.text.getField(TextFieldType.FATHERS_NAME_RUS, LCID.KAZAKH) ?? result.text.getField(TextFieldType.FATHERS_NAME, LCID.KAZAKH);
+      const fullName = result.text.getField(TextFieldType.SURNAME_AND_GIVEN_NAMES, LCID.KAZAKH);
       const birthDate = result.text.getField(TextFieldType.DATE_OF_BIRTH);
       const age = result.text.getField(TextFieldType.AGE);
+      const gender = result.text.getField(TextFieldType.SEX);
       const documentNumber = result.text.getField(TextFieldType.DOCUMENT_NUMBER);
       const documentIssuer = result.text.getField(TextFieldType.AUTHORITY_RUS) ?? result.text.getField(TextFieldType.AUTHORITY);
       const documentIssueDate = result.text.getField(TextFieldType.DATE_OF_ISSUE);
@@ -438,6 +489,8 @@ export const callDocumentReader = async (imageBase64: string | string[]) => {
         fullName: fullName?.value,
         birthDate: birthDate?.value,
         age: age?.value,
+        gender: gender?.value,
+        documentName: documentName.value,
         documentNumber: documentNumber?.value,
         documentIssuer: documentIssuer?.value,
         documentIssueDate: documentIssueDate?.value,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.9-beta.49",
+  "version": "0.0.9-beta.50",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",

package/store/data.store.ts

@@ -3508,6 +3508,17 @@ export const useDataStore = defineStore('data', {
         return ErrorHandler(err);
       }
     },
+    async generateShortLink(url: string) {
+      try {
+        const response = await this.api.generateShortLink({
+          link: url,
+          priority: 'low',
+        });
+        return response.link;
+      } catch (err) {
+        return ErrorHandler(err);
+      }
+    },
     hasJobSection(whichForm: keyof typeof StoreMembers) {
       if (this.isLifetrip) return false;
       switch (whichForm) {