n8n-nodes-outlook-subscription 0.1.7 → 0.1.9

package/dist/nodes/OutlookSubscription/OutlookSubscription.node.js

@@ -21,7 +21,7 @@ class OutlookSubscription {
             credentials: [
                 {
                     name: "microsoftOutlookOAuth2Api",
-                    required: false,
+                    required: true,
                 },
             ],
             properties: [
@@ -116,6 +116,19 @@ class OutlookSubscription {
                     placeholder: "AAMkAG...=",
                     description: "The ID of the draft message",
                 },
+                {
+                    displayName: "Use Immutable ID",
+                    name: "draftUseImmutableId",
+                    type: "boolean",
+                    default: false,
+                    displayOptions: {
+                        show: {
+                            resource: ["draft"],
+                            operation: ["delete", "send", "update"],
+                        },
+                    },
+                    description: 'Whether the Draft ID input is an immutable ID. Adds the Microsoft Graph Prefer header IdType="ImmutableId".',
+                },
                 // ── Draft Create: fields ──
                 {
                     displayName: "Subject",
@@ -300,6 +313,19 @@ class OutlookSubscription {
                     placeholder: "AAMkAG...=",
                     description: "The ID of the draft to retrieve. Leave empty to list drafts.",
                 },
+                {
+                    displayName: "Use Immutable ID",
+                    name: "draftUseImmutableId",
+                    type: "boolean",
+                    default: false,
+                    displayOptions: {
+                        show: {
+                            resource: ["draft"],
+                            operation: ["get"],
+                        },
+                    },
+                    description: 'Whether the Draft ID input is an immutable ID. Adds the Microsoft Graph Prefer header IdType="ImmutableId".',
+                },
                 {
                     displayName: "Options",
                     name: "draftGetOptions",
@@ -396,21 +422,28 @@ class OutlookSubscription {
                             displayName: "Convert Body to Markdown",
                             name: "bodyToMarkdown",
                             type: "boolean",
-                            default: false,
-                            description: "Whether to convert the HTML body content to Markdown.",
+                            default: true,
+                            description: "Whether to add Markdown content while keeping the original HTML body content.",
+                        },
+                        {
+                            displayName: "Return Immutable ID",
+                            name: "returnImmutableId",
+                            type: "boolean",
+                            default: true,
+                            description: "Whether to include immutableId alongside id using the Microsoft Graph translateExchangeIds endpoint.",
                         },
                         {
                             displayName: "List Attachments",
                             name: "listAttachments",
                             type: "boolean",
-                            default: false,
+                            default: true,
                             description: "Whether to fetch attachment metadata and include it as an array on the draft object",
                         },
                         {
                             displayName: "Download Attachments",
                             name: "downloadAttachments",
                             type: "boolean",
-                            default: false,
+                            default: true,
                             description: "Whether to download file attachment content as binary data (data_0, data_1, …). Automatically includes attachment metadata.",
                         },
                     ],
@@ -724,6 +757,14 @@ class OutlookSubscription {
                     displayOptions: { show: { resource: ["attachment"] } },
                     placeholder: "AAMkAG...=",
                 },
+                {
+                    displayName: "Use Immutable ID",
+                    name: "useImmutableId",
+                    type: "boolean",
+                    default: false,
+                    displayOptions: { show: { resource: ["attachment"] } },
+                    description: 'Whether the Message ID input is an immutable ID. Adds the Microsoft Graph Prefer header IdType="ImmutableId".',
+                },
                 // For message resource: ops that require a specific message
                 {
                     displayName: "Message ID",
@@ -739,6 +780,19 @@ class OutlookSubscription {
                     },
                     placeholder: "AAMkAG...=",
                 },
+                {
+                    displayName: "Use Immutable ID",
+                    name: "useImmutableId",
+                    type: "boolean",
+                    default: false,
+                    displayOptions: {
+                        show: {
+                            resource: ["message"],
+                            operation: ["delete", "move", "reply", "replyAll", "patch"],
+                        },
+                    },
+                    description: 'Whether the Message ID input is an immutable ID. Adds the Microsoft Graph Prefer header IdType="ImmutableId".',
+                },
                 // ── Attachment ID (download) ──
                 {
                     displayName: "Attachment ID",
@@ -766,6 +820,19 @@ class OutlookSubscription {
                     placeholder: "AAMkAG...=",
                     description: "ID of the message to retrieve. Leave empty to list messages.",
                 },
+                {
+                    displayName: "Use Immutable ID",
+                    name: "useImmutableId",
+                    type: "boolean",
+                    default: false,
+                    displayOptions: {
+                        show: {
+                            resource: ["message"],
+                            operation: ["get"],
+                        },
+                    },
+                    description: 'Whether the Message ID input is an immutable ID. Adds the Microsoft Graph Prefer header IdType="ImmutableId".',
+                },
                 {
                     displayName: "Options",
                     name: "messageGetOptions",
@@ -903,21 +970,28 @@ class OutlookSubscription {
                             displayName: "Convert Body to Markdown",
                             name: "bodyToMarkdown",
                             type: "boolean",
-                            default: false,
-                            description: "Whether to convert the HTML body content to Markdown. Only applied when the body field is returned and its contentType is html.",
+                            default: true,
+                            description: "Whether to add Markdown content while keeping the original HTML body content. Only applied when the body field is returned and its contentType is html.",
+                        },
+                        {
+                            displayName: "Return Immutable ID",
+                            name: "returnImmutableId",
+                            type: "boolean",
+                            default: true,
+                            description: "Whether to include immutableId alongside id using the Microsoft Graph translateExchangeIds endpoint.",
                         },
                         {
                             displayName: "List Attachments",
                             name: "listAttachments",
                             type: "boolean",
-                            default: false,
+                            default: true,
                             description: "Whether to fetch attachment metadata and include it as an array on the message object",
                         },
                         {
                             displayName: "Download Attachments",
                             name: "downloadAttachments",
                             type: "boolean",
-                            default: false,
+                            default: true,
                             description: "Whether to download file attachment content as binary data (data_0, data_1, …). Automatically includes attachment metadata.",
                         },
                     ],
@@ -944,6 +1018,16 @@ class OutlookSubscription {
                     placeholder: "AAMkAG...=",
                     description: "ID of the sent message to retrieve. Leave empty to list sent items.",
                 },
+                {
+                    displayName: "Use Immutable ID",
+                    name: "sentItemUseImmutableId",
+                    type: "boolean",
+                    default: false,
+                    displayOptions: {
+                        show: { resource: ["sentItem"], operation: ["get"] },
+                    },
+                    description: 'Whether the Message ID input is an immutable ID. Adds the Microsoft Graph Prefer header IdType="ImmutableId".',
+                },
                 // ── Sent Item: Query Options ──
                 {
                     displayName: "Options",
@@ -1058,21 +1142,28 @@ class OutlookSubscription {
                             displayName: "Convert Body to Markdown",
                             name: "bodyToMarkdown",
                             type: "boolean",
-                            default: false,
-                            description: "Whether to convert the HTML body content to Markdown.",
+                            default: true,
+                            description: "Whether to add Markdown content while keeping the original HTML body content.",
+                        },
+                        {
+                            displayName: "Return Immutable ID",
+                            name: "returnImmutableId",
+                            type: "boolean",
+                            default: true,
+                            description: "Whether to include immutableId alongside id using the Microsoft Graph translateExchangeIds endpoint.",
                         },
                         {
                             displayName: "List Attachments",
                             name: "listAttachments",
                             type: "boolean",
-                            default: false,
+                            default: true,
                             description: "Whether to fetch attachment metadata and include it as an array on the sent item object",
                         },
                         {
                             displayName: "Download Attachments",
                             name: "downloadAttachments",
                             type: "boolean",
-                            default: false,
+                            default: true,
                             description: "Whether to download file attachment content as binary data (data_0, data_1, …). Automatically includes attachment metadata.",
                         },
                     ],
@@ -1702,7 +1793,7 @@ class OutlookSubscription {
         };
     }
     async execute() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         const items = this.getInputData();
         const returnData = [];
         const EXTENDED_PROP_PREFIX = "String {00020329-0000-0000-C000-000000000046} Name ";
@@ -1744,6 +1835,60 @@ class OutlookSubscription {
             }
             return out;
         };
+        const addImmutableIds = async (messages, config, idsAlreadyImmutable = false) => {
+            const ids = messages
+                .map((message) => String(message.id || "").trim())
+                .filter(Boolean);
+            if (ids.length === 0) {
+                return messages;
+            }
+            if (idsAlreadyImmutable) {
+                return messages.map((message) => {
+                    const id = String(message.id || "").trim();
+                    if (!id) {
+                        return message;
+                    }
+                    const { id: originalId, ...rest } = message;
+                    return originalId !== undefined && originalId !== null
+                        ? {
+                            id: originalId,
+                            immutableId: id,
+                            ...rest,
+                        }
+                        : {
+                            ...message,
+                            immutableId: id,
+                        };
+                });
+            }
+            let immutableIdMap = {};
+            try {
+                immutableIdMap = await graph_1.getImmutableIdMap.call(this, config, ids);
+            }
+            catch {
+                // Best-effort enrichment: if translation fails, keep base payload.
+                return messages;
+            }
+            return messages.map((message) => {
+                const id = String(message.id || "").trim();
+                const immutableId = immutableIdMap[id];
+                if (!immutableId) {
+                    return message;
+                }
+                const { id: originalId, ...rest } = message;
+                if (originalId !== undefined && originalId !== null) {
+                    return {
+                        id: originalId,
+                        immutableId,
+                        ...rest,
+                    };
+                }
+                return {
+                    ...message,
+                    immutableId,
+                };
+            });
+        };
         for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
             try {
                 const resource = this.getNodeParameter("resource", itemIndex);
@@ -1948,21 +2093,28 @@ class OutlookSubscription {
                                     .join(",")
                                 : "";
                         const bodyToMarkdown = (_c = opts.bodyToMarkdown) !== null && _c !== void 0 ? _c : false;
+                        const returnImmutableId = (_d = opts.returnImmutableId) !== null && _d !== void 0 ? _d : false;
                         const listAttachments = Boolean(opts.listAttachments);
                         const downloadAttachments = Boolean(opts.downloadAttachments);
                         const msgId = this.getNodeParameter("messageId", itemIndex, "").trim();
+                        const useImmutableId = this.getNodeParameter("useImmutableId", itemIndex, false);
                         if (msgId) {
                             const qs = {};
                             if (expand)
                                 qs.$expand = expand;
                             if (selectFields)
                                 qs.$select = selectFields;
-                            const message = await graph_1.getMessage.call(this, config, msgId, Object.keys(qs).length > 0 ? qs : undefined);
-                            const resolved = dedupeExtendedProperties(bodyToMarkdown ? (0, graph_1.convertBodyToMarkdown)(message) : message);
+                            const message = await graph_1.getMessage.call(this, config, msgId, Object.keys(qs).length > 0 ? qs : undefined, useImmutableId);
+                            const [messageWithImmutableId] = returnImmutableId
+                                ? await addImmutableIds([message], config, useImmutableId)
+                                : [message];
+                            const resolved = dedupeExtendedProperties(bodyToMarkdown
+                                ? (0, graph_1.convertBodyToMarkdown)(messageWithImmutableId)
+                                : messageWithImmutableId);
                             if (!(0, graph_1.evaluateMessageFilter)(messageFilter, resolved))
                                 continue;
                             if (listAttachments || downloadAttachments) {
-                                const rawAttachments = await graph_1.listMessageAttachments.call(this, config, msgId);
+                                const rawAttachments = await graph_1.listMessageAttachments.call(this, config, msgId, useImmutableId);
                                 const binaryData = {};
                                 const attachmentsMeta = [];
                                 let binaryIndex = 0;
@@ -2004,9 +2156,12 @@ class OutlookSubscription {
                             if (selectFields)
                                 qs.$select = selectFields;
                             const messages = await graph_1.listMessages.call(this, config, folderIdOpt || undefined, qs, false);
-                            const mapped = bodyToMarkdown
-                                ? messages.map(graph_1.convertBodyToMarkdown)
+                            const withImmutableIds = returnImmutableId
+                                ? await addImmutableIds(messages, config)
                                 : messages;
+                            const mapped = bodyToMarkdown
+                                ? withImmutableIds.map(graph_1.convertBodyToMarkdown)
+                                : withImmutableIds;
                             const filtered = mapped.filter((m) => (0, graph_1.evaluateMessageFilter)(messageFilter, m));
                             returnData.push(...this.helpers.returnJsonArray(filtered.map(dedupeExtendedProperties)));
                         }
@@ -2014,9 +2169,10 @@ class OutlookSubscription {
                     }
                     // All remaining message operations require a messageId
                     const messageId = this.getNodeParameter("messageId", itemIndex);
+                    const useImmutableId = this.getNodeParameter("useImmutableId", itemIndex, false);
                     // ── delete ──
                     if (operation === "delete") {
-                        await graph_1.deleteMessage.call(this, config, messageId);
+                        await graph_1.deleteMessage.call(this, config, messageId, useImmutableId);
                         returnData.push({
                             json: { success: true, operation: "delete", messageId },
                         });
@@ -2037,7 +2193,7 @@ class OutlookSubscription {
                         else {
                             destinationId = this.getNodeParameter("destinationFolderId", itemIndex, "");
                         }
-                        const moved = await graph_1.moveMessage.call(this, config, messageId, destinationId);
+                        const moved = await graph_1.moveMessage.call(this, config, messageId, destinationId, useImmutableId);
                         returnData.push({ json: moved });
                         continue;
                     }
@@ -2058,7 +2214,7 @@ class OutlookSubscription {
                             });
                         }
                         const replyInlineImagesCollection = this.getNodeParameter("replyInlineImages", itemIndex, {});
-                        const replyInlineImageEntries = (_d = replyInlineImagesCollection.image) !== null && _d !== void 0 ? _d : [];
+                        const replyInlineImageEntries = (_e = replyInlineImagesCollection.image) !== null && _e !== void 0 ? _e : [];
                         const replyInlineImages = [];
                         for (const entry of replyInlineImageEntries) {
                             const imgField = entry.binaryFieldName.trim() || "data";
@@ -2071,7 +2227,7 @@ class OutlookSubscription {
                                 contentId: entry.contentId.trim() || imgField,
                             });
                         }
-                        await graph_1.replyToMessage.call(this, config, messageId, replyComment, replyBodyType, operation === "replyAll", replyAttachments.length > 0 ? replyAttachments : undefined, replyInlineImages.length > 0 ? replyInlineImages : undefined);
+                        await graph_1.replyToMessage.call(this, config, messageId, replyComment, replyBodyType, operation === "replyAll", replyAttachments.length > 0 ? replyAttachments : undefined, replyInlineImages.length > 0 ? replyInlineImages : undefined, useImmutableId);
                         returnData.push({
                             json: { success: true, operation, messageId },
                         });
@@ -2129,7 +2285,7 @@ class OutlookSubscription {
                                 extendedPropertyIds.push(fullId);
                                 if (p.type === "multi") {
                                     // Parse comma-separated quoted strings: "a","b","c"
-                                    const raw = (_e = p.value) !== null && _e !== void 0 ? _e : "";
+                                    const raw = (_f = p.value) !== null && _f !== void 0 ? _f : "";
                                     const values = Array.from(raw.matchAll(/"((?:[^"\\]|\\.)*)"/g), (m) => m[1]);
                                     multiProps.push({ id: fullId, value: values });
                                 }
@@ -2158,7 +2314,7 @@ class OutlookSubscription {
                             Object.assign(body, additionalBody);
                         }
                         const etag = this.getNodeParameter("ifMatchETag", itemIndex, "");
-                        const updated = await graph_1.updateMessage.call(this, config, messageId, body, etag || undefined);
+                        const updated = await graph_1.updateMessage.call(this, config, messageId, body, etag || undefined, useImmutableId);
                         if (extendedPropertyIds.length > 0) {
                             const quotedIds = extendedPropertyIds
                                 .map((id) => id.replace(/'/g, "''"))
@@ -2168,7 +2324,7 @@ class OutlookSubscription {
                                 $expand: `singleValueExtendedProperties($filter=${quotedIds}),` +
                                     `multiValueExtendedProperties($filter=${quotedIds})`,
                             };
-                            const updatedWithExtended = await graph_1.getMessage.call(this, config, messageId, qs);
+                            const updatedWithExtended = await graph_1.getMessage.call(this, config, messageId, qs, useImmutableId);
                             returnData.push({
                                 json: dedupeExtendedProperties(updatedWithExtended),
                             });
@@ -2203,7 +2359,7 @@ class OutlookSubscription {
                             });
                         }
                         const draftInlineImagesCollection = this.getNodeParameter("draftInlineImages", itemIndex, {});
-                        const draftInlineImageEntries = (_f = draftInlineImagesCollection.image) !== null && _f !== void 0 ? _f : [];
+                        const draftInlineImageEntries = (_g = draftInlineImagesCollection.image) !== null && _g !== void 0 ? _g : [];
                         const inlineImages = [];
                         for (const entry of draftInlineImageEntries) {
                             const imgField = entry.binaryFieldName.trim() || "data";
@@ -2252,22 +2408,29 @@ class OutlookSubscription {
                                     .filter(Boolean)
                                     .join(",")
                                 : "";
-                        const bodyToMarkdown = (_g = opts.bodyToMarkdown) !== null && _g !== void 0 ? _g : false;
+                        const bodyToMarkdown = (_h = opts.bodyToMarkdown) !== null && _h !== void 0 ? _h : false;
+                        const returnImmutableId = (_j = opts.returnImmutableId) !== null && _j !== void 0 ? _j : false;
                         const listAttachments = Boolean(opts.listAttachments);
                         const downloadAttachments = Boolean(opts.downloadAttachments);
                         const draftGetId = this.getNodeParameter("draftId", itemIndex, "").trim();
+                        const draftUseImmutableId = this.getNodeParameter("draftUseImmutableId", itemIndex, false);
                         if (draftGetId) {
                             const qs = {};
                             if (expand)
                                 qs.$expand = expand;
                             if (selectFields)
                                 qs.$select = selectFields;
-                            const message = await graph_1.getMessage.call(this, config, draftGetId, Object.keys(qs).length > 0 ? qs : undefined);
-                            const resolved = dedupeExtendedProperties(bodyToMarkdown ? (0, graph_1.convertBodyToMarkdown)(message) : message);
+                            const message = await graph_1.getMessage.call(this, config, draftGetId, Object.keys(qs).length > 0 ? qs : undefined, draftUseImmutableId);
+                            const [messageWithImmutableId] = returnImmutableId
+                                ? await addImmutableIds([message], config, draftUseImmutableId)
+                                : [message];
+                            const resolved = dedupeExtendedProperties(bodyToMarkdown
+                                ? (0, graph_1.convertBodyToMarkdown)(messageWithImmutableId)
+                                : messageWithImmutableId);
                             if (!(0, graph_1.evaluateMessageFilter)(messageFilter, resolved))
                                 continue;
                             if (listAttachments || downloadAttachments) {
-                                const rawAttachments = await graph_1.listMessageAttachments.call(this, config, draftGetId);
+                                const rawAttachments = await graph_1.listMessageAttachments.call(this, config, draftGetId, draftUseImmutableId);
                                 const binaryData = {};
                                 const attachmentsMeta = [];
                                 let binaryIndex = 0;
@@ -2307,24 +2470,28 @@ class OutlookSubscription {
                             if (selectFields)
                                 qs.$select = selectFields;
                             const messages = await graph_1.listMessages.call(this, config, "Drafts", qs, false);
-                            const mapped = bodyToMarkdown
-                                ? messages.map(graph_1.convertBodyToMarkdown)
+                            const withImmutableIds = returnImmutableId
+                                ? await addImmutableIds(messages, config)
                                 : messages;
+                            const mapped = bodyToMarkdown
+                                ? withImmutableIds.map(graph_1.convertBodyToMarkdown)
+                                : withImmutableIds;
                             const filtered = mapped.filter((m) => (0, graph_1.evaluateMessageFilter)(messageFilter, m));
                             returnData.push(...this.helpers.returnJsonArray(filtered.map(dedupeExtendedProperties)));
                         }
                         continue;
                     }
                     const draftId = this.getNodeParameter("draftId", itemIndex);
+                    const draftUseImmutableId = this.getNodeParameter("draftUseImmutableId", itemIndex, false);
                     if (operation === "delete") {
-                        await graph_1.deleteMessage.call(this, config, draftId);
+                        await graph_1.deleteMessage.call(this, config, draftId, draftUseImmutableId);
                         returnData.push({
                             json: { success: true, operation: "delete", draftId },
                         });
                         continue;
                     }
                     if (operation === "send") {
-                        await graph_1.sendDraft.call(this, config, draftId);
+                        await graph_1.sendDraft.call(this, config, draftId, draftUseImmutableId);
                         returnData.push({
                             json: { success: true, operation: "send", draftId },
                         });
@@ -2364,7 +2531,7 @@ class OutlookSubscription {
                         }
                         if (f.importance)
                             body.importance = f.importance;
-                        let additionalBody = (_h = f.additionalBody) !== null && _h !== void 0 ? _h : "{}";
+                        let additionalBody = (_k = f.additionalBody) !== null && _k !== void 0 ? _k : "{}";
                         if (typeof additionalBody === "string") {
                             try {
                                 additionalBody = JSON.parse(additionalBody);
@@ -2379,7 +2546,7 @@ class OutlookSubscription {
                             Object.assign(body, additionalBody);
                         }
                         const draftEtag = this.getNodeParameter("draftIfMatchETag", itemIndex, "").trim();
-                        const updated = await graph_1.updateMessage.call(this, config, draftId, body, draftEtag || undefined);
+                        const updated = await graph_1.updateMessage.call(this, config, draftId, body, draftEtag || undefined, draftUseImmutableId);
                         returnData.push({ json: updated });
                         continue;
                     }
@@ -2403,25 +2570,32 @@ class OutlookSubscription {
                                     .filter(Boolean)
                                     .join(",")
                                 : "";
-                        const bodyToMarkdown = (_j = opts.bodyToMarkdown) !== null && _j !== void 0 ? _j : false;
+                        const bodyToMarkdown = (_l = opts.bodyToMarkdown) !== null && _l !== void 0 ? _l : false;
+                        const returnImmutableId = (_m = opts.returnImmutableId) !== null && _m !== void 0 ? _m : false;
                         const listAttachments = Boolean(opts.listAttachments);
                         const downloadAttachments = Boolean(opts.downloadAttachments);
                         // Resolve the OData $filter to use: raw string wins, otherwise
                         // translate the visual filter to OData for server-side filtering.
                         const resolvedOdataFilter = rawOdataFilter || (0, graph_1.filterToOData)(messageFilter) || "";
                         const sentItemMessageId = this.getNodeParameter("sentItemMessageId", itemIndex, "").trim();
+                        const sentItemUseImmutableId = this.getNodeParameter("sentItemUseImmutableId", itemIndex, false);
                         if (sentItemMessageId) {
                             const qs = {};
                             if (expand)
                                 qs.$expand = expand;
                             if (selectFields)
                                 qs.$select = selectFields;
-                            const msg = await graph_1.getSentMessage.call(this, config, sentItemMessageId, Object.keys(qs).length > 0 ? qs : undefined);
-                            const resolved = dedupeExtendedProperties(bodyToMarkdown ? (0, graph_1.convertBodyToMarkdown)(msg) : msg);
+                            const msg = await graph_1.getSentMessage.call(this, config, sentItemMessageId, Object.keys(qs).length > 0 ? qs : undefined, sentItemUseImmutableId);
+                            const [messageWithImmutableId] = returnImmutableId
+                                ? await addImmutableIds([msg], config, sentItemUseImmutableId)
+                                : [msg];
+                            const resolved = dedupeExtendedProperties(bodyToMarkdown
+                                ? (0, graph_1.convertBodyToMarkdown)(messageWithImmutableId)
+                                : messageWithImmutableId);
                             if (!(0, graph_1.evaluateMessageFilter)(messageFilter, resolved))
                                 continue;
                             if (listAttachments || downloadAttachments) {
-                                const rawAttachments = await graph_1.listMessageAttachments.call(this, config, sentItemMessageId);
+                                const rawAttachments = await graph_1.listMessageAttachments.call(this, config, sentItemMessageId, sentItemUseImmutableId);
                                 const binaryData = {};
                                 const attachmentsMeta = [];
                                 let binaryIndex = 0;
@@ -2463,9 +2637,12 @@ class OutlookSubscription {
                             if (resolvedOdataFilter)
                                 qs.$filter = resolvedOdataFilter;
                             const messages = await graph_1.listSentMessages.call(this, config, qs, false);
-                            const mapped = bodyToMarkdown
-                                ? messages.map(graph_1.convertBodyToMarkdown)
+                            const withImmutableIds = returnImmutableId
+                                ? await addImmutableIds(messages, config)
                                 : messages;
+                            const mapped = bodyToMarkdown
+                                ? withImmutableIds.map(graph_1.convertBodyToMarkdown)
+                                : withImmutableIds;
                             returnData.push(...this.helpers.returnJsonArray(mapped.map(dedupeExtendedProperties)));
                         }
                         continue;
@@ -2474,15 +2651,16 @@ class OutlookSubscription {
                 // ── ATTACHMENT ──
                 if (resource === "attachment") {
                     const messageId = this.getNodeParameter("messageId", itemIndex);
+                    const useImmutableId = this.getNodeParameter("useImmutableId", itemIndex, false);
                     const config = { mailboxMode: "current" };
                     if (operation === "list") {
-                        const attachments = await graph_1.listMessageAttachments.call(this, config, messageId);
+                        const attachments = await graph_1.listMessageAttachments.call(this, config, messageId, useImmutableId);
                         returnData.push(...this.helpers.returnJsonArray(attachments));
                         continue;
                     }
                     if (operation === "download") {
                         const attachmentId = this.getNodeParameter("attachmentId", itemIndex);
-                        const attachment = await graph_1.getAttachment.call(this, config, messageId, attachmentId);
+                        const attachment = await graph_1.getAttachment.call(this, config, messageId, attachmentId, useImmutableId);
                         const binaryPropertyName = "data";
                         const fileName = String(attachment.name || `attachment_${attachmentId}`);
                         const contentType = String(attachment.contentType || "application/octet-stream");