Merge pull request #28 from mt89vein/AR5-6225

kaluga-astral · May 31, 2022 · ee6eca8 · ee6eca8
2 parents db2d49d + 9f2f036
commit ee6eca8
Show file tree

Hide file tree

Showing 25 changed files with 247 additions and 272 deletions.
diff --git a/examples/cryptopro-cades/package.json b/examples/cryptopro-cades/package.json
@@ -34,6 +34,6 @@
   },
   "scripts": {
     "build:prod": "webpack --mode=production --config webpack.config.js",
-    "dev": "webpack serve --mode=development"
+    "dev": "webpack serve --mode=development --port 8081"
   }
 }
diff --git a/examples/cryptopro-cades/public/index.html b/examples/cryptopro-cades/public/index.html
@@ -8,7 +8,7 @@
       name="description"
       content="Web site created using create-react-app"
     />
-    <title>React App</title>
+    <title>@astral/cryptopro-cades</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/examples/cryptopro-cades/src/App.tsx b/examples/cryptopro-cades/src/App.tsx
@@ -48,24 +48,35 @@ const CryptoApp = () => {
         const systemInfo = await getSystemInfo();
         setVersionInfo(systemInfo);
       } catch (error) {
-        window.alert(error);
+        outputError(error);
+        window.alert(error?.toString());
       }
     }
     async function fetchCertificates() {
-      const fetchedCertificates = await getCertificates(STORE_TYPE.ALL);
+      try {
+        const fetchedCertificates = await getCertificates(STORE_TYPE.ALL);
 
-      setCertificates(fetchedCertificates);
+        setCertificates(fetchedCertificates);
 
-      // автоматически берем первый валидный серт если еще выбран
-      if (!selectedCertificate) {
-        setSelectedCertificate(
-          fetchedCertificates.find((c) => c.isGost && c.hasPrivateKey)
-        );
+        // автоматически берем первый валидный серт если еще выбран
+        if (!selectedCertificate) {
+          setSelectedCertificate(
+            fetchedCertificates.find((c) => c.isGost && c.hasPrivateKey)
+          );
+        }
+      } catch (error) {
+        outputError(error);
+        window.alert(error?.toString());
       }
     }
     async function fetchCryptoProviders() {
-      const cryptoProviders = await getCryptoProviders();
-      setCryptoProviders(cryptoProviders);
+      try {
+        const cryptoProviders = await getCryptoProviders();
+        setCryptoProviders(cryptoProviders);
+      } catch (error) {
+        outputError(error);
+        window.alert(error?.toString());
+      }
     }
 
     if (showCryptoProviders) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/cryptopro-cades/package.json b/packages/cryptopro-cades/package.json
@@ -13,13 +13,13 @@
     "lint": "eslint ./src --fix --quiet"
   },
   "dependencies": {
-    "buffer": "^6.0.3",
-    "pkijs": "^2.3.1",
-    "asn1js": "^3.0.2"
+    "buffer": "6.0.3",
+    "pkijs": "3.0.3",
+    "asn1js": "3.0.5"
   },
   "devDependencies": {
-    "@types/node": "^17.0.33",
-    "copyfiles": "^2.4.1"
+    "@types/node": "17.0.36",
+    "copyfiles": "2.4.1"
   },
   "version": "1.2.0"
 }
diff --git a/packages/cryptopro-cades/src/Certificate.ts b/packages/cryptopro-cades/src/Certificate.ts
@@ -1,3 +1,4 @@
+import { unwrap } from './api/internal/unwrap';
 import { CAPICOM_ENCODING_TYPE } from './constants';
 import { CryptoError } from './errors';
 import { ICertificate } from './types';
@@ -157,49 +158,25 @@ export class Certificate {
     }
     const certificate = new Certificate(cert);
 
-    if (cert.SubjectName instanceof Promise) {
-      certificate.subjectName = await cert.SubjectName;
-      certificate.thumbprint = await cert.Thumbprint;
-      certificate.notAfter = await cert.ValidToDate;
-      certificate.notBefore = await cert.ValidFromDate;
-      certificate.certificateBase64Data = await cert.Export(
-        CAPICOM_ENCODING_TYPE.CAPICOM_ENCODE_BASE64
+    certificate.subjectName = await unwrap(cert.SubjectName);
+    certificate.thumbprint = await unwrap(cert.Thumbprint);
+    certificate.notAfter = await unwrap(cert.ValidToDate);
+    certificate.notBefore = await unwrap(cert.ValidFromDate);
+    certificate.certificateBase64Data = await unwrap(
+      cert.Export(CAPICOM_ENCODING_TYPE.CAPICOM_ENCODE_BASE64)
+    );
+    try {
+      certificate.hasPrivateKey = await unwrap(cert.HasPrivateKey());
+      const oPrivateKey = await unwrap(cert.PrivateKey);
+      certificate.providerName = await unwrap(oPrivateKey.ProviderName);
+      certificate.providerType = await unwrap(oPrivateKey.ProviderType);
+    } catch (error) {
+      // ошибка не критична, просто создаем ошибку (в дебаге оно залогируется само)
+      CryptoError.createCadesError(
+        error,
+        `Ошибка получения информации о приватном ключе сертификата ${certificate.thumbprint}.`
       );
-      try {
-        certificate.hasPrivateKey = await cert.HasPrivateKey();
-        const oPrivateKey = await cert.PrivateKey;
-        certificate.providerName = await oPrivateKey.ProviderName;
-        certificate.providerType = await oPrivateKey.ProviderType;
-      } catch (error) {
-        // ошибка не критична, просто создаем ошибку (в дебаге оно залогируется само)
-        CryptoError.createCadesError(
-          error,
-          `Ошибка получения информации о приватном ключе сертификата ${certificate.thumbprint}.`
-        );
-        certificate.hasPrivateKey = false;
-      }
-    } else {
-      certificate.subjectName = cert.SubjectName;
-      certificate.thumbprint = cert.Thumbprint as string;
-      certificate.notAfter = cert.ValidToDate as Date;
-      certificate.notBefore = cert.ValidFromDate as Date;
-      certificate.certificateBase64Data = cert.Export(
-        CAPICOM_ENCODING_TYPE.CAPICOM_ENCODE_BASE64
-      );
-
-      try {
-        certificate.hasPrivateKey = cert.HasPrivateKey();
-        const oPrivateKey = cert.PrivateKey;
-        certificate.providerName = oPrivateKey.ProviderName;
-        certificate.providerType = oPrivateKey.ProviderType;
-      } catch (error) {
-        // ошибка не критична, просто создаем ошибку (в дебаге оно залогируется само)
-        CryptoError.createCadesError(
-          error,
-          `Ошибка получения информации о приватном ключе сертификата ${certificate.thumbprint}.`
-        );
-        certificate.hasPrivateKey = false;
-      }
+      certificate.hasPrivateKey = false;
     }
 
     parseCertificate(certificate);