From 9c3a9c6063220eb712ed6c0f37a6310bebababd1 Mon Sep 17 00:00:00 2001 From: igor <igor.markin@vereign.com> Date: Tue, 1 Jun 2021 17:46:01 +0300 Subject: [PATCH 1/4] Install `@vereign/lib-mime` instead of `@vereign/mime-parser` --- package.json | 5 ++++- src/services/SealService/extractSealFromMime.ts | 2 +- yarn.lock | 11 ++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 5d8ffc8..967a035 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "@types/jsdom": "^16.2.4", "@typescript-eslint/eslint-plugin": "^3.10.1", "@typescript-eslint/parser": "^3.10.1", + "@vereign/lib-mime": "^1.1.1", "babel-eslint": "^10.1.0", "babel-jest": "^26.3.0", "eslint": "^7.7.0", @@ -36,7 +37,6 @@ } }, "dependencies": { - "@vereign/mime-parser": "git+ssh://git@code.vereign.com:code/js-toolbox/mime-parser.git", "@vereign/png": "git+ssh://git@code.vereign.com:code/js-toolbox/png.git#v1.0.0", "axios": "^0.20.0", "easyqrcodejs": "^4.3.1", @@ -47,5 +47,8 @@ "protobufjs": "^6.10.1", "url-parse": "^1.4.7", "zlibjs": "^0.3.1" + }, + "peerDependencies": { + "@vereign/lib-mime": "^1.1.1" } } diff --git a/src/services/SealService/extractSealFromMime.ts b/src/services/SealService/extractSealFromMime.ts index b2f7b94..be34144 100644 --- a/src/services/SealService/extractSealFromMime.ts +++ b/src/services/SealService/extractSealFromMime.ts @@ -1,4 +1,4 @@ -import MIMEParser from "@vereign/mime-parser"; +import MIMEParser from "@vereign/lib-mime"; import PNG, { getMetaData } from "@vereign/png"; import URL from "url-parse"; import SealReadingError from "./SealReadingError"; diff --git a/yarn.lock b/yarn.lock index b398587..f053b53 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1331,13 +1331,10 @@ dependencies: eslint-visitor-keys "^1.1.0" -"@vereign/mime-parser@git+ssh://git@code.vereign.com:code/js-toolbox/mime-parser.git": - version "1.0.1" - resolved "git+ssh://git@code.vereign.com:code/js-toolbox/mime-parser.git#b82bff2919852a12259980fc78135d7c238fdc35" - -"@vereign/mime-parser@git+ssh://git@code.vereign.com:code/js-toolbox/mime-parser.git#6-implement-extraction-of-the-forwarded-replied-parts-for-emails-sent-by-outlook-desktop": - version "1.0.1" - resolved "git+ssh://git@code.vereign.com:code/js-toolbox/mime-parser.git#4d9af7000a881abd46e087a4586049bd1f87f495" +"@vereign/lib-mime@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@vereign/lib-mime/-/lib-mime-1.1.1.tgz#d130e6496d0f67c0688787aad5f94781218995e1" + integrity sha512-NXcHx0osnoNtV6hcBOCkwZ7MPJM/cMNlZvCP5VxFIyIMvu+BDHI/+0p4oipTbNvyXpBqjy0wWdwMpzlkGfX18Q== "@vereign/png@git+ssh://git@code.vereign.com:code/js-toolbox/png.git#v1.0.0": version "1.0.0" -- GitLab From 15ddd117de3e34b9c6e7f168e7cef74820acd6f2 Mon Sep 17 00:00:00 2001 From: igor <igor.markin@vereign.com> Date: Tue, 1 Jun 2021 17:48:41 +0300 Subject: [PATCH 2/4] Update installation guide --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a240aa2..c136e10 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,8 @@ Import desired types in the code as needed. ## Installation -`yarn add git+ssh://git@code.vereign.com:light/clients/utils.git` +- [Set up](https://code.vereign.com/code/Documentation/-/wikis/Component-Setup/Installation-of-the-private-NPM-packages) authentication to the company NPM account +- `$ yarn add git+ssh://git@code.vereign.com:light/clients/utils.git @vereign/lib-mime` ## Development -- GitLab From 3be821a58139946d39a981f5b738a61376be5780 Mon Sep 17 00:00:00 2001 From: igor <igor.markin@vereign.com> Date: Tue, 1 Jun 2021 18:38:00 +0300 Subject: [PATCH 3/4] Update build --- dist/services/SealService/extractSealFromMime.d.ts | 2 +- dist/services/SealService/extractSealFromMime.js | 4 ++-- dist/services/SealService/index.d.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/services/SealService/extractSealFromMime.d.ts b/dist/services/SealService/extractSealFromMime.d.ts index cc64e8f..a7dcb0d 100644 --- a/dist/services/SealService/extractSealFromMime.d.ts +++ b/dist/services/SealService/extractSealFromMime.d.ts @@ -1,4 +1,4 @@ -import MIMEParser from "@vereign/mime-parser"; +import MIMEParser from "@vereign/lib-mime"; declare const _default: (mime: string | MIMEParser, parseHTML?: (htmlString: string) => HTMLDocument) => Promise<{ sealUrl: string; publicKey: string; diff --git a/dist/services/SealService/extractSealFromMime.js b/dist/services/SealService/extractSealFromMime.js index 9c492e0..f16f366 100644 --- a/dist/services/SealService/extractSealFromMime.js +++ b/dist/services/SealService/extractSealFromMime.js @@ -32,7 +32,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { }; Object.defineProperty(exports, "__esModule", { value: true }); exports.findSealContainer = void 0; -const mime_parser_1 = __importDefault(require("@vereign/mime-parser")); +const lib_mime_1 = __importDefault(require("@vereign/lib-mime")); const png_1 = __importStar(require("@vereign/png")); const url_parse_1 = __importDefault(require("url-parse")); const SealReadingError_1 = __importDefault(require("./SealReadingError")); @@ -45,7 +45,7 @@ const getSealId_1 = __importDefault(require("./getSealId")); const OUTLOOK_SAFELINKS_WRAPPER = "safelinks.protection.outlook.com"; exports.default = (mime, parseHTML = null) => __awaiter(void 0, void 0, void 0, function* () { if (typeof mime === "string") { - mime = new mime_parser_1.default(mime); + mime = new lib_mime_1.default(mime); } if (parseHTML) { mime.parseHTML = parseHTML; diff --git a/dist/services/SealService/index.d.ts b/dist/services/SealService/index.d.ts index 7aea06c..f4736e1 100644 --- a/dist/services/SealService/index.d.ts +++ b/dist/services/SealService/index.d.ts @@ -1,7 +1,7 @@ import SealReadingError from "./SealReadingError"; declare const _default: { SealReadingError: typeof SealReadingError; - extractSealFromMime: (mime: string | import("@vereign/mime-parser/dist/MIMEParser").default, parseHTML?: (htmlString: string) => HTMLDocument) => Promise<{ + extractSealFromMime: (mime: string | import("@vereign/lib-mime/dist/MIMEParser").default, parseHTML?: (htmlString: string) => HTMLDocument) => Promise<{ sealUrl: string; publicKey: string; sealId: string; -- GitLab From 7d319c9a1af8ca40f11f3b0e261dc4b47e84fe6e Mon Sep 17 00:00:00 2001 From: Igor Markin <igor.markin@vereign.com> Date: Thu, 3 Jun 2021 07:45:07 +0000 Subject: [PATCH 4/4] set npm token --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2ffab44..2643628 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,6 +12,7 @@ install: - amd64-docker script: - apk add --no-cache git openssh + - npm config set '//registry.npmjs.org/:_authToken' $NPM_TOKEN - git config --global url."https://gitlab-ci-token:$CI_JOB_TOKEN@code.vereign.com/".insteadOf "git@code.vereign.com:" - echo '[http "https://code.vereign.com"]' >> $HOME/.gitconfig - echo " sslVerify = false" >> $HOME/.gitconfig -- GitLab