@it-enterprise/digital-signature 1.2.3 → 1.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@it-enterprise/digital-signature",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "digital signature",
   "private": false,
   "main": "src/index.js",
@@ -18,4 +18,4 @@
     "@babel/eslint-parser": "^7.18.9",
     "eslint": "^7.18.0"
   }
-}
+}

package/src/DigitalSignature.js

@@ -187,7 +187,7 @@ export default class DigitalSignature {
         language: this._language,
         encoding: "UTF-16LE",
         httpProxyServiceURL: this._settings.httpProxyServiceURL,
-        directAccess: true,
+        directAccess: this._glSign.DirectAccess === true || (this._glSign.DirectAccess !== false && !this._glSign.ApplyProxySettings && !this._glSign.UseProxy),
         CAs: certificates.CAs,
         CACertificates: certificates.CACertificates,
         KSPs: this.KSPs,
@@ -469,7 +469,8 @@ export default class DigitalSignature {
       ownerInfo,
       getCerts ? await this._euSign.GetOwnCertificates() : [],
       userId,
-      ksp
+      ksp,
+      keyId
     );
     return this._readedKey;
   }
@@ -958,7 +959,7 @@ export default class DigitalSignature {
         key = new HardwarePrivateKeyInfo(key.keyType, key.ownerInfo, key.certificates, key.keyMedia);
       }
       else if (key.keyType == DigitalSignatureKeyType.KSP) {
-        key = new KspPrivateKeyInfo(key.keyType, key.ownerInfo, key.certificates, key.userId, key.ksp);
+        key = new KspPrivateKeyInfo(key.keyType, key.ownerInfo, key.certificates, key.userId, key.ksp, key.keyId);
       }
       const certs = [];
       key.certificates.forEach(cert => {

package/src/GlSign.js

@@ -72,18 +72,25 @@ export default class GlSign {
     this.TestCAConnection = this._getZoneValue(settingArray, 22) === "+";
     this.DontSaveToRegistry = this._getZoneValue(settingArray, 23) === "+";
 
-    var ksps = this._getZoneValue(settingArray, 24);
+    let ksps = this._getZoneValue(settingArray, 24);
     if (!ksps) {
       this.KSPs = getDefaultKSPs();
     } else {
-      ksps = Buffer.from(ksps, "base64").toString();
-      this.KSPs = JSON.parse(ksps);
-      if (this.KSPs.length === 0)
+      try {
+        ksps = Buffer.from(ksps, "base64").toString();
+        this.KSPs = JSON.parse(ksps);
+      } catch (error) {
+        console.error("error parsing KSPs from GlSign");
+        console.error(error);
+      }
+      
+      if (!this.KSPs || this.KSPs.length === 0)
       {
         this.KSPs = getDefaultKSPs();
       }
-      console.log(Buffer.from(JSON.stringify(this.KSPs)).toString("base64"));
     }
+
+    this.DirectAccess = this._getSubZoneValue(settingArray, 25) === "+" ? true : this._getSubZoneValue(settingArray, 24) === "-" ? false : null;
   }
   _getZoneValue(zones, zone) {
     if (zones.length >= zone) {

package/src/Models.js

@@ -423,10 +423,11 @@ export class KspPrivateKeyInfo extends PrivateKeyInfo {
    * @param {string} userId - Идентификатор пользователя
    * @param {EndUserKSP} ksp - Объект KSP
    */
-  constructor(keyType, ownerInfo, certificates, userId, ksp) {
+  constructor(keyType, ownerInfo, certificates, userId, ksp, keyId) {
     super(keyType, ownerInfo, certificates, userId, userId);
     this.userId = userId;
     this.ksp = ksp;
+    this.keyId = keyId;
   }
 }