include attachment in new email trigger

Author: andrewjschuang

components/microsoft_outlook/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pipedream/microsoft_outlook",
-  "version": "1.5.5",
+  "version": "1.5.6",
   "description": "Pipedream Microsoft Outlook Components",
   "main": "microsoft_outlook.app.mjs",
   "keywords": [

components/microsoft_outlook/sources/common/common-new-email.mjs

@@ -54,5 +54,22 @@ export default {
       const draftsFolderId = this.db.get("draftsFolderId");
       return item.parentFolderId !== sentItemFolderId && item.parentFolderId !== draftsFolderId;
     },
+    async getMessageAttachments(message) {
+      const { value: attachments } = await this.microsoftOutlook.listAttachments({
+        messageId: message.id,
+      });
+      if (!attachments?.length) {
+        return [];
+      }
+      return attachments.map((attachment) => ({
+        ...attachment,
+        messageId: message.id,
+        messageSubject: message.subject,
+        messageSender: message.sender,
+        messageReceivedDateTime: message.receivedDateTime,
+        parentFolderId: message.parentFolderId,
+        contentBytes: undefined,
+      }));
+    },
   },
 };

components/microsoft_outlook/sources/new-attachment-received/new-attachment-received.mjs

@@ -5,7 +5,7 @@ export default {
   key: "microsoft_outlook-new-attachment-received",
   name: "New Attachment Received (Instant)",
   description: "Emit new event when a new email containing one or more attachments arrives in a specified Microsoft Outlook folder.",
-  version: "0.0.3",
+  version: "0.0.4",
   type: "source",
   dedupe: "unique",
   methods: {
@@ -36,23 +36,6 @@ export default {
       }
       return attachments;
     },
-    async getMessageAttachments(message) {
-      const { value: attachments } = await this.microsoftOutlook.listAttachments({
-        messageId: message.id,
-      });
-      if (!attachments?.length) {
-        return [];
-      }
-      return attachments.map((attachment) => ({
-        ...attachment,
-        messageId: message.id,
-        messageSubject: message.subject,
-        messageSender: message.sender,
-        messageReceivedDateTime: message.receivedDateTime,
-        parentFolderId: message.parentFolderId,
-        contentBytes: undefined,
-      }));
-    },
     emitEvent(item) {
       if (this.isRelevant(item)) {
         this.$emit(item, this.generateMeta(item));

components/microsoft_outlook/sources/new-email/new-email.mjs

@@ -7,7 +7,7 @@ export default {
   key: "microsoft_outlook-new-email",
   name: "New Email Event (Instant)",
   description: "Emit new event when an email is received in specified folders.",
-  version: "0.0.19",
+  version: "0.1.0",
   type: "source",
   dedupe: "unique",
   methods: {
@@ -66,6 +66,10 @@ export default {
               resource: folder,
               messageId: resourceId,
             });
+            if (item.hasAttachments) {
+              const attachments = await this.getMessageAttachments(item);
+              item.attachments = attachments;
+            }
             this.emitEvent(item);
           } catch {
             console.log(`Could not fetch message with ID: ${resourceId}`);