From 3914c6d191d58625e03e464289480c45ef35b21c Mon Sep 17 00:00:00 2001
From: Zdravko Iliev <zdravko.iliev@vereign.com>
Date: Tue, 8 Dec 2020 19:38:44 +0200
Subject: [PATCH] logs
---
dist/generated/qrcode_data_pb.d.ts | 2 +-
dist/generated/statuses_pb.d.ts | 2 +-
.../CryptoService/CryptoServiceWeb.js | 3 +--
dist/services/MailParser/MailParser.js | 6 ++---
.../MimeVerificationService.d.ts | 2 +-
dist/services/QrCodeDataService.js | 1 +
dist/utils/common.d.ts | 2 +-
dist/utils/common.js | 27 +++++++------------
dist/utils/stringUtils.js | 6 ++---
9 files changed, 19 insertions(+), 32 deletions(-)
diff --git a/dist/generated/qrcode_data_pb.d.ts b/dist/generated/qrcode_data_pb.d.ts
index 6319420..7f27095 100644
--- a/dist/generated/qrcode_data_pb.d.ts
+++ b/dist/generated/qrcode_data_pb.d.ts
@@ -1,2 +1,2 @@
export = $root;
-declare var $root: any;
+declare var $root: {};
diff --git a/dist/generated/statuses_pb.d.ts b/dist/generated/statuses_pb.d.ts
index 6319420..7f27095 100644
--- a/dist/generated/statuses_pb.d.ts
+++ b/dist/generated/statuses_pb.d.ts
@@ -1,2 +1,2 @@
export = $root;
-declare var $root: any;
+declare var $root: {};
diff --git a/dist/services/CryptoService/CryptoServiceWeb.js b/dist/services/CryptoService/CryptoServiceWeb.js
index 8612076..03f65ec 100644
--- a/dist/services/CryptoService/CryptoServiceWeb.js
+++ b/dist/services/CryptoService/CryptoServiceWeb.js
@@ -30,7 +30,7 @@ const convertPemToBinary = (pem) => {
}
return common_1.base64ToArrayBuffer(encoded);
};
-const verifyRSASignature = (publicKeyPEM, data, signature) => __awaiter(void 0, void 0, void 0, function* () {
+exports.verifyRSASignature = (publicKeyPEM, data, signature) => __awaiter(void 0, void 0, void 0, function* () {
const publicKey = yield crypto.subtle.importKey("spki", convertPemToBinary(publicKeyPEM), {
name: "RSASSA-PKCS1-v1_5",
hash: "SHA-256",
@@ -40,7 +40,6 @@ const verifyRSASignature = (publicKeyPEM, data, signature) => __awaiter(void 0,
hash: "SHA-256",
}, publicKey, signature, data);
});
-exports.verifyRSASignature = verifyRSASignature;
const encryptAESGCM = (data) => __awaiter(void 0, void 0, void 0, function* () {
const key = yield crypto.subtle.generateKey({
name: "AES-GCM",
diff --git a/dist/services/MailParser/MailParser.js b/dist/services/MailParser/MailParser.js
index 2bf22ed..4276403 100644
--- a/dist/services/MailParser/MailParser.js
+++ b/dist/services/MailParser/MailParser.js
@@ -330,7 +330,7 @@ exports.getAttachment = getAttachment;
* @param headers
* @returns {string} ('file.txt')
*/
-const getFilenameFromHeaders = (headers) => {
+exports.getFilenameFromHeaders = (headers) => {
const headersToSearch = ["content-type", "content-disposition"];
const filename = headers &&
Object.keys(headers)
@@ -341,7 +341,6 @@ const getFilenameFromHeaders = (headers) => {
}, "");
return filename || DEFAULT_ATTACHMENT_NAME;
};
-exports.getFilenameFromHeaders = getFilenameFromHeaders;
// export const splitParticipants = participantsList => {
// if (!participantsList) {
// return [];
@@ -358,7 +357,7 @@ exports.getFilenameFromHeaders = getFilenameFromHeaders;
* @param string
* @returns {*}
*/
-const extractHtmlBodyFromString = (string) => {
+exports.extractHtmlBodyFromString = (string) => {
const extractBodyRegex = /<body.*?>([\s\S]+)<\/body>/gm;
const bodyMatch = extractBodyRegex.exec(string);
let body = string;
@@ -370,7 +369,6 @@ const extractHtmlBodyFromString = (string) => {
.replace(/<!--[\s\S]*?-->/gm, "")
.trim();
};
-exports.extractHtmlBodyFromString = extractHtmlBodyFromString;
exports.default = {
parseMIME,
getHTML,
diff --git a/dist/services/MimeVerificationService/MimeVerificationService.d.ts b/dist/services/MimeVerificationService/MimeVerificationService.d.ts
index 8fb1c8e..1950ec9 100644
--- a/dist/services/MimeVerificationService/MimeVerificationService.d.ts
+++ b/dist/services/MimeVerificationService/MimeVerificationService.d.ts
@@ -10,6 +10,6 @@ declare const _default: {
htmlPart: string;
plainPart: string;
};
- normalizePlainPart: any;
+ normalizePlainPart: (text: string) => string;
};
export default _default;
diff --git a/dist/services/QrCodeDataService.js b/dist/services/QrCodeDataService.js
index 272cdda..d177722 100644
--- a/dist/services/QrCodeDataService.js
+++ b/dist/services/QrCodeDataService.js
@@ -112,6 +112,7 @@ const computeQrCodeHash = (emailData) => __awaiter(void 0, void 0, void 0, funct
return index_1.CryptoService.SHA256(string);
});
const hashArray = yield Promise.all(promises);
+ console.log(hashArray);
const hashesAsAstring = hashArray
.map(common_1.arrayBufferToBase64)
.sort()
diff --git a/dist/utils/common.d.ts b/dist/utils/common.d.ts
index ce3644f..714b3c6 100644
--- a/dist/utils/common.d.ts
+++ b/dist/utils/common.d.ts
@@ -13,7 +13,7 @@ declare const _default: {
arrayBufferToHex: (buffer: ArrayBuffer) => string;
arrayBufferToBase64: (buffer: ArrayBuffer) => string;
base64ToArrayBuffer: (base64: string) => ArrayBuffer;
- ensureUint8Array: (data: string | Uint8Array | ArrayBuffer) => Uint8Array;
+ ensureUint8Array: (data: string | ArrayBuffer | Uint8Array) => Uint8Array;
ensureArrayBuffer: (data: string | ArrayBuffer) => ArrayBuffer;
ensureBase64: (data: string | ArrayBuffer) => string;
escapeHtmlString: (string: string) => string;
diff --git a/dist/utils/common.js b/dist/utils/common.js
index 5425383..8314d0c 100644
--- a/dist/utils/common.js
+++ b/dist/utils/common.js
@@ -2,23 +2,19 @@
Object.defineProperty(exports, "__esModule", { value: true });
exports.escapeHtmlString = exports.arrayBufferToHex = exports.decompressData = exports.compressData = exports.ensureUint8Array = exports.ensureArrayBuffer = exports.ensureBase64 = exports.base64ToArrayBuffer = exports.arrayBufferToBase64 = void 0;
const zlib_min_1 = require("zlibjs/bin/zlib.min");
-const arrayBufferToBase64 = (buffer) => {
+exports.arrayBufferToBase64 = (buffer) => {
return Buffer.from(buffer).toString("base64");
};
-exports.arrayBufferToBase64 = arrayBufferToBase64;
-const base64ToArrayBuffer = (base64) => {
+exports.base64ToArrayBuffer = (base64) => {
return Buffer.from(base64, "base64");
};
-exports.base64ToArrayBuffer = base64ToArrayBuffer;
-const ensureBase64 = (data) => {
+exports.ensureBase64 = (data) => {
return typeof data === "string" ? data : exports.arrayBufferToBase64(data);
};
-exports.ensureBase64 = ensureBase64;
-const ensureArrayBuffer = (data) => {
+exports.ensureArrayBuffer = (data) => {
return typeof data === "string" ? exports.base64ToArrayBuffer(data) : data;
};
-exports.ensureArrayBuffer = ensureArrayBuffer;
-const ensureUint8Array = (data) => {
+exports.ensureUint8Array = (data) => {
return data instanceof Uint8Array
? data
: typeof data === "string"
@@ -27,24 +23,20 @@ const ensureUint8Array = (data) => {
? new Uint8Array(data)
: data;
};
-exports.ensureUint8Array = ensureUint8Array;
-const compressData = (binary) => {
+exports.compressData = (binary) => {
const deflate = new zlib_min_1.Zlib.Deflate(exports.ensureUint8Array(binary));
return deflate.compress();
};
-exports.compressData = compressData;
-const decompressData = (binary) => {
+exports.decompressData = (binary) => {
const inflate = new zlib_min_1.Zlib.Inflate(exports.ensureUint8Array(binary));
return inflate.decompress();
};
-exports.decompressData = decompressData;
-const arrayBufferToHex = (buffer) => {
+exports.arrayBufferToHex = (buffer) => {
return [...new Uint8Array(buffer)]
.map((b) => b.toString(16).padStart(2, "0"))
.join("");
};
-exports.arrayBufferToHex = arrayBufferToHex;
-const escapeHtmlString = (string) => {
+exports.escapeHtmlString = (string) => {
const matchHtmlRegExp = /["'&<>]/;
const str = "" + string;
const match = matchHtmlRegExp.exec(str);
@@ -83,7 +75,6 @@ const escapeHtmlString = (string) => {
}
return lastIndex !== index ? html + str.substring(lastIndex, index) : html;
};
-exports.escapeHtmlString = escapeHtmlString;
exports.default = {
compressData: exports.compressData,
decompressData: exports.decompressData,
diff --git a/dist/utils/stringUtils.js b/dist/utils/stringUtils.js
index a922ddf..a6df5c2 100644
--- a/dist/utils/stringUtils.js
+++ b/dist/utils/stringUtils.js
@@ -1,15 +1,13 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.removeQRCodes = exports.removeSpacesAndLinebreaks = void 0;
-const removeSpacesAndLinebreaks = (s) => {
+exports.removeSpacesAndLinebreaks = (s) => {
const regexNewlines = new RegExp(/[\r\n\v]+/g);
const regexSpaces = new RegExp(/\s+|\u200B/g);
return s.replace(regexNewlines, "").replace(regexSpaces, "");
};
-exports.removeSpacesAndLinebreaks = removeSpacesAndLinebreaks;
-const removeQRCodes = (s) => {
+exports.removeQRCodes = (s) => {
return s
.replace(/\[qrcode.png\]\s*<https:\/\/[\w./?=\-&]+>/g, "")
.replace(/<https:\/\/[\w./?=\-&]+>\s*\[qrcode.png\]/g, "");
};
-exports.removeQRCodes = removeQRCodes;
--
GitLab