@it-enterprise/digital-signature 1.2.0 → 1.2.1

package/src/DigitalSignature.js

@@ -1,5 +1,5 @@
 import { EndUser, EndUserConstants, EndUserProxySettings, EndUserError, KSPSettings, EndUserCertificate, EndUserKeyMedia, EndUserSignContainerInfo } from "../euscp/euscp";
-import { DigitalSignatureKeyType, PrivateKeyInfo, FilePrivateKeyInfo, HardwarePrivateKeyInfo, KspPrivateKeyInfo, SignFormat, DigitalSignatureFormat } from "./Models";
+import { DigitalSignatureKeyType, PrivateKeyInfo, FilePrivateKeyInfo, HardwarePrivateKeyInfo, KspPrivateKeyInfo } from "./Models";
 import { downloadAndSignFiles, downloadData, format, readFile, signAlgoToHashAlgo } from "./Utils";
 import Resourses from "./Resourses.json";
 import GlSign from "./GlSign";
@@ -36,7 +36,7 @@ export default class DigitalSignature {
     depositsign.ksp = EndUserConstants.EU_KSP_IIT;
     depositsign.address = "https://depositsign.com/api/v1/it-enterprise/sign-server";
     depositsign.directAccess = true;
-    depositsign.needQrcode = false;
+    depositsign.needQRCode = false;
 
     const diia = new KSPSettings();
     diia.name = "Дія.Підпис";
@@ -45,7 +45,7 @@ export default class DigitalSignature {
     diia.mobileAppName = "Дія";
     diia.address = "https://diia-sign.it.ua/KSPSign";
     diia.systemId = "diia-sign-it-ent";
-    diia.needQrcode = true;
+    diia.needQRCode = true;
 
     const smartId = new KSPSettings();
     smartId.name = "Приватбанк - хмарний підпис \"SmartID\"";
@@ -55,14 +55,14 @@ export default class DigitalSignature {
     smartId.address = "https://acsk.privatbank.ua/cloud/api/back/";
     smartId.clientIdPrefix = "IEIS_";
     smartId.confirmationURL = "https://www.privat24.ua/rd/kep";
-    smartId.needQrcode = true;
+    smartId.needQRCode = true;
 
     const vchasno = new KSPSettings();
     vchasno.name = "Вчасно - хмарний підпис";
     vchasno.ksp = EndUserConstants.EU_KSP_IIT;
     vchasno.address = "https://cs.vchasno.ua/ss/";
     vchasno.directAccess = true;
-    vchasno.needQrcode = false;
+    vchasno.needQRCode = false;
 
     const cloudKey = new KSPSettings();
     cloudKey.name = "ТОВ «ЦСК «Україна» - хмарний підпис CloudKey";
@@ -72,14 +72,23 @@ export default class DigitalSignature {
     cloudKey.address = "https://sid.uakey.com.ua/smartid/iit/";
     cloudKey.clientIdPrefix = "DIIA_2";
     cloudKey.confirmationURL = "https://sid.uakey.com.ua/kep?hash=rd/kep";
-    cloudKey.needQrcode = true;
+    cloudKey.needQRCode = true;
 
     const esign = new KSPSettings();
     esign.name = "ESign - хмарний підпис";
     esign.ksp = EndUserConstants.EU_KSP_IIT;
     esign.address = "https://cabinet.e-life.com.ua/api/EDG/Sign";
     esign.directAccess = true;
-    esign.needQrcode = false;
+    esign.needQRCode = false;
+
+    const idd = new KSPSettings();
+    idd.name = "ІДД ДПС - хмарний підпис";
+    idd.ksp = EndUserConstants.EU_KSP_IIT;
+    idd.address = "https://smart-sign.tax.gov.ua/";
+    idd.port = "443";
+    idd.directAccess = true;
+    idd.clientIdType = 1;
+    idd.needQRCode = false;
 
     this._KSPs = {
       depositsign,
@@ -88,6 +97,7 @@ export default class DigitalSignature {
       vchasno,
       cloudKey,
       esign,
+      idd,
       asArray: function() {
         return [
           depositsign,
@@ -95,7 +105,8 @@ export default class DigitalSignature {
           smartId,
           vchasno,
           cloudKey,
-          esign
+          esign,
+          idd
         ];
       }
     };
@@ -250,7 +261,7 @@ export default class DigitalSignature {
       }
 
       this._euSettings = {
-        language: this._settings.language,
+        language: this._language,
         encoding: "UTF-16LE",
         httpProxyServiceURL: this._settings.httpProxyServiceURL,
         directAccess: true,
@@ -320,9 +331,7 @@ export default class DigitalSignature {
    * @returns {Promise<Array<EndUserKeyMedia>>} Список подключённых устройств
    */
   async getKeyMedias() {
-    if (!this._euSignKeyMedia) {
-      await this.setLibraryType(DigitalSignatureKeyType.Token);
-    }
+    await this.setLibraryType(DigitalSignatureKeyType.Token);
     return this._euSignKeyMedia.GetKeyMedias();
   }
 
@@ -610,7 +619,7 @@ export default class DigitalSignature {
       asByteArray = false;
     }
 
-    if (this.readedKey.keyType === DigitalSignatureKeyType.KSP && signType !== EndUserConstants.EndUserSignContainerType.CAdES) {
+    if (this.readedKey.keyType === DigitalSignatureKeyType.KSP && signType.type !== EndUserConstants.EndUserSignContainerType.CAdES) {
       throw {
         code: EndUserError.EU_ERROR_NOT_SUPPORTED,
         message: this._resourses.KSPSignFormatError
@@ -621,7 +630,18 @@ export default class DigitalSignature {
       const signLevel = signType.asicSignType === EndUserConstants.EndUserASiCSignType.CAdES ? EndUserConstants.EndUserSignType.CAdES_X_Long : EndUserConstants.EndUserXAdESSignLevel.B_LT;
       return await this._euSign.ASiCSignData(this._readedKey.getSignAlgo(), signType.subType, signType.asicSignType, signLevel, data, !asByteArray);
     } else if (signType.type === EndUserConstants.EndUserSignContainerType.XAdES) {
-      return (await this._euSign.XAdESSignData(this._readedKey.getSignAlgo(), signType.subType, EndUserConstants.EndUserXAdESSignLevel.B_LT, data, !asByteArray));
+      let returnArray = true;
+      if (!Array.isArray(data)) {
+        data = [data];
+        returnArray = false;
+      }
+      data = data.map((e, i) => !e.name && !e.val ? { name: "data" + i, val: e } : e);
+      const signs = [];
+      for (let i = 0; i < data.length; i++) {
+        const result = await this._euSign.XAdESSignData(this._readedKey.getSignAlgo(), signType.subType, EndUserConstants.EndUserXAdESSignLevel.B_LT, data[i], !asByteArray);
+        signs[i] = result;
+      }
+      return returnArray ? signs : signs[0];
     } else if (signType.type === EndUserConstants.EndUserSignContainerType.PAdES) {
       return await this._euSign.PDFSignData(this._readedKey.getSignAlgo(), data, EndUserConstants.EndUserPAdESSignLevel.B_T, !asByteArray);
     } else if (signType.type === EndUserConstants.EndUserSignContainerType.CAdES) {
@@ -695,7 +715,7 @@ export default class DigitalSignature {
     } else if (signContainerInfo.type === EndUserConstants.EndUserSignContainerType.PAdES) {
       return await this._euSign.PDFVerifyData(sign, signIndex);
     } else if (signContainerInfo.type === EndUserConstants.EndUserSignContainerType.XAdES) {
-      return await this._euSign.XAdESVerifyData(data, sign, signIndex);
+      return await this._euSign.XAdESVerifyData(data, sign.val || sign, signIndex);
     } else if (signContainerInfo.type === EndUserConstants.EndUserSignContainerType.CAdES) {
       if (signContainerInfo.subType === EndUserConstants.EndUserCAdESType.Detached) {
         if (!data) {
@@ -830,10 +850,10 @@ export default class DigitalSignature {
   async signFileEx(fileUrl, hash) {
     const isNamedData = typeof fileUrl === "object";
     let data = await downloadData(isNamedData ? fileUrl.val : fileUrl, "binary");
-    if(isNamedData) {
+    if (isNamedData) {
       data = {name: fileUrl.name, val: data};
     }
-    if(hash) {
+    if (hash) {
       return await this.signHashEx(data);
     } else {
       return await this.signDataEx(data, false);
@@ -918,14 +938,14 @@ export default class DigitalSignature {
    * @param {boolean} toLocalStorage - Будет ли ключ сохранён после закрытия вкладки
    */
   async storePrivateKeyInfo(privateKeyInfo, toLocalStorage) {
-    if(this._KSPs.needQrcode(privateKeyInfo.ksp)) {
+    if (privateKeyInfo.ksp && privateKeyInfo.ksp.needQrcode) {
       return;
     }
 
     const storage = toLocalStorage ? localStorage : sessionStorage;
     const keys = await this.getStoredPrivateKeyInfo();
 
-    if(keys.length == 0 || keys.filter(key => key.id == privateKeyInfo.id).length < 1) {
+    if (keys.length == 0 || keys.filter(key => key.id == privateKeyInfo.id).length < 1) {
       const keys = await this.getPrivateKeyInfoFromStorage(toLocalStorage);
       keys.push(privateKeyInfo);
       const data = await this._euSignFile.ProtectDataByPassword(JSON.stringify(keys), "", true);
@@ -950,23 +970,23 @@ export default class DigitalSignature {
 
     let ls;
     const result = [];
-    if(!storedKeys) {
+    if (!storedKeys) {
       return result;
     }
     const data = await this._euSignFile.UnprotectDataByPassword(storedKeys, "", true);
-    try{
+    try {
       ls = JSON.parse(data);
-      if(keyType >= 0) {
+      if (keyType >= 0) {
         ls = ls.filter(key => key.keyType == keyType);
       }
     }
-    catch{
+    catch {
       ls = [];
     }
 
     ls.forEach(key => {
       const password = key.password;
-      if(key.keyType == DigitalSignatureKeyType.File) {
+      if (key.keyType == DigitalSignatureKeyType.File) {
         key.privateKey = new Uint8Array(Object.assign(new Array(), key.privateKey));
         key = new FilePrivateKeyInfo(key.keyType, key.ownerInfo, key.certificates, key.privateKey, key.password);
       }
@@ -998,14 +1018,14 @@ export default class DigitalSignature {
       localStorage.removeItem(this._userId + this.PRIVATE_KEY_INFO);
       sessionStorage.removeItem(this._userId + this.PRIVATE_KEY_INFO);
     }
-    else{
+    else {
       const localStoredKeys = await this.getPrivateKeyInfoFromStorage(true);
       const sessionStoredKeys = await this.getPrivateKeyInfoFromStorage(false);
       const storage = localStoredKeys.filter(item => item.id == keyId).length > 0 ? localStorage : sessionStorage;
       const keys = storage == localStorage ? localStoredKeys : sessionStoredKeys;
       const keyIndex = keys.findIndex((element) => element.id == keyId);
 
-      if(keyIndex > -1) {
+      if (keyIndex > -1) {
         keys.splice(keyIndex, 1);
         const data = await this._euSignFile.ProtectDataByPassword(JSON.stringify(keys), "", true);
         storage[this._userId + this.PRIVATE_KEY_INFO] = data;
@@ -1037,11 +1057,15 @@ export default class DigitalSignature {
   }
 
   get _resourses() {
-    return Resourses[this._settings.language];
+    return Resourses[this._language];
   }
 
   get _userId () {
-    return typeof this._settings.userId === "function" ? this._settings.userId() : this._settings.userId;
+    return typeof this._settingsProvider.userId === "function" ? this._settingsProvider.userId() : this._settingsProvider.userId;
+  }
+
+  get _language () {
+    return typeof this._settingsProvider.language === "function" ? this._settingsProvider.language() : this._settingsProvider.language;
   }
 
   /**

package/src/Models.js

@@ -102,14 +102,14 @@ export class LegacySettingsProvider {
   getSettings(testMode) {
     return new DigitalSignatureSettings(this.language,
       this.userId,
-      this.basePath + "/ProxyHandler",
+      this.basePath + "/ProxyHandler.ashx",
       new LegacyCertificatesProvider(
         testMode,
         this.basePath + "/Data/version.txt",
-        this.basePath + testMode ? "/Data/CAs.test.json" : "/Data/CAs.json",
-        this.basePath + testMode ? "/Data/CACertificates.p7b" : "/Data/CACertificates.p7b"
+        this.basePath + (testMode ? "/Data/CAs.test.json" : "/Data/CAs.json"),
+        this.basePath + (testMode ? "/Data/CACertificates.test.p7b" : "/Data/CACertificates.p7b")
       ),
-      this.basePath + `/Scripts/euscp.worker.ex-${LIBRARY_VERSION}.js`
+      this.basePath + `/Scripts/DigitalSignature/euscp.worker.ex-${LIBRARY_VERSION}.js`
     );
   }
 }