@it-enterprise/digital-signature 1.4.1 → 1.4.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@it-enterprise/digital-signature",
3
- "version": "1.4.1",
3
+ "version": "1.4.3",
4
4
  "description": "digital signature",
5
5
  "private": false,
6
6
  "main": "src/index.js",
package/readme.md CHANGED
@@ -886,7 +886,7 @@ const protectedReports = await ds.protectTaxReports({
886
886
  Після виконання шифрування, ключ необхідно очистити, викликавши функцію **ctxFreePrivateKey**
887
887
 
888
888
  ```javascript
889
- await ds.ctxReadHardwareKey(
889
+ await ds.ctxFreePrivateKey(
890
890
  // Зчитаний ключ
891
891
  keyInfo,
892
892
  );
@@ -658,11 +658,18 @@ export default class DigitalSignature {
658
658
  * @returns {Promise<boolean>} считан ли ключ
659
659
  */
660
660
  async isPrivateKeyReaded() {
661
+ if (!this._readedKey) {
662
+ return false;
663
+ }
664
+ if (this._readedKey.keyType === DigitalSignatureKeyType.WindowsCertStore) {
665
+ return true;
666
+ }
667
+ if (this._readedKey.keyType === DigitalSignatureKeyType.UmCAService) {
668
+ return true;
669
+ }
661
670
  try {
662
- return !!this._readedKey && (this._readedKey.keyType == DigitalSignatureKeyType.WindowsCertStore
663
- || this._readedKey.keyType == DigitalSignatureKeyType.UmCAService
664
- || await this._euSign.IsPrivateKeyReaded());
665
- } catch {
671
+ return await this._euSign.IsPrivateKeyReaded();
672
+ } catch (error) {
666
673
  return false;
667
674
  }
668
675
  }
@@ -776,36 +783,7 @@ export default class DigitalSignature {
776
783
  message: this._resourses.KSPSignFormatError
777
784
  };
778
785
  }
779
-
780
- const formatData = (data, toBase64) => {
781
- return toBase64 && typeof data != "string" ? arrayToBase64(data)
782
- : !toBase64 && typeof data == "string" ? base64ToArray(data)
783
- : data;
784
- };
785
- let returnArray = true;
786
- if (!Array.isArray(data)) {
787
- returnArray = false;
788
- data = [data];
789
- }
790
-
791
- for (let i = 0; i < data.length; i++) {
792
- const d = data[i];
793
- if (d.val) {
794
- d.val = formatData(d.val, true);
795
- } else {
796
- data[i] = formatData(d, true);
797
- }
798
- }
799
- const result = await this.UmCAService.signData(this._readedKey.keyMedia, data, signType);
800
- for (let i = 0; i < result.length; i++) {
801
- const d = result[i];
802
- if (d.val) {
803
- d.val = formatData(d.val, !asByteArray);
804
- } else {
805
- result[i] = formatData(d, !asByteArray);
806
- }
807
- }
808
- return returnArray ? result : result[0];
786
+ return await this.UmCAService.signData(this._readedKey.keyMedia, data, signType, asByteArray);
809
787
  }
810
788
 
811
789
  const signAlgo = this._readedKey.getSignAlgo();
@@ -1252,7 +1230,7 @@ export default class DigitalSignature {
1252
1230
  /**
1253
1231
  * Зашифрувати звіти в податкову
1254
1232
  * @param {ProtectTaxReportParams} params - Параметри шифрування
1255
- * @returns Promise<Array<EndUserTaxReport>>
1233
+ * @returns {Promise<Array<EndUserTaxReport>>}
1256
1234
  */
1257
1235
  async protectTaxReports(params) {
1258
1236
  return await this._euSign.ProtectTaxReports(
@@ -1286,7 +1264,7 @@ export default class DigitalSignature {
1286
1264
  };
1287
1265
  }
1288
1266
 
1289
- if (Array.isArray(certs)) {
1267
+ if (Array.isArray(certs) && certs.length > 0) {
1290
1268
  certs = await Promise.all(certs.map(cert =>
1291
1269
  cert instanceof File || cert instanceof Blob ? readFile(cert) :
1292
1270
  cert instanceof EndUserCertificate ? cert.data :
@@ -1295,7 +1273,7 @@ export default class DigitalSignature {
1295
1273
 
1296
1274
  try {
1297
1275
  const ctx = await this._euSign.CtxCreate();
1298
- const keyCtx = await this._euSign.CtxReadPrivateKey(keyMedia, certs, this._selectedIssuerCN);
1276
+ const keyCtx = await this._euSign.CtxReadPrivateKey(ctx, keyMedia, certs, this._selectedIssuerCN);
1299
1277
  const readedKey = new HardwarePrivateKeyInfo(
1300
1278
  DigitalSignatureKeyType.Token,
1301
1279
  keyCtx.ownerInfo,
@@ -1356,7 +1334,7 @@ export default class DigitalSignature {
1356
1334
  if (privateKey instanceof File || privateKey instanceof Blob) {
1357
1335
  privateKey = await readFile(privateKey);
1358
1336
  }
1359
- if (Array.isArray(certs)) {
1337
+ if (Array.isArray(certs) && certs.length > 0) {
1360
1338
  certs = await Promise.all(certs.map(cert =>
1361
1339
  cert instanceof File || cert instanceof Blob ? readFile(cert) :
1362
1340
  cert instanceof EndUserCertificate ? cert.data :
@@ -1406,7 +1384,7 @@ export default class DigitalSignature {
1406
1384
  * @param {PrivateKeyInfo} privateKeyContext - Контекст приватного ключа
1407
1385
  */
1408
1386
  async ctxFreePrivateKey(privateKeyContext) {
1409
- if (privateKeyContext instanceof HardwarePrivateKeyInfo) {
1387
+ if (privateKeyContext.keyType === DigitalSignatureKeyType.Token) {
1410
1388
  await this.setLibraryType(DigitalSignatureKeyType.Token);
1411
1389
  } else {
1412
1390
  await this.setLibraryType(DigitalSignatureKeyType.File);
@@ -1,4 +1,5 @@
1
- import { EndUserConstants, EndUserError} from "../euscp/euscp";
1
+ import { EndUserConstants, EndUserError } from "../euscp/euscp";
2
+ import { arrayToBase64, base64ToArray } from "./Utils";
2
3
 
3
4
  export default class UmCAService {
4
5
  constructor(port) {
@@ -47,7 +48,7 @@ export default class UmCAService {
47
48
  });
48
49
  }
49
50
 
50
- async signData(key, toSign, signType) {
51
+ async signData(key, toSign, signType, asByteArray) {
51
52
  let sigType;
52
53
 
53
54
  if (signType.type === EndUserConstants.EU_SIGN_CONTAINER_TYPE_PADES) {
@@ -64,9 +65,20 @@ export default class UmCAService {
64
65
  }
65
66
 
66
67
  let returnArray = true;
67
- if (!Array.isArray(toSign)) {
68
+ if (!Array.isArray(data)) {
68
69
  returnArray = false;
69
- toSign = [toSign];
70
+ data = [data];
71
+ } else {
72
+ data = [...data];
73
+ }
74
+
75
+ for (let i = 0; i < data.length; i++) {
76
+ const d = data[i];
77
+ if (d.val) {
78
+ data[i] = { name: d.name, val: formatData(d.val, true) };
79
+ } else {
80
+ data[i] = formatData(d, true);
81
+ }
70
82
  }
71
83
 
72
84
  const results = [];
@@ -99,6 +111,20 @@ export default class UmCAService {
99
111
  const sign = await responce.json();
100
112
  results.push(data.name ? { name: data.name, val: sign } : sign);
101
113
  }
114
+ for (let i = 0; i < results.length; i++) {
115
+ const r = results[i];
116
+ if (r.val) {
117
+ results[i] = { name: r.name, val: formatData(r.val, !asByteArray) };
118
+ } else {
119
+ results[i] = formatData(r, !asByteArray);
120
+ }
121
+ }
102
122
  return returnArray ? results : results[0];
103
123
  }
104
124
  }
125
+
126
+ const formatData = (data, toBase64) => {
127
+ return toBase64 && typeof data != "string" ? arrayToBase64(data)
128
+ : !toBase64 && typeof data == "string" ? base64ToArray(data)
129
+ : data;
130
+ };