hl-core 0.0.10-beta.20 → 0.0.10-beta.21

package/store/data.store.ts

@@ -279,7 +279,7 @@ export const useDataStore = defineStore('data', {
       if (!file.id) return;
       try {
         this.isLoading = true;
-        await this.api.getFile(file.id).then((response: any) => {
+        await this.api.file.getFile(file.id).then((response: any) => {
           if (!['pdf', 'docx'].includes(fileType)) {
             const blob = new Blob([response], { type: `image/${fileType}` });
             const url = window.URL.createObjectURL(blob);
@@ -320,7 +320,7 @@ export const useDataStore = defineStore('data', {
     },
     async deleteFile(data: DocumentItem) {
       try {
-        await this.api.deleteFile(data);
+        await this.api.file.deleteFile(data);
         this.showToaster('success', this.t('toaster.fileWasDeleted'), 3000);
       } catch (err) {
         ErrorHandler(err);
@@ -329,7 +329,7 @@ export const useDataStore = defineStore('data', {
     async uploadFiles(data: FormData, load: boolean = false) {
       this.isLoading = load;
       try {
-        await this.api.uploadFiles(data);
+        await this.api.file.uploadFiles(data);
         return true;
       } catch (err) {
         return ErrorHandler(err);
@@ -339,14 +339,23 @@ export const useDataStore = defineStore('data', {
     },
     async getContragent(member: Member, load: boolean = true, showToaster: boolean = true) {
       this.isLoading = load;
-      if (!member.iin) return;
-      try {
-        const queryData = {
-          firstName: '',
-          lastName: '',
-          middleName: '',
-          iin: member.iin.replace(/-/g, ''),
-        };
+      const isNonResident = this.isPension && member.signOfResidency.ids === '500011.2';
+      if (!member.iin || (isNonResident && (!member.firstName || !member.lastName))) return;
+      try {
+        const queryData = isNonResident
+          ? {
+              firstName: member.firstName ?? '',
+              lastName: member.lastName ?? '',
+              middleName: member.middleName ?? '',
+              iin: member.iin ? member.iin.replace(/-/g, '') : '',
+              birthDate: member.birthDate ? formatDate(member.birthDate)?.toISOString() ?? '' : '',
+            }
+          : {
+              firstName: '',
+              lastName: '',
+              middleName: '',
+              iin: member.iin ? member.iin.replace(/-/g, '') : '',
+            };
         const contragentResponse = await this.api.getContragent(queryData);
         if (contragentResponse.totalItems > 0) {
           if (contragentResponse.items.length === 1) {
@@ -355,12 +364,13 @@ export const useDataStore = defineStore('data', {
             const sortedByRegistrationDate = contragentResponse.items.sort(
               (left, right) => new Date(right.registrationDate).getMilliseconds() - new Date(left.registrationDate).getMilliseconds(),
             );
-            await this.serializeContragentData(member, sortedByRegistrationDate[0]);
+            if (!isNonResident) await this.serializeContragentData(member, sortedByRegistrationDate[0]);
           }
           member.gotFromInsis = true;
         } else {
           if (showToaster) this.showToaster('error', this.t('toaster.notFoundUser'));
         }
+        if (isNonResident) return contragentResponse;
       } catch (err) {
         ErrorHandler(err);
       }
@@ -530,13 +540,15 @@ export const useDataStore = defineStore('data', {
       }
     },
     async alreadyInInsis(member: Member) {
-      if (!member.iin) return null;
+      const isNonResident = this.isPension && member.signOfResidency.ids === '500011.2';
+      if (!member.iin || (isNonResident && (!member.firstName || !member.lastName))) return;
       try {
         const queryData = {
-          iin: member.iin.replaceAll('-', ''),
+          iin: !!member.iin ? member.iin.replaceAll('-', '') : '',
           firstName: !!member.firstName ? member.firstName : '',
           lastName: !!member.lastName ? member.lastName : '',
           middleName: !!member.middleName ? member.middleName : '',
+          birthDate: !!member.birthDate ? formatDate(member.birthDate)?.toISOString() ?? '' : '',
         };
         const contragent = await this.api.getContragent(queryData);
         if (contragent.totalItems > 0) {
@@ -2070,11 +2082,6 @@ export const useDataStore = defineStore('data', {
               index: null,
             });
           }
-
-          if (applicationData.slave) {
-            insuredData.push(applicationData.slave.insuredApp[0]);
-          }
-
           if (insuredData && insuredData.length) {
             insuredData.forEach((member, index) => {
               const inStore = this.formStore.insuredForm.find(each => each.id == member.insisId);
@@ -2489,94 +2496,17 @@ export const useDataStore = defineStore('data', {
         };
         const data = prepareSignDocuments();
         if (type === 'qr') {
-          const groupId = await this.api.signQR(data);
+          const groupId = await this.api.file.signQR(data);
           return groupId;
         } else if (type === 'qrXml') {
-          const signData = await this.api.signXml(data);
+          const signData = await this.api.file.signXml(data);
           return signData;
-        } else if (type === 'signature') {
-          const ncaLayerClient = new NCALayerClient();
-          const formTemplate = new FormData();
-          formTemplate.append('format', 'pdf');
-          formTemplate.append('processInstanceId', String(this.formStore.applicationData.processInstanceId));
-          let activeTokens;
-          try {
-            await ncaLayerClient.connect();
-            activeTokens = await ncaLayerClient.getActiveTokens();
-            const storageType = activeTokens[0] || NCALayerClient.fileStorageType;
-            if (this.formStore.applicationData.statusCode === 'ContractSignedFrom') {
-              const document = await this.generatePDFDocument('PA_Contract', '38', 'pdf');
-              const base64EncodedSignature = await ncaLayerClient.basicsSignCMS(storageType, document, NCALayerClient.basicsCMSParams, NCALayerClient.basicsSignerSignAny);
-              const formData = formTemplate;
-              formData.append('base64EncodedSignature', base64EncodedSignature);
-              formData.append('name', 'PA_Contract');
-              try {
-                await this.api.uploadDigitalCertifijcate(formData);
-                await this.handleTask('accept', String(this.formStore.applicationTaskId));
-              } catch (e) {
-                this.showToaster('error', String(e));
-                return;
-              }
-            } else if (this.formStore.applicationData.statusCode === 'HeadManagerForm') {
-              const document = await this.generatePDFDocument('PA_Contract', '38', 'pdf');
-              const base64EncodedSignature = await ncaLayerClient.basicsSignCMS(storageType, document, NCALayerClient.basicsCMSParams, NCALayerClient.basicsSignerSignAny);
-              const formData = formTemplate;
-              formData.append('base64EncodedSignature', base64EncodedSignature);
-              formData.append('name', 'PA_Contract');
-              try {
-                await this.api.uploadDigitalCertificatePensionAnnuityNew(formData);
-                await this.handleTask('accept', String(this.formStore.applicationTaskId));
-              } catch (e) {
-                this.showToaster('error', String(e));
-                return;
-              }
-            } else {
-              if (!!this.formStore.signedDocumentList.find(i => i.fileTypeCode === '43')?.signed) {
-                const statement = await this.generatePDFDocument('PA_Statement', '37', 'pdf');
-                const statementSignature = await ncaLayerClient.basicsSignCMS(storageType, statement, NCALayerClient.basicsCMSParams, NCALayerClient.basicsSignerSignAny);
-                const statementData = formTemplate;
-                statementData.append('base64EncodedSignature', statementSignature);
-                statementData.append('name', 'PA_Statement');
-                await this.api.uploadDigitalCertifijcate(statementData);
-                const agreement = await this.generatePDFDocument('Agreement', '19', 'pdf');
-                const agreementSignature = await ncaLayerClient.basicsSignCMS(storageType, agreement, NCALayerClient.basicsCMSParams, NCALayerClient.basicsSignerSignAny);
-                const agreementData = formTemplate;
-                agreementData.append('base64EncodedSignature', agreementSignature);
-                agreementData.append('name', 'Agreement');
-                await this.api.uploadDigitalCertifijcate(agreementData);
-                await this.handleTask('accept', String(this.formStore.applicationTaskId));
-              } else {
-                const document = {
-                  processInstanceId: String(this.formStore.applicationData.processInstanceId),
-                  name: 'PAEnpf_Agreement',
-                  format: 'xml',
-                };
-                const signData = await this.api.signXml([document]);
-                const agreementXml = await this.api.getDocumentsByEdsXmlId(signData.data);
-                const wnd = window.open('about:blank', '', '_blank');
-                wnd?.document.write(agreementXml.data.document.documentXml);
-                const signedAgreement = await ncaLayerClient.signXml(storageType, agreementXml.data.document.documentXml, 'SIGNATURE', '');
-                const data = new FormData();
-                data.append('processInstanceId', String(this.formStore.applicationData.processInstanceId));
-                data.append('xmlData', signedAgreement);
-                data.append('name', 'PAEnpf_Agreement');
-                data.append('format', 'xml');
-                data.append('EdsXmlId', signData.data);
-                await this.api.uploadXml(data);
-                await this.getSignedDocList(this.formStore.applicationData.processInstanceId);
-                this.showToaster('success', this.t('pension.consentGiven'), 3000);
-              }
-            }
-          } catch (error) {
-            this.showToaster('error', String(error));
-            return;
-          }
         } else {
           if (this.processCode === 19 || this.processCode === 2 || this.processCode === 4) {
-            const result = await this.api.signBts(data);
+            const result = await this.api.file.signBts(data);
             if (result.code === 0) this.formStore.signUrls = result.data;
           } else {
-            const result = await this.api.signDocument(data);
+            const result = await this.api.file.signDocument(data);
             this.formStore.signUrls = result;
           }
           return this.formStore.signUrls;
@@ -2585,6 +2515,84 @@ export const useDataStore = defineStore('data', {
         ErrorHandler(err);
       }
     },
+    async nclayerSign(groupId: string, signType: number, isXml: boolean = false) {
+      try {
+        const ncaLayerClient = new NCALayerClient();
+        await ncaLayerClient.connect();
+        const activeTokens = await ncaLayerClient.getActiveTokens();
+        const storageType = activeTokens[0] || NCALayerClient.fileStorageType;
+        const document = await this.getFileNew(groupId, signType, isXml);
+        if (isXml) {
+          const signedAgreement = await ncaLayerClient.signXml(storageType, document, 'SIGNATURE', '');
+          const data = new FormData();
+          data.append('processInstanceId', String(this.formStore.applicationData.processInstanceId));
+          data.append('xmlData', signedAgreement);
+          data.append('name', 'PAEnpf_Agreement');
+          data.append('format', 'xml');
+          data.append('EdsXmlId', groupId);
+          await this.api.file.uploadXml(data);
+        } else {
+          const base64EncodedSignature = await ncaLayerClient.createCAdESFromBase64(storageType, document, 'SIGNATURE', true);
+          await this.api.file.uploadDigitalCertificateNca(groupId, { Base64EncodedSignature: base64EncodedSignature });
+        }
+        return true;
+      } catch (err) {
+        ErrorHandler(err);
+        return false;
+      }
+    },
+    async getFileNew(groupId: string, documentSignType: number, xml: boolean, fileName?: string) {
+      try {
+        let response: any = await this.api.file.generalGetFile(groupId, xml ? 5 : documentSignType);
+        let blob;
+        if (response.hasOwnProperty('data')) {
+          const document = JSON.parse(response.data).Document;
+          blob = new Blob([document.documentXml], {
+            type: `application/xml`,
+          });
+          response = document.documentXml;
+        } else {
+          blob = new Blob([response], {
+            type: `application/pdf`,
+          });
+        }
+        const url = window.URL.createObjectURL(blob);
+        if (!xml) {
+          const link = document.createElement('a');
+          link.href = url;
+          link.setAttribute('download', fileName ?? `Документ ПА`);
+          document.body.appendChild(link);
+          link.click();
+        }
+        window.open(url, '_blank', `right=100`);
+        return response;
+      } catch (err) {
+        ErrorHandler(err);
+      }
+    },
+    async generateSign(taskId: string) {
+      try {
+        const signatories = await this.api.file.generateSign({ taskId });
+        if (Array.isArray(signatories)) {
+          signatories.forEach(signatory =>
+            signatory.fileDatas?.sort(function (a: any, b: any) {
+              return a.orderFile > b.orderFile ? 1 : b.orderFile > a.orderFile ? -1 : 0;
+            }),
+          );
+          this.formStore.signatories = signatories;
+        }
+      } catch (err) {
+        ErrorHandler(err);
+      }
+    },
+    async generalSign(data: Types.Api.Sign.New.GeneralResponse) {
+      try {
+        const response = await this.api.file.generalSign(data);
+        return response;
+      } catch (err) {
+        ErrorHandler(err);
+      }
+    },
     async downloadTemplate(documentType: number, fileType: string = 'pdf', processInstanceId?: string | number) {
       try {
         this.isButtonsLoading = true;
@@ -2651,7 +2659,7 @@ export const useDataStore = defineStore('data', {
           name: 'Contract',
           format: 'pdf',
         };
-        const response: any = await this.api.generateDocument(data);
+        const response: any = await this.api.file.generateDocument(data);
         const blob = new Blob([response], {
           type: `application/pdf`,
         });
@@ -2737,7 +2745,7 @@ export const useDataStore = defineStore('data', {
     async getSignedDocList(processInstanceId: string | number) {
       if (processInstanceId !== 0) {
         try {
-          this.formStore.signedDocumentList = await this.api.getSignedDocList({
+          this.formStore.signedDocumentList = await this.api.file.getSignedDocList({
             processInstanceId: processInstanceId,
           });
         } catch (err) {

package/types/enum.ts

@@ -51,6 +51,9 @@ export enum Actions {
 
   payed = 'payed',
   payedCustom = 'payedCustom',
+
+  rejectDocument = 'rejectDocument',
+  rejectDocumentCustom = 'rejectDocumentCustom',
 }
 
 export enum PostActions {
@@ -164,4 +167,13 @@ export namespace CoreEnums {
       'SBI' = 'SBI',
     }
   }
+  export namespace Sign {
+    export enum Types {
+      electronic = 1,
+      scans = 2,
+      qr = 3,
+      qrXml = 5,
+      nclayer = 6,
+    }
+  }
 }

package/types/index.ts

@@ -388,6 +388,7 @@ export type GetContragentRequest = {
   lastName: string;
   middleName: string;
   iin: string;
+  birthDate?: string;
 };
 
 export type GetContragentResponse = {
@@ -879,6 +880,47 @@ export namespace Api {
       name: string;
     };
   }
+
+  export namespace Sign {
+    export namespace New {
+      export type Request = {
+        taskId: string;
+      };
+      export type Type = {
+        documentSignType: string;
+        documentSignTypeName: string;
+        documentSignTypeValue: number;
+      };
+      export type FileDatas = {
+        fileName: string;
+        fileType: number;
+        orderFile: number;
+        isSigned: boolean;
+        signTypes: Api.Sign.New.Type[];
+      };
+      export type GeneralResponse = {
+        contragentId?: string | null;
+        contragentType?: number;
+        fileDatas?: FileDatas[];
+        iin?: string | null;
+        longName?: string | null;
+        personId?: number;
+        signType?: number | null;
+        signatureDocumentGroupId?: string | null;
+        taskId: string;
+      };
+      export type Response = {
+        edsXmlId: string | null;
+        iin: string | null;
+        longName: string | null;
+        phoneNumber: string | null;
+        shortUri: string | null;
+        signIds: { id: string; fileType: string }[];
+        signatureDocumentGroupId: string | null;
+        uri: string | null;
+      };
+    }
+  }
 }
 
 export namespace Dicts {