Merge remote-tracking branch 'origin/master' into issue-5905-add-secure-reply-all-to-gmail-context-menu-live-test

Author: martgil

extension/chrome/elements/compose-modules/formatters/encrypted-mail-msg-formatter.ts

@@ -181,10 +181,11 @@ export class EncryptedMsgMailFormatter extends BaseMailFormatter {
     { msgUrl, externalId }: { msgUrl: string; externalId?: string },
     signingPrv?: Key
   ) => {
-    // encoded as: PGP/MIME-like structure but with attachments as external files due to email size limit (encrypted for pubkeys only)
+    // encoded as: PGP/MIME-like structure
     const msgBody = this.richtext ? { 'text/plain': newMsg.plaintext, 'text/html': newMsg.plainhtml } : { 'text/plain': newMsg.plaintext };
+    const attachments = await this.view.attachmentsModule.attachment.collectEncryptAttachments(pubs);
     // eslint-disable-next-line @typescript-eslint/naming-convention
-    const pgpMimeNoAttachments = await Mime.encode(msgBody, { Subject: newMsg.subject }, []); // no attachments, attached to email separately
+    const pgpMimeNoAttachments = await Mime.encode(msgBody, { Subject: newMsg.subject }, attachments);
     const { data: pubEncryptedNoAttachments } = await this.encryptDataArmor(Buf.fromUtfStr(pgpMimeNoAttachments), undefined, pubs, signingPrv); // encrypted only for pubs
     const emailIntroAndLinkBody = await this.formatPwdEncryptedMsgBodyLink(msgUrl);
     return await SendableMsg.createPwdMsg(

extension/js/content_scripts/webmail/gmail/gmail-element-replacer.ts

@@ -618,8 +618,8 @@ export class GmailElementReplacer extends WebmailElementReplacer {
     return from ? Str.parseEmail(from) : undefined;
   };
 
-  private getLastMsgReplyParams = (convoRootEl: JQuery, replyOption?: ReplyOption): FactoryReplyParams => {
-    return { replyMsgId: this.determineMsgId($(convoRootEl).find(this.sel.msgInner).last()), replyOption };
+  private getLastMsgReplyParams = (convoRootEl: JQuery, replyOption?: ReplyOption, replyBoxMessageId?: string | null): FactoryReplyParams => {
+    return { replyMsgId: replyBoxMessageId ?? this.determineMsgId($(convoRootEl).find(this.sel.msgInner).last()), replyOption };
   };
 
   private getConvoRootEl = (anyInnerElement: HTMLElement) => {
@@ -645,9 +645,13 @@ export class GmailElementReplacer extends WebmailElementReplacer {
       // removing this line will cause unexpected draft creation bug reappear
       // https://github.com/FlowCrypt/flowcrypt-browser/issues/5616#issuecomment-1972897692
       this.replyOption = undefined;
+      // Try to get message id from plain reply box
+      // https://github.com/FlowCrypt/flowcrypt-browser/issues/5906
+      const replyBoxMessageId = newReplyBoxes[0].closest('.gA.gt')?.previousElementSibling?.getAttribute('data-legacy-message-id');
+
       // cache for subseqent loop runs
       const convoRootEl = this.getConvoRootEl(newReplyBoxes[0]);
-      const replyParams = this.getLastMsgReplyParams(convoRootEl);
+      const replyParams = this.getLastMsgReplyParams(convoRootEl, undefined, replyBoxMessageId);
       if (msgId) {
         replyParams.replyMsgId = msgId;
       }

package-lock.json

@@ -9,7 +9,7 @@
     "@openpgp/web-stream-tools": "^0.1.3",
     "@types/chai": "4.3.19",
     "@types/chai-as-promised": "7.1.8",
-    "@types/chrome": "0.0.299",
+    "@types/chrome": "0.0.300",
     "@types/jquery": "3.5.32",
     "@types/mailparser": "3.4.5",
     "ava": "5.3.1",
@@ -28,14 +28,14 @@
     "lint-staged": "^15.4.3",
     "mailparser": "3.7.2",
     "mkdirp": "3.0.1",
-    "openpgp": "6.0.1",
+    "openpgp": "6.1.0",
     "pdfjs-dist": "4.10.38",
     "prettier": "^3.4.1",
     "puppeteer": "24.1.1",
-    "stylelint": "16.14.0",
+    "stylelint": "16.14.1",
     "stylelint-config-standard": "37.0.0",
     "typescript": "5.7.3",
-    "typescript-eslint": "^8.21.0",
+    "typescript-eslint": "^8.22.0",
     "undici-types": "^7.3.0",
     "web-ext": "8.3.0",
     "webpack-cli": "^6.0.1"
@@ -45,7 +45,7 @@
     "@types/thunderbird-webext-browser": "^127.0.0",
     "bootstrap": "4.6.2",
     "clipboard": "2.0.11",
-    "dompurify": "3.2.3",
+    "dompurify": "3.2.4",
     "filesize": "10.1.2",
     "iso-8859-2": "1.0.0",
     "jquery": "3.7.1",

package.json

@@ -30,7 +30,7 @@ const checkForAbsenceofBase64InAttachments = async (attachments: Attachment[]) =
     if (typeof encoding !== 'string') {
       throw new HttpClientErr(`Error: Content-Transfer-Encoding isn't present in one of the attachments`);
     }
-    if (!['7bit', 'quoted-printable'].includes(encoding)) {
+    if (!['7bit', 'quoted-printable', 'base64'].includes(encoding)) {
       throw new HttpClientErr(`Error: Unexpected Content-Transfer-Encoding: ${encoding}`);
     }
   }