Merge branch 'master' into release/2.1.0

.npmignore

@@ -1,11 +0,0 @@
-# see what'll be included with `npm pack --dry-run`
-
-/examples
-/src
-/types
-/package
-
-/tsconfig*
-/*.js
-/*.gif
-/.*

CHANGELOG.md

@@ -1,3 +1,15 @@
+2.0.5 / 2020-07-04
+==================
+
+  * Улучшение: Дополнены словари для расшифровки данных о сертификате
+
+2.0.4 / 2020-04-05
+==================
+
+  * Улучшение: Исправлены ссылки в README.md
+  * Улучшение: Добавлен файл с лицензией
+  * Улучшение: Обновлены версии пакета в примерах
+
 2.0.3 / 2020-03-29
 ==================
 

dist/crypto-pro.d.ts

@@ -1,4 +1,4 @@
-// Type definitions for crypto-pro 2.0.4
+// Type definitions for crypto-pro 2.0.5
 // Project: crypto-pro
 // Definitions by: Vitalii Goma https://github.com/vgoma
 

dist/crypto-pro.js

@@ -1275,7 +1275,7 @@ exports.ISSUER_TAGS_TRANSLATIONS = [
     { possibleNames: ['ОГРН', 'OGRN'], translation: 'ОГРН' },
     { possibleNames: ['ОГРНИП', 'OGRNIP'], translation: 'ОГРНИП' },
     { possibleNames: ['СНИЛС', 'SNILS'], translation: 'СНИЛС' },
-    { possibleNames: ['ИНН', 'INN'], translation: 'ИНН' },
+    { possibleNames: ['ИНН', 'INN', 'ИНН организации'], translation: 'ИНН' },
     { possibleNames: ['E'], translation: 'Email' },
     { possibleNames: ['L'], translation: 'Город' },
 ];
@@ -1365,7 +1365,7 @@ exports.SUBJECT_TAGS_TRANSLATIONS = [
     { possibleNames: ['ОГРН', 'OGRN'], translation: 'ОГРН' },
     { possibleNames: ['ОГРНИП', 'OGRNIP'], translation: 'ОГРНИП' },
     { possibleNames: ['СНИЛС', 'SNILS'], translation: 'СНИЛС' },
-    { possibleNames: ['ИНН', 'INN'], translation: 'ИНН' },
+    { possibleNames: ['ИНН', 'INN', 'ИНН организации'], translation: 'ИНН' },
     { possibleNames: ['E'], translation: 'Email' },
     { possibleNames: ['L'], translation: 'Город' },
 ];
@@ -1749,11 +1749,11 @@ var constants_1 = __webpack_require__(/*! ../constants */ "./constants/index.ts"
  * @returns расшифрованная информация по отдельным тэгам
  */
 exports._parseCertInfo = function (tagsTranslations, rawInfo) {
-    var extractedEntities = rawInfo.match(/([а-яА-Яa-zA-Z0-9.]+)=(?:("[^"]+?")|(.+?))(?:,|$)/g);
+    var extractedEntities = rawInfo.match(/([а-яА-Яa-zA-Z0-9\s.]+)=(?:("[^"]+?")|(.+?))(?:,|$)/g);
     if (extractedEntities) {
         return extractedEntities.map(function (group) {
             var _a, _b, _c;
-            var segmentsMatch = group.match(/^([а-яА-Яa-zA-Z0-9.]+)=(.+?),?$/);
+            var segmentsMatch = group.trim().match(/^([а-яА-Яa-zA-Z0-9\s.]+)=(.+?),?$/);
             var title = segmentsMatch === null || segmentsMatch === void 0 ? void 0 : segmentsMatch[1];
             // Вырезаем лишние кавычки
             var description = (_b = (_a = segmentsMatch === null || segmentsMatch === void 0 ? void 0 : segmentsMatch[2]) === null || _a === void 0 ? void 0 : _a.replace(/^"(.*)"/, '$1')) === null || _b === void 0 ? void 0 : _b.replace(/"{2}/g, '"');

examples/angular/package-lock.json

@@ -3308,9 +3308,9 @@
       }
     },
     "crypto-pro": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/crypto-pro/-/crypto-pro-2.0.4.tgz",
-      "integrity": "sha512-fR8RE7iApGdvb0Z6vKV4yeaapKZyzZf/98ShA7i4Y2Mn1p3iwpL22X6gQWlFc/VGvz29dKomvvWiXiVYmOryfw=="
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/crypto-pro/-/crypto-pro-2.0.5.tgz",
+      "integrity": "sha512-YZbVNt9ZmE75H97gdqS2ZGW8xnuHxdvQxLH/SmMQIizIBLmMIylOhY3HvgEUxnrIkL64/m6vrG5H2w7pGTb17Q=="
     },
     "css": {
       "version": "2.2.4",
@@ -13162,9 +13162,9 @@
       }
     },
     "websocket-extensions": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
-      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
       "dev": true
     },
     "when": {

examples/angular/package.json

@@ -21,7 +21,7 @@
     "@angular/platform-browser": "~9.0.7",
     "@angular/platform-browser-dynamic": "~9.0.7",
     "@angular/router": "~9.0.7",
-    "crypto-pro": "2.0.4",
+    "crypto-pro": "2.0.5",
     "rxjs": "~6.5.4",
     "tslib": "^1.10.0",
     "zone.js": "~0.10.2"

examples/react/package-lock.json

@@ -3712,9 +3712,9 @@
       }
     },
     "crypto-pro": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/crypto-pro/-/crypto-pro-2.0.4.tgz",
-      "integrity": "sha512-fR8RE7iApGdvb0Z6vKV4yeaapKZyzZf/98ShA7i4Y2Mn1p3iwpL22X6gQWlFc/VGvz29dKomvvWiXiVYmOryfw=="
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/crypto-pro/-/crypto-pro-2.0.5.tgz",
+      "integrity": "sha512-YZbVNt9ZmE75H97gdqS2ZGW8xnuHxdvQxLH/SmMQIizIBLmMIylOhY3HvgEUxnrIkL64/m6vrG5H2w7pGTb17Q=="
     },
     "css": {
       "version": "2.2.4",

examples/react/package.json

@@ -7,7 +7,7 @@
     "@testing-library/jest-dom": "4.2.4",
     "@testing-library/react": "9.5.0",
     "@testing-library/user-event": "7.2.1",
-    "crypto-pro": "2.0.4",
+    "crypto-pro": "2.0.5",
     "react": "^16.13.1",
     "react-app-polyfill": "1.0.6",
     "react-dom": "^16.13.1",

examples/script-tag/package-lock.json

@@ -42,9 +42,9 @@
       "dev": true
     },
     "crypto-pro": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/crypto-pro/-/crypto-pro-2.0.4.tgz",
-      "integrity": "sha512-fR8RE7iApGdvb0Z6vKV4yeaapKZyzZf/98ShA7i4Y2Mn1p3iwpL22X6gQWlFc/VGvz29dKomvvWiXiVYmOryfw=="
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/crypto-pro/-/crypto-pro-2.0.5.tgz",
+      "integrity": "sha512-YZbVNt9ZmE75H97gdqS2ZGW8xnuHxdvQxLH/SmMQIizIBLmMIylOhY3HvgEUxnrIkL64/m6vrG5H2w7pGTb17Q=="
     },
     "fs.realpath": {
       "version": "1.0.0",

examples/script-tag/package.json

@@ -13,6 +13,6 @@
     "symlink-dir": "3.1.2"
   },
   "dependencies": {
-    "crypto-pro": "2.0.4"
+    "crypto-pro": "2.0.5"
   }
 }

lib/crypto-pro.d.ts

@@ -1,4 +1,4 @@
-// Type definitions for crypto-pro 2.0.4
+// Type definitions for crypto-pro 2.0.5
 // Project: crypto-pro
 // Definitions by: Vitalii Goma https://github.com/vgoma
 

lib/crypto-pro.js

@@ -1050,7 +1050,7 @@ exports.ISSUER_TAGS_TRANSLATIONS = [
     { possibleNames: ['ОГРН', 'OGRN'], translation: 'ОГРН' },
     { possibleNames: ['ОГРНИП', 'OGRNIP'], translation: 'ОГРНИП' },
     { possibleNames: ['СНИЛС', 'SNILS'], translation: 'СНИЛС' },
-    { possibleNames: ['ИНН', 'INN'], translation: 'ИНН' },
+    { possibleNames: ['ИНН', 'INN', 'ИНН организации'], translation: 'ИНН' },
     { possibleNames: ['E'], translation: 'Email' },
     { possibleNames: ['L'], translation: 'Город' },
 ];
@@ -1140,7 +1140,7 @@ exports.SUBJECT_TAGS_TRANSLATIONS = [
     { possibleNames: ['ОГРН', 'OGRN'], translation: 'ОГРН' },
     { possibleNames: ['ОГРНИП', 'OGRNIP'], translation: 'ОГРНИП' },
     { possibleNames: ['СНИЛС', 'SNILS'], translation: 'СНИЛС' },
-    { possibleNames: ['ИНН', 'INN'], translation: 'ИНН' },
+    { possibleNames: ['ИНН', 'INN', 'ИНН организации'], translation: 'ИНН' },
     { possibleNames: ['E'], translation: 'Email' },
     { possibleNames: ['L'], translation: 'Город' },
 ];
@@ -1476,11 +1476,11 @@ const constants_1 = __webpack_require__(/*! ../constants */ "./constants/index.t
  * @returns расшифрованная информация по отдельным тэгам
  */
 exports._parseCertInfo = (tagsTranslations, rawInfo) => {
-    const extractedEntities = rawInfo.match(/([а-яА-Яa-zA-Z0-9.]+)=(?:("[^"]+?")|(.+?))(?:,|$)/g);
+    const extractedEntities = rawInfo.match(/([а-яА-Яa-zA-Z0-9\s.]+)=(?:("[^"]+?")|(.+?))(?:,|$)/g);
     if (extractedEntities) {
         return extractedEntities.map((group) => {
             var _a, _b, _c;
-            const segmentsMatch = group.match(/^([а-яА-Яa-zA-Z0-9.]+)=(.+?),?$/);
+            const segmentsMatch = group.trim().match(/^([а-яА-Яa-zA-Z0-9\s.]+)=(.+?),?$/);
             let title = segmentsMatch === null || segmentsMatch === void 0 ? void 0 : segmentsMatch[1];
             // Вырезаем лишние кавычки
             const description = (_b = (_a = segmentsMatch === null || segmentsMatch === void 0 ? void 0 : segmentsMatch[2]) === null || _a === void 0 ? void 0 : _a.replace(/^"(.*)"/, '$1')) === null || _b === void 0 ? void 0 : _b.replace(/"{2}/g, '"');

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "crypto-pro",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,9 +1,14 @@
 {
   "name": "crypto-pro",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "API для взаимодействия с КриптоПро",
   "main": "./lib/crypto-pro.js",
   "types": "./lib/crypto-pro.d.ts",
+  "files": [
+    "lib/**/*",
+    "dist/**/*",
+    "bower.json"
+  ],
   "scripts": {
     "clean": "rimraf dist lib package coverage",
     "start": "cross-env TS_CONFIG=tsconfig-es5.json webpack --watch",

src/constants/issuer-tags-translations.ts

@@ -12,7 +12,7 @@ export const ISSUER_TAGS_TRANSLATIONS: TagsTranslations[] = [
   { possibleNames: ['ОГРН', 'OGRN'], translation: 'ОГРН' },
   { possibleNames: ['ОГРНИП', 'OGRNIP'], translation: 'ОГРНИП' },
   { possibleNames: ['СНИЛС', 'SNILS'], translation: 'СНИЛС' },
-  { possibleNames: ['ИНН', 'INN'], translation: 'ИНН' },
+  { possibleNames: ['ИНН', 'INN', 'ИНН организации'], translation: 'ИНН' },
   { possibleNames: ['E'], translation: 'Email' },
   { possibleNames: ['L'], translation: 'Город' },
 ];

src/constants/subject-tags-translations.ts

@@ -14,7 +14,7 @@ export const SUBJECT_TAGS_TRANSLATIONS: TagsTranslations[] = [
   { possibleNames: ['ОГРН', 'OGRN'], translation: 'ОГРН' },
   { possibleNames: ['ОГРНИП', 'OGRNIP'], translation: 'ОГРНИП' },
   { possibleNames: ['СНИЛС', 'SNILS'], translation: 'СНИЛС' },
-  { possibleNames: ['ИНН', 'INN'], translation: 'ИНН' },
+  { possibleNames: ['ИНН', 'INN', 'ИНН организации'], translation: 'ИНН' },
   { possibleNames: ['E'], translation: 'Email' },
   { possibleNames: ['L'], translation: 'Город' },
 ];

src/helpers/_parseCertInfo.test.ts

@@ -19,6 +19,7 @@ describe('_parseCertInfo', () => {
       'UNKNOWN=неизвестный тэг',
       'E=email@example.ru',
       'INN=007811514257',
+      'ИНН организации=007811514257',
       'OGRN=1127847087885',
       'SNILS=11617693460',
     ].join(', ');
@@ -99,6 +100,11 @@ describe('_parseCertInfo', () => {
         title: 'ИНН',
         isTranslated: true,
       },
+      {
+        description: '007811514257',
+        title: 'ИНН',
+        isTranslated: true,
+      },
       {
         description: '1127847087885',
         title: 'ОГРН',
@@ -123,6 +129,7 @@ describe('_parseCertInfo', () => {
       'S=78 Санкт-Петербург',
       'C=RU',
       'INN=007813317783',
+      'ИНН организации=007813317783',
       'OGRN=1057810150892',
       'E=uc@sampokey.ru',
     ].join(', ');
@@ -173,6 +180,11 @@ describe('_parseCertInfo', () => {
         title: 'ИНН',
         isTranslated: true,
       },
+      {
+        description: '007813317783',
+        title: 'ИНН',
+        isTranslated: true,
+      },
       {
         description: '1057810150892',
         title: 'ОГРН',

src/helpers/_parseCertInfo.ts

@@ -15,11 +15,11 @@ export interface TagTranslation {
  * @returns расшифрованная информация по отдельным тэгам
  */
 export const _parseCertInfo = (tagsTranslations: TagsTranslations[], rawInfo: string): TagTranslation[] => {
-  const extractedEntities: string[] = rawInfo.match(/([а-яА-Яa-zA-Z0-9.]+)=(?:("[^"]+?")|(.+?))(?:,|$)/g);
+  const extractedEntities: string[] = rawInfo.match(/([а-яА-Яa-zA-Z0-9\s.]+)=(?:("[^"]+?")|(.+?))(?:,|$)/g);
 
   if (extractedEntities) {
     return extractedEntities.map((group) => {
-      const segmentsMatch = group.match(/^([а-яА-Яa-zA-Z0-9.]+)=(.+?),?$/);
+      const segmentsMatch = group.trim().match(/^([а-яА-Яa-zA-Z0-9\s.]+)=(.+?),?$/);
       let title = segmentsMatch?.[1];
       // Вырезаем лишние кавычки
       const description = segmentsMatch?.[2]?.replace(/^"(.*)"/, '$1')?.replace(/"{2}/g, '"');