diff --git a/__tests__/files/gmail-gmail/chrome-chrome/02/received.eml b/__tests__/files/gmail-gmail/chrome-chrome/02/received.eml index 1ae7262d47809d54bfc0eeeca49c8442c78a9a66..a072836381a5b9404cdbb4d369edfce047cc8e31 100644 --- a/__tests__/files/gmail-gmail/chrome-chrome/02/received.eml +++ b/__tests__/files/gmail-gmail/chrome-chrome/02/received.eml @@ -76,18 +76,18 @@ Content-Type: text/plain; charset="UTF-8" Hey, this is test email. Please review [image: Vereign Seal] -<https://gcloud-dev.vrgnservices.com#CiBQiIbmG99c7Jzuo8VGHao_uN2-vYRCZv29c-Vx-nJn5hIg7R01tQwRE_xvFJ1geixiCvzODVhEf-X-Wqqd2H_kmPU=> +<https://gcloud-dev.vrgnservices.com/#CiBQiIbmG99c7Jzuo8VGHao_uN2-vYRCZv29c-Vx-nJn5hIg7R01tQwRE_xvFJ1geixiCvzODVhEf-X-Wqqd2H_kmPU=> --000000000000f0f23a05bcc65498 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><br>Hey, this is test email. Please review<br><a id=3D"sea= -l-container-v1-02ad0783aa9992659a828a77bf7d173e68f5b3bb583c3818c2debbb957d0= -02c6" href=3D"https://gcloud-dev.vrgnservices.com#CiBQiIbmG99c7Jzuo8VGHao_u= +l-container-v1-a24075ce8481b71863e49d303ada6f6bdf0c37306b31c68470e81f912e3f= +2fe4" href=3D"https://gcloud-dev.vrgnservices.com#CiBQiIbmG99c7Jzuo8VGHao_u= N2-vYRCZv29c-Vx-nJn5hIg7R01tQwRE_xvFJ1geixiCvzODVhEf-X-Wqqd2H_kmPU=3D" targ= -et=3D"_blank" rel=3D"noopener noreferrer"><img id=3D"seal-image-02ad0783aa9= -992659a828a77bf7d173e68f5b3bb583c3818c2debbb957d002c6" alt=3D"Vereign Seal"= +et=3D"_blank" rel=3D"noopener noreferrer"><img id=3D"seal-image-a24075ce848= +1b71863e49d303ada6f6bdf0c37306b31c68470e81f912e3f2fe4" alt=3D"Vereign Seal"= src=3D"cid:ii_klw2j68k0" width=3D"145" height=3D"219" style=3D"width: 145p= x; height: 219px;"></a></div> diff --git a/__tests__/files/gmail-gmail/chrome-chrome/10/received.eml b/__tests__/files/gmail-gmail/chrome-chrome/10/received.eml index 8d7c9e0f8090b48c67f3bc128249e43ddfab5383..c06a3ead519effed730e9c7df3f1aab6b2730f36 100644 --- a/__tests__/files/gmail-gmail/chrome-chrome/10/received.eml +++ b/__tests__/files/gmail-gmail/chrome-chrome/10/received.eml @@ -86,7 +86,7 @@ Cheers Regards, =D0=BA=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=D0=B8=D1=86=D0=B0 [image: Vereign Seal] -<https://gcloud-dev.vrgnservices.com#CiDeOhtvpxoWDTxAxZ-4XS7DVcLgYfIH6wBAza= +<https://gcloud-dev.vrgnservices.com/#CiDeOhtvpxoWDTxAxZ-4XS7DVcLgYfIH6wBAza= XFCeX_1BIgJvHzvAw4eoKARtohIeBku_VL9-vJrfoC-qlUoCvxQU0=3D> On Fri, 5 Mar 2021 at 12:05, Se Himmelen <sepahimmelen@gmail.com> wrote: @@ -114,11 +114,11 @@ Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><br>Thanks. Responding back<br><br>Cheers<br><br>Regards, = =D0=BA=D0=B8=D1=80=D0=B8=D0=BB=D0=BB=D0=B8=D1=86=D0=B0<br><a id=3D"seal-con= -tainer-v1-52ee5640c64bac9c8a34b02b343a7f8882bd491956711f3b0b91f66b814ff5bd"= +tainer-v1-6b2e260c6a2aee4ebc47f505dd745a25dd6c91c2667d4842ce2fcc22e8f71ba5"= href=3D"https://gcloud-dev.vrgnservices.com#CiDeOhtvpxoWDTxAxZ-4XS7DVcLgYf= IH6wBAzaXFCeX_1BIgJvHzvAw4eoKARtohIeBku_VL9-vJrfoC-qlUoCvxQU0=3D" target=3D= -"_blank" rel=3D"noopener noreferrer"><img id=3D"seal-image-52ee5640c64bac9c= -8a34b02b343a7f8882bd491956711f3b0b91f66b814ff5bd" alt=3D"Vereign Seal" src= +"_blank" rel=3D"noopener noreferrer"><img id=3D"seal-image-6b2e260c6a2aee4e= +bc47f505dd745a25dd6c91c2667d4842ce2fcc22e8f71ba5" alt=3D"Vereign Seal" src= =3D"cid:ii_klw2plbr2" width=3D"145" height=3D"219" style=3D"width: 145px; h= eight: 219px;"></a></div><br><div class=3D"gmail_quote"><div dir=3D"ltr" cl= ass=3D"gmail_attr">On Fri, 5 Mar 2021 at 12:05, Se Himmelen <<a href=3D"= diff --git a/__tests__/helpers/index.ts b/__tests__/helpers/index.ts index 8eb09e75c4c3898d9ea41820ed6b822e6221b348..9c605c38e63c3ca04e878e682cc0e5d87e0db7e0 100644 --- a/__tests__/helpers/index.ts +++ b/__tests__/helpers/index.ts @@ -6,7 +6,7 @@ import { expect, test } from "@jest/globals"; import { PlainNormalizer, HTMLNormalizer } from "../../src"; import { listDirectories, readFile } from "./fileReader"; import { diffStringsUnified } from "jest-diff"; -import { SealService } from "@vereign/light-utils"; +import { SealService } from "@vereign/lib-seal"; const SENT_EML_NAME = "sent.eml"; const RECEIVED_EML_NAME = "received.eml"; diff --git a/package.json b/package.json index c3f824a2cbd989958e541790d20be43c017d1e9f..2d4ac66a459cd4a5bd3236b3002e0290c8969e1a 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "@typescript-eslint/parser": "^3.10.1", "@vereign/lib-mime": "^1.1.2", "@vereign/lib-png": "^1.0.0", - "@vereign/light-utils": "git+ssh://git@code.vereign.com:seal/building-blocks/signing-verification-utilities.git", + "@vereign/lib-seal": "^1.0.1", "babel-eslint": "^10.1.0", "babel-jest": "^26.3.0", "eslint": "^7.7.0", diff --git a/yarn.lock b/yarn.lock index ed28d2a73a195b0526cfec61710939506c124e67..e996d061f14d3283b4e4f74698999919539a52e3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1070,59 +1070,6 @@ "@types/yargs" "^15.0.0" chalk "^4.0.0" -"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf" - integrity sha1-m4sMxmPWaafY9vXQiToU00jzD78= - -"@protobufjs/base64@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735" - integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg== - -"@protobufjs/codegen@^2.0.4": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb" - integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg== - -"@protobufjs/eventemitter@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70" - integrity sha1-NVy8mLr61ZePntCV85diHx0Ga3A= - -"@protobufjs/fetch@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45" - integrity sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU= - dependencies: - "@protobufjs/aspromise" "^1.1.1" - "@protobufjs/inquire" "^1.1.0" - -"@protobufjs/float@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1" - integrity sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E= - -"@protobufjs/inquire@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089" - integrity sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik= - -"@protobufjs/path@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d" - integrity sha1-bMKyDFya1q0NzP0hynZz2Nf79o0= - -"@protobufjs/pool@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54" - integrity sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q= - -"@protobufjs/utf8@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" - integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA= - "@sinonjs/commons@^1.7.0": version "1.8.1" resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217" @@ -1211,21 +1158,11 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0" integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw== -"@types/long@^4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9" - integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w== - "@types/node@*": version "14.14.9" resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.9.tgz#04afc9a25c6ff93da14deabd65dc44485b53c8d6" integrity sha512-JsoLXFppG62tWTklIoO4knA+oDTYsmqWxHRvd4lpmfQRNhX6osheUOWETP2jMoV/2bEHuMra8Pp3Dmo/stBFcw== -"@types/node@^13.7.0": - version "13.13.45" - resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.45.tgz#e6676bcca092bae5751d015f074a234d5a82eb63" - integrity sha512-703YTEp8AwQeapI0PTXDOj+Bs/mtdV/k9VcTP7z/de+lx6XjFMKdB+JhKnK+6PZ5za7omgZ3V6qm/dNkMj/Zow== - "@types/normalize-package-data@^2.4.0": version "2.4.0" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" @@ -1328,19 +1265,13 @@ resolved "https://registry.yarnpkg.com/@vereign/lib-png/-/lib-png-1.0.0.tgz#ce758b50953245498cf36e011e22180deee0e778" integrity sha512-BLSy4hP/GeTnEfTlGFH/0naM/7JrCrTCPTdkeo+6HtTJRHtBZZg9fhGZJYBFrmNL3y5fNnSjsDha7kG6UjkMSw== -"@vereign/light-utils@git+ssh://git@code.vereign.com:seal/building-blocks/signing-verification-utilities.git": +"@vereign/lib-seal@^1.0.1": version "1.0.1" - resolved "git+ssh://git@code.vereign.com:seal/building-blocks/signing-verification-utilities.git#7bfe671f23e61ce2e4fa19ede48c24380cb6d2b5" + resolved "https://registry.yarnpkg.com/@vereign/lib-seal/-/lib-seal-1.0.1.tgz#9f4d73d0aa7b4bb6411b6a88a17e8baf7a040717" + integrity sha512-ohItb1XpXNHRh0fctXYFsP/hocmPk2jBF0z852bStzjP3+dfAWes8jo2hqcn+ZG6jzujM8DRV40uQfeCbocuIA== dependencies: - axios "^0.20.0" - easyqrcodejs "^4.3.1" - eventemitter2 "^6.4.3" - google-protobuf "^3.13.0" - js-md5 "^0.7.3" penpal "^5.3.0" - protobufjs "^6.10.1" - url-parse "^1.4.7" - zlibjs "^0.3.1" + url-parse "^1.5.1" abab@^2.0.3, abab@^2.0.5: version "2.0.5" @@ -1526,13 +1457,6 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== -axios@^0.20.0: - version "0.20.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.20.0.tgz#057ba30f04884694993a8cd07fa394cff11c50bd" - integrity sha512-ANA4rr2BDcmmAQLOKft2fufrtuvlqR+cXNNinUmvfeSNCOF98PZL+7M/v1zIdGo7OLjEA9J2gXJL+j4zGsl0bA== - dependencies: - follow-redirects "^1.10.0" - babel-eslint@^10.1.0: version "10.1.0" resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232" @@ -2088,11 +2012,6 @@ domexception@^2.0.1: dependencies: webidl-conversions "^5.0.0" -easyqrcodejs@^4.3.1: - version "4.3.2" - resolved "https://registry.yarnpkg.com/easyqrcodejs/-/easyqrcodejs-4.3.2.tgz#06b6c88366e5626fad7c44655886276ceda77d34" - integrity sha512-5609dFayVxInBzbZEoMw6ELLtKCZidWoLOKmNDRYNxdMoRLRZaqJ0TNsklFkMyajvVbFAq1h/xgYYGJDLKXqvQ== - ecc-jsbn@~0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" @@ -2292,11 +2211,6 @@ esutils@^2.0.2: resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== -eventemitter2@^6.4.3: - version "6.4.4" - resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.4.tgz#aa96e8275c4dbeb017a5d0e03780c65612a1202b" - integrity sha512-HLU3NDY6wARrLCEwyGKRBvuWYyvW6mHYv72SJJAH3iJN3a6eVUvkjFkcxah1bcTgGVBBrFdIopBJPhCQFMLyXw== - exec-sh@^0.3.2: version "0.3.4" resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5" @@ -2486,11 +2400,6 @@ flatted@^2.0.0: resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138" integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== -follow-redirects@^1.10.0: - version "1.13.3" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.3.tgz#e5598ad50174c1bc4e872301e82ac2cd97f90267" - integrity sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA== - for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -2632,11 +2541,6 @@ globals@^12.1.0: dependencies: type-fest "^0.8.1" -google-protobuf@^3.13.0: - version "3.15.5" - resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.15.5.tgz#d011f334231e79b472e42d4e8ec7409cd402a747" - integrity sha512-6bLpAI4nMIQODlegR7OevgkCoyOj5frLVDArUpeuBWad7XWUNWMGP0v5lz1/aeUI6Yf3cG9XA6acZkPxom4SEw== - graceful-fs@^4.2.4: version "4.2.4" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" @@ -3454,11 +3358,6 @@ jest@^26.4.2: import-local "^3.0.2" jest-cli "^26.6.3" -js-md5@^0.7.3: - version "0.7.3" - resolved "https://registry.yarnpkg.com/js-md5/-/js-md5-0.7.3.tgz#b4f2fbb0b327455f598d6727e38ec272cd09c3f2" - integrity sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ== - js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" @@ -3723,11 +3622,6 @@ log-update@^4.0.0: slice-ansi "^4.0.0" wrap-ansi "^6.2.0" -long@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" - integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== - make-dir@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" @@ -4198,25 +4092,6 @@ prompts@^2.0.1: kleur "^3.0.3" sisteransi "^1.0.5" -protobufjs@^6.10.1: - version "6.10.2" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.10.2.tgz#b9cb6bd8ec8f87514592ba3fdfd28e93f33a469b" - integrity sha512-27yj+04uF6ya9l+qfpH187aqEzfCF4+Uit0I9ZBQVqK09hk/SQzKa2MUqUpXaVa7LOFRg1TSSr3lVxGOk6c0SQ== - dependencies: - "@protobufjs/aspromise" "^1.1.2" - "@protobufjs/base64" "^1.1.2" - "@protobufjs/codegen" "^2.0.4" - "@protobufjs/eventemitter" "^1.1.0" - "@protobufjs/fetch" "^1.1.0" - "@protobufjs/float" "^1.0.2" - "@protobufjs/inquire" "^1.1.0" - "@protobufjs/path" "^1.1.2" - "@protobufjs/pool" "^1.1.0" - "@protobufjs/utf8" "^1.1.0" - "@types/long" "^4.0.1" - "@types/node" "^13.7.0" - long "^4.0.0" - psl@^1.1.28, psl@^1.1.33: version "1.8.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" @@ -5127,6 +5002,14 @@ url-parse@^1.4.7: querystringify "^2.1.1" requires-port "^1.0.0" +url-parse@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz#d5fa9890af8a5e1f274a2c98376510f6425f6e3b" + integrity sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q== + dependencies: + querystringify "^2.1.1" + requires-port "^1.0.0" + use@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" @@ -5348,8 +5231,3 @@ yargs@^15.4.1: which-module "^2.0.0" y18n "^4.0.0" yargs-parser "^18.1.2" - -zlibjs@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/zlibjs/-/zlibjs-0.3.1.tgz#50197edb28a1c42ca659cc8b4e6a9ddd6d444554" - integrity sha1-UBl+2yihxCymWcyLTmqd3W1ERVQ=