Skip to content

Commit 0adabd0

Browse files
build(deps): bump node-forge from 1.3.1 to 1.3.2 (#6123)
* build(deps): bump node-forge from 1.3.1 to 1.3.2 Bumps [node-forge](https://github.com/digitalbazaar/forge) from 1.3.1 to 1.3.2. - [Changelog](https://github.com/digitalbazaar/forge/blob/main/CHANGELOG.md) - [Commits](digitalbazaar/forge@v1.3.1...v1.3.2) --- updated-dependencies: - dependency-name: node-forge dependency-version: 1.3.2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * test fix * run prettier --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Roma Sosnovsky <[email protected]>
1 parent e9baca9 commit 0adabd0

File tree

53 files changed

+287
-527
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+287
-527
lines changed

extension/js/common/api/email-provider/gmail/gmail-parser.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ export class GmailParser {
167167
// are we dealing with a PGP/MIME encrypted message?
168168
const pgpEncrypted = Boolean(
169169
parts.length === 2 &&
170-
contentType?.value.startsWith('multipart/encrypted') &&
171-
(contentType.value.includes('protocol="application/pgp-encrypted"') || parts[0].mimeType === 'application/pgp-encrypted')
170+
contentType?.value.startsWith('multipart/encrypted') &&
171+
(contentType.value.includes('protocol="application/pgp-encrypted"') || parts[0].mimeType === 'application/pgp-encrypted')
172172
);
173173
for (const [i, part] of parts.entries()) {
174174
GmailParser.findAttachments(part, internalMsgId, internalResults, {

extension/js/common/api/shared/api.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,12 @@ export class Api {
252252
}),
253253
};
254254
} else {
255-
return { response, pipe: async () => { /* no-op */ } }; // original response
255+
return {
256+
response,
257+
pipe: async () => {
258+
/* no-op */
259+
},
260+
}; // original response
256261
}
257262
};
258263

extension/js/common/core/mime.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ export class Mime {
481481
private static getNodeContentAsUtfStr(node: MimeParserNode): string {
482482
// List of charset labels that map to ISO-8859-2
483483
const iso88592Labels = ['csisolatin2', 'iso-8859-2', 'iso-ir-101', 'iso8859-2', 'iso88592', 'iso_8859-2', 'iso_8859-2:1987', 'l2', 'latin2'];
484-
484+
485485
if (node.charset && node.rawContent && iso88592Labels.includes(node.charset.toLowerCase())) {
486486
const decoder = new TextDecoder('iso-8859-2');
487487
return decoder.decode(Buf.fromRawBytesStr(node.rawContent));

extension/js/common/platform/require.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import { MimeParser } from '../core/types/emailjs.js';
2525
import * as openpgp from 'openpgp';
2626
import { Catch } from './catch.js';
2727

28-
2928
export const requireOpenpgp = () => {
3029
if (typeof window !== 'undefined' && typeof globalThis !== 'undefined' && window !== globalThis && Catch.browser().name === 'firefox') {
3130
// fix Firefox sandbox permission issues as per convo https://github.com/FlowCrypt/flowcrypt-browser/pull/5013#discussion_r1148343995

package-lock.json

Lines changed: 158 additions & 75 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"jquery": "3.7.1",
5757
"linkify-html": "4.3.2",
5858
"linkifyjs": "4.3.2",
59-
"node-forge": "1.3.1",
59+
"node-forge": "1.3.2",
6060
"postcss-html": "^1.8.0",
6161
"squire-rte": "2.4.1",
6262
"sweetalert2": "11.26.3",

test/source/mock/google/exported-messages/message-export-15f7f5e966792203.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33
"full": {
44
"id": "15f7f5e966792203",
55
"threadId": "15f7f5e966792203",
6-
"labelIds": [
7-
"IMPORTANT",
8-
"STARRED",
9-
"CATEGORY_PERSONAL",
10-
"Label_4",
11-
"INBOX"
12-
],
6+
"labelIds": ["IMPORTANT", "STARRED", "CATEGORY_PERSONAL", "Label_4", "INBOX"],
137
"snippet": "-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Standard message signed inline should easily verify This is email footer -----BEGIN PGP SIGNATURE----- Version: FlowCrypt 5.0.4 Gmail Encryption",
148
"payload": {
159
"partId": "",
@@ -68,4 +62,4 @@
6862
"historyId": "1405939",
6963
"internalDate": "1509670425000"
7064
}
71-
}
65+
}

test/source/mock/google/exported-messages/message-export-15f7f5f098d6bc36.json

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,7 @@
33
"full": {
44
"id": "15f7f5f098d6bc36",
55
"threadId": "15f7f5f098d6bc36",
6-
"labelIds": [
7-
"IMPORTANT",
8-
"STARRED",
9-
"Label_8",
10-
"Label_3",
11-
"CATEGORY_PERSONAL",
12-
"Label_12",
13-
"INBOX"
14-
],
6+
"labelIds": ["IMPORTANT", "STARRED", "Label_8", "Label_3", "CATEGORY_PERSONAL", "Label_12", "INBOX"],
157
"snippet": "-----BEGIN PGP MESSAGE----- Version: FlowCrypt 5.0.4 Gmail Encryption flowcrypt.com Comment: Seamlessly send, receive and search encrypted email wcFMA+ADv/5v4RgKAQ/",
168
"payload": {
179
"partId": "",
@@ -70,4 +62,4 @@
7062
"historyId": "1406105",
7163
"internalDate": "1509670454000"
7264
}
73-
}
65+
}

test/source/mock/google/exported-messages/message-export-15f7fcace2d72246.json

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,7 @@
33
"full": {
44
"id": "15f7fcace2d72246",
55
"threadId": "15f7fcace2d72246",
6-
"labelIds": [
7-
"Label_17",
8-
"IMPORTANT",
9-
"STARRED",
10-
"Label_3",
11-
"CATEGORY_PERSONAL",
12-
"INBOX"
13-
],
6+
"labelIds": ["Label_17", "IMPORTANT", "STARRED", "Label_3", "CATEGORY_PERSONAL", "INBOX"],
147
"snippet": "",
158
"payload": {
169
"partId": "",
@@ -121,4 +114,4 @@
121114
"historyId": "1406055",
122115
"internalDate": "1509677516000"
123116
}
124-
}
117+
}

test/source/mock/google/exported-messages/message-export-15f7fcb7fabc7511.json

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,7 @@
33
"full": {
44
"id": "15f7fcb7fabc7511",
55
"threadId": "15f7fcb7fabc7511",
6-
"labelIds": [
7-
"Label_17",
8-
"IMPORTANT",
9-
"STARRED",
10-
"Label_3",
11-
"CATEGORY_PERSONAL",
12-
"INBOX"
13-
],
6+
"labelIds": ["Label_17", "IMPORTANT", "STARRED", "Label_3", "CATEGORY_PERSONAL", "INBOX"],
147
"snippet": "-----BEGIN PGP MESSAGE----- Charset: utf-8 Version: GnuPG v2 hQIMA0taL/zmLZUBAQ//RO4wLVr52Zf0v6/fa19/noJFsFLIEqsWkX3OPOZfiRew tcI17dq5u854lbuXwSELEAUkhX0NJ2ZM+jNPRyW4dqhcuFBebBXN10/pzBaG+nKi",
158
"payload": {
169
"partId": "",
@@ -77,4 +70,4 @@
7770
"historyId": "1406044",
7871
"internalDate": "1509677562000"
7972
}
80-
}
73+
}

0 commit comments

Comments
 (0)