@pipedream/microsoft_outlook 1.7.9 → 1.8.0

package/actions/add-label-to-email/add-label-to-email.mjs

@@ -5,7 +5,7 @@ export default {
   key: "microsoft_outlook-add-label-to-email",
   name: "Add Label to Email",
   description: "Adds a label/category to an email in Microsoft Outlook. [See the documentation](https://learn.microsoft.com/en-us/graph/api/message-update)",
-  version: "0.0.14",
+  version: "0.0.16",
   annotations: {
     destructiveHint: true,
     openWorldHint: true,

package/actions/approve-workflow/approve-workflow.mjs

@@ -4,7 +4,7 @@ export default {
   key: "microsoft_outlook-approve-workflow",
   name: "Approve Workflow",
   description: "Suspend the workflow until approved by email. [See the documentation](https://pipedream.com/docs/code/nodejs/rerun#flowsuspend)",
-  version: "0.0.12",
+  version: "0.0.14",
   annotations: {
     destructiveHint: false,
     openWorldHint: true,

package/actions/create-contact/create-contact.mjs

@@ -3,7 +3,7 @@ import microsoftOutlook from "../../microsoft_outlook.app.mjs";
 export default {
   type: "action",
   key: "microsoft_outlook-create-contact",
-  version: "0.0.21",
+  version: "0.0.23",
   annotations: {
     destructiveHint: false,
     openWorldHint: true,

package/actions/create-draft-email/create-draft-email.mjs

@@ -4,7 +4,7 @@ import microsoftOutlook from "../../microsoft_outlook.app.mjs";
 export default {
   type: "action",
   key: "microsoft_outlook-create-draft-email",
-  version: "0.0.21",
+  version: "0.0.23",
   annotations: {
     destructiveHint: false,
     openWorldHint: true,

package/actions/download-attachment/download-attachment.mjs

@@ -13,7 +13,7 @@ export default {
   key: "microsoft_outlook-download-attachment",
   name: "Download Attachment",
   description: "Downloads an attachment to the /tmp directory. [See the documentation](https://learn.microsoft.com/en-us/graph/api/attachment-get?view=graph-rest-1.0&tabs=http)",
-  version: "0.0.10",
+  version: "0.0.12",
   annotations: {
     destructiveHint: false,
     openWorldHint: true,
@@ -56,14 +56,6 @@ export default {
     },
   },
   methods: {
-    getAttachmentInfo({
-      messageId, attachmentId, ...args
-    }) {
-      return this.microsoftOutlook._makeRequest({
-        path: `/me/messages/${messageId}/attachments/${attachmentId}`,
-        ...args,
-      });
-    },
     async imageToPdf(imageBuffer) {
       return new Promise((resolve, reject) => {
         const doc = new PDFDocument({
@@ -113,7 +105,6 @@ export default {
       $,
       messageId: this.messageId,
       attachmentId: this.attachmentId,
-      responseType: "arraybuffer",
     });
 
     let filename = this.filename;
@@ -122,11 +113,10 @@ export default {
       filename = `${name}.pdf`;
     }
 
-    const rawcontent = response.toString("base64");
-    let buffer = Buffer.from(rawcontent, "base64");
+    let buffer = await this.microsoftOutlook.streamToBuffer(response);
 
     if (this.convertToPdf) {
-      const { contentType: mimeType } = await this.getAttachmentInfo({
+      const { contentType: mimeType } = await this.microsoftOutlook.getAttachmentInfo({
         $,
         messageId: this.messageId,
         attachmentId: this.attachmentId,

package/actions/find-contacts/find-contacts.mjs

@@ -3,7 +3,7 @@ import microsoftOutlook from "../../microsoft_outlook.app.mjs";
 export default {
   type: "action",
   key: "microsoft_outlook-find-contacts",
-  version: "0.0.21",
+  version: "0.0.23",
   annotations: {
     destructiveHint: false,
     openWorldHint: true,

package/actions/find-email/find-email.mjs

@@ -5,7 +5,7 @@ export default {
   key: "microsoft_outlook-find-email",
   name: "Find Email",
   description: "Search for an email in Microsoft Outlook. [See the documentation](https://learn.microsoft.com/en-us/graph/api/user-list-messages)",
-  version: "0.0.15",
+  version: "0.0.17",
   annotations: {
     destructiveHint: false,
     openWorldHint: true,

package/actions/find-shared-folder-email/find-shared-folder-email.mjs

@@ -5,7 +5,7 @@ export default {
   key: "microsoft_outlook-find-shared-folder-email",
   name: "Find Shared Folder Email",
   description: "Search for an email in a shared folder in Microsoft Outlook. [See the documentation](https://learn.microsoft.com/en-us/graph/api/user-list-messages)",
-  version: "0.0.6",
+  version: "0.0.8",
   annotations: {
     destructiveHint: false,
     openWorldHint: true,

package/actions/list-contacts/list-contacts.mjs

@@ -3,7 +3,7 @@ import microsoftOutlook from "../../microsoft_outlook.app.mjs";
 export default {
   type: "action",
   key: "microsoft_outlook-list-contacts",
-  version: "0.0.21",
+  version: "0.0.23",
   annotations: {
     destructiveHint: false,
     openWorldHint: true,

package/actions/list-folders/list-folders.mjs

@@ -4,7 +4,7 @@ export default {
   key: "microsoft_outlook-list-folders",
   name: "List Folders",
   description: "Retrieves a list of all folders in Microsoft Outlook. [See the documentation](https://learn.microsoft.com/en-us/graph/api/user-list-mailfolders)",
-  version: "0.0.12",
+  version: "0.0.14",
   annotations: {
     destructiveHint: false,
     openWorldHint: true,

package/actions/list-labels/list-labels.mjs

@@ -4,7 +4,7 @@ export default {
   key: "microsoft_outlook-list-labels",
   name: "List Labels",
   description: "Get all the labels/categories that have been defined for a user. [See the documentation](https://learn.microsoft.com/en-us/graph/api/outlookuser-list-mastercategories)",
-  version: "0.0.14",
+  version: "0.0.16",
   annotations: {
     destructiveHint: false,
     openWorldHint: true,

package/actions/move-email-to-folder/move-email-to-folder.mjs

@@ -4,7 +4,7 @@ export default {
   key: "microsoft_outlook-move-email-to-folder",
   name: "Move Email to Folder",
   description: "Moves an email to the specified folder in Microsoft Outlook. [See the documentation](https://learn.microsoft.com/en-us/graph/api/message-move)",
-  version: "0.0.12",
+  version: "0.0.14",
   annotations: {
     destructiveHint: false,
     openWorldHint: true,

package/actions/remove-label-from-email/remove-label-from-email.mjs

@@ -4,7 +4,7 @@ export default {
   key: "microsoft_outlook-remove-label-from-email",
   name: "Remove Label from Email",
   description: "Removes a label/category from an email in Microsoft Outlook. [See the documentation](https://learn.microsoft.com/en-us/graph/api/message-update)",
-  version: "0.0.14",
+  version: "0.0.16",
   annotations: {
     destructiveHint: true,
     openWorldHint: true,

package/actions/reply-to-email/reply-to-email.mjs

@@ -4,7 +4,7 @@ export default {
   key: "microsoft_outlook-reply-to-email",
   name: "Reply to Email",
   description: "Reply to an email in Microsoft Outlook. [See the documentation](https://learn.microsoft.com/en-us/graph/api/message-reply)",
-  version: "0.0.11",
+  version: "0.0.13",
   annotations: {
     destructiveHint: false,
     openWorldHint: true,

package/actions/send-email/send-email.mjs

@@ -4,7 +4,7 @@ import microsoftOutlook from "../../microsoft_outlook.app.mjs";
 export default {
   type: "action",
   key: "microsoft_outlook-send-email",
-  version: "0.0.22",
+  version: "0.0.24",
   annotations: {
     destructiveHint: false,
     openWorldHint: true,

package/actions/update-contact/update-contact.mjs

@@ -3,7 +3,7 @@ import microsoftOutlook from "../../microsoft_outlook.app.mjs";
 export default {
   type: "action",
   key: "microsoft_outlook-update-contact",
-  version: "0.0.21",
+  version: "0.0.23",
   annotations: {
     destructiveHint: true,
     openWorldHint: true,

package/microsoft_outlook.app.mjs

@@ -1,6 +1,6 @@
-import {
-  axios, getFileStreamAndMetadata,
-} from "@pipedream/platform";
+import { getFileStreamAndMetadata } from "@pipedream/platform";
+import { Client } from "@microsoft/microsoft-graph-client";
+import "isomorphic-fetch";
 const DEFAULT_LIMIT = 50;
 
 export default {
@@ -266,64 +266,26 @@ export default {
     },
   },
   methods: {
-    _getUrl(path) {
-      return `https://graph.microsoft.com/v1.0${path}`;
-    },
-    _getHeaders(headers) {
-      return {
-        "Authorization": `Bearer ${this.$auth.oauth_access_token}`,
-        "accept": "application/json",
-        "Content-Type": "application/json",
-        ...headers,
-      };
-    },
-    async _makeRequest({
-      $,
-      path,
-      headers,
-      ...otherConfig
-    } = {}) {
-      const config = {
-        url: this._getUrl(path),
-        headers: this._getHeaders(headers),
-        ...otherConfig,
-      };
-      try {
-        return await axios($ ?? this, config);
-      } catch (error) {
-        if (error?.response?.status === 403) {
-          throw new Error("Insufficient permissions. Please verify that your Microsoft account has the necessary permissions to perform this operation.");
-        }
-        throw error;
-      }
-    },
-    async createHook({ ...args } = {}) {
-      const response = await this._makeRequest({
-        method: "POST",
-        path: "/subscriptions",
-        ...args,
+    client() {
+      return Client.init({
+        authProvider: (done) => {
+          done(null, this.$auth.oauth_access_token);
+        },
       });
-      return response;
+    },
+    async createHook({ data = {} } = {}) {
+      return await this.client().api("/subscriptions")
+        .post(data);
     },
     async renewHook({
-      hookId,
-      ...args
+      hookId, data = {},
     } = {}) {
-      return await this._makeRequest({
-        method: "PATCH",
-        path: `/subscriptions/${hookId}`,
-        ...args,
-      });
+      return await this.client().api(`/subscriptions/${hookId}`)
+        .patch(data);
     },
-    async deleteHook({
-      hookId,
-      ...args
-    } = {}) {
-      return await this._makeRequest({
-        method: "DELETE",
-        path: `/subscriptions/${hookId}`,
-        ...args,
-      });
+    async deleteHook({ hookId } = {}) {
+      return await this.client().api(`/subscriptions/${hookId}`)
+        .delete();
     },
     async streamToBase64(stream) {
       return new Promise((resolve, reject) => {
@@ -337,6 +299,35 @@ export default {
         stream.on("error", reject);
       });
     },
+    async streamToBuffer(stream) {
+      // Node.js Readable stream
+      if (typeof stream.on === "function") {
+        return new Promise((resolve, reject) => {
+          const chunks = [];
+          stream.on("data", (chunk) => chunks.push(chunk));
+          stream.on("end", () => resolve(Buffer.concat(chunks)));
+          stream.on("error", reject);
+        });
+      }
+
+      // Web ReadableStream (WHATWG)
+      if (typeof stream.getReader === "function") {
+        const reader = stream.getReader();
+        const chunks = [];
+
+        while (true) {
+          const {
+            done, value,
+          } = await reader.read();
+          if (done) break;
+          chunks.push(Buffer.from(value));
+        }
+
+        return Buffer.concat(chunks);
+      }
+
+      throw new Error("Unknown stream type returned by Microsoft Graph client");
+    },
     async prepareMessageBody(self) {
       const toRecipients = [];
       const ccRecipients = [];
@@ -397,159 +388,111 @@ export default {
 
       return message;
     },
-    async sendEmail({ ...args } = {}) {
-      return await this._makeRequest({
-        method: "POST",
-        path: "/me/sendMail",
-        ...args,
-      });
+    async sendEmail({ data = {} } = {}) {
+      return await this.client().api("/me/sendMail")
+        .post(data);
     },
     async replyToEmail({
-      messageId, ...args
-    }) {
-      return await this._makeRequest({
-        method: "POST",
-        path: `/me/messages/${messageId}/reply`,
-        ...args,
-      });
+      messageId, data = {},
+    } = {}) {
+      return await this.client().api(`/me/messages/${messageId}/reply`)
+        .post(data);
     },
-    async createDraft({ ...args } = {}) {
-      return await this._makeRequest({
-        method: "POST",
-        path: "/me/messages",
-        ...args,
-      });
+    async createDraft({ data = {} } = {}) {
+      return await this.client().api("/me/messages")
+        .post(data);
     },
-    async createContact({ ...args } = {}) {
-      return await this._makeRequest({
-        method: "POST",
-        path: "/me/contacts",
-        ...args,
-      });
+    async createContact({ data = {} } = {}) {
+      return await this.client().api("/me/contacts")
+        .post(data);
     },
     async listContacts({
-      filterAddress,
-      ...args
+      filterAddress, params = {},
     } = {}) {
-      args.params = {
-        ...args?.params,
-      };
       if (filterAddress) {
-        args.params["$filter"] = `emailAddresses/any(a:a/address eq '${filterAddress}')`;
+        params["$filter"] = `emailAddresses/any(a:a/address eq '${filterAddress}')`;
       }
-      return await this._makeRequest({
-        method: "GET",
-        path: "/me/contacts",
-        ...args,
-      });
+      return await this.client().api("/me/contacts")
+        .get(params);
     },
     async updateContact({
-      contactId,
-      ...args
+      contactId, data = {},
     } = {}) {
-      return await this._makeRequest({
-        method: "PATCH",
-        path: `/me/contacts/${contactId}`,
-        ...args,
-      });
+      return await this.client().api(`/me/contacts/${contactId}`)
+        .patch(data);
     },
     async getMessage({
-      messageId,
-      ...args
+      messageId, params = {},
     } = {}) {
-      return await this._makeRequest({
-        method: "GET",
-        path: `/me/messages/${messageId}`,
-        ...args,
-      });
+      return await this.client().api(`/me/messages/${messageId}`)
+        .get(params);
     },
-    async listMessages({ ...args } = {}) {
-      return await this._makeRequest({
-        method: "GET",
-        path: "/me/messages",
-        ...args,
-      });
+    async listMessages({ params = {} } = {}) {
+      return await this.client().api("/me/messages")
+        .get(params);
     },
     async listSharedFolderMessages({
-      userId, sharedFolderId, ...args
+      userId, sharedFolderId, params = {},
     } = {}) {
-      return await this._makeRequest({
-        method: "GET",
-        path: `/users/${userId}/mailFolders/${sharedFolderId}/messages`,
-        ...args,
-      });
+      return await this.client().api(`/users/${userId}/mailFolders/${sharedFolderId}/messages`)
+        .get(params);
     },
     async getContact({
-      contactId,
-      ...args
+      contactId, params = {},
     } = {}) {
-      return await this._makeRequest({
-        method: "GET",
-        path: `/me/contacts/${contactId}`,
-        ...args,
-      });
+      return await this.client().api(`/me/contacts/${contactId}`)
+        .get(params);
     },
-    listLabels(args = {}) {
-      return this._makeRequest({
-        path: "/me/outlook/masterCategories",
-        ...args,
-      });
+    async listLabels({ params = {} } = {}) {
+      return await this.client().api("/me/outlook/masterCategories")
+        .get(params);
     },
-    listFolders(args = {}) {
-      return this._makeRequest({
-        path: "/me/mailFolders",
-        ...args,
-      });
+    async listFolders({ params = {} } = {}) {
+      return await this.client().api("/me/mailFolders")
+        .get(params);
     },
-    moveMessage({
-      messageId, ...args
-    }) {
-      return this._makeRequest({
-        method: "POST",
-        path: `/me/messages/${messageId}/move`,
-        ...args,
-      });
+    async moveMessage({
+      messageId, data = {},
+    } = {}) {
+      return await this.client().api(`/me/messages/${messageId}/move`)
+        .post(data);
     },
-    updateMessage({
-      messageId, ...args
-    }) {
-      return this._makeRequest({
-        method: "PATCH",
-        path: `/me/messages/${messageId}`,
-        ...args,
-      });
+    async updateMessage({
+      messageId, data = {},
+    } = {}) {
+      return await this.client().api(`/me/messages/${messageId}`)
+        .patch(data);
     },
-    getAttachment({
-      messageId, attachmentId, ...args
-    }) {
-      return this._makeRequest({
-        path: `/me/messages/${messageId}/attachments/${attachmentId}/$value`,
-        ...args,
-      });
+    async getAttachment({
+      messageId, attachmentId, params = {},
+    } = {}) {
+      return await this.client().api(`/me/messages/${messageId}/attachments/${attachmentId}/$value`)
+        .responseType("stream")
+        .get(params);
     },
-    listAttachments({
-      messageId, ...args
-    }) {
-      return this._makeRequest({
-        path: `/me/messages/${messageId}/attachments`,
-        ...args,
-      });
+    async getAttachmentInfo({
+      messageId, attachmentId, params = {},
+    } = {}) {
+      return await this.client().api(`/me/messages/${messageId}/attachments/${attachmentId}`)
+        .get(params);
     },
-    listUsers(args = {}) {
-      return this._makeRequest({
-        path: "/users",
-        ...args,
-      });
+    async listAttachments({
+      messageId, params = {},
+    } = {}) {
+      return await this.client().api(`/me/messages/${messageId}/attachments`)
+        .get(params);
+    },
+    async listUsers({ params = {} } = {}) {
+      return await this.client().api("/users")
+        .get(params);
     },
     async listSharedFolders({
-      userId, parentFolderId, ...args
+      userId, parentFolderId, params = {},
     } = {}) {
-      const { value } = await this._makeRequest({
-        path: `/users/${userId}/mailFolders${parentFolderId
-          ? `/${parentFolderId}/childFolders`
-          : ""}`,
-        ...args,
-      });
+      const { value } = await this.client().api(`/users/${userId}/mailFolders${parentFolderId
+        ? `/${parentFolderId}/childFolders`
+        : ""}`)
+        .get(params);
 
       const foldersArray = [];
       for (const folder of value) {
@@ -557,7 +500,6 @@ export default {
         foldersArray.push(...await this.listSharedFolders({
           userId,
           parentFolderId: folder.id,
-          ...args,
         }));
       }
 
@@ -575,18 +517,19 @@ export default {
           $skip: 0,
         },
       };
-      let total, count = 0;
+      let hasMore, count = 0;
       do {
-        const { value } = await fn(args);
+        const response = await fn(args);
+        const { value } = response;
         for (const item of value) {
           yield item;
           if (max && ++count >= max) {
             return;
           }
         }
-        total = value?.length;
+        hasMore = response?.["@odata.nextLink"];
         args.params["$skip"] += limit;
-      } while (total);
+      } while (hasMore);
     },
   },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pipedream/microsoft_outlook",
-  "version": "1.7.9",
+  "version": "1.8.0",
   "description": "Pipedream Microsoft Outlook Components",
   "main": "microsoft_outlook.app.mjs",
   "keywords": [
@@ -12,6 +12,7 @@
   "homepage": "https://pipedream.com/apps/microsoft_outlook",
   "author": "Pipedream <support@pipedream.com> (https://pipedream.com/)",
   "dependencies": {
+    "@microsoft/microsoft-graph-client": "^3.0.7",
     "@pipedream/platform": "^3.1.1",
     "@sparticuz/chromium": "^143.0.4",
     "axios": "^0.30.2",

package/sources/new-attachment-received/new-attachment-received.mjs

@@ -6,7 +6,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.1.5",
+  version: "0.1.7",
   type: "source",
   dedupe: "unique",
   props: {
@@ -56,10 +56,8 @@ export default {
       const messageAttachment =  await this.microsoftOutlook.getAttachment({
         messageId: item.messageId,
         attachmentId: item.id,
-        responseType: "arraybuffer",
       });
-      const rawcontent = messageAttachment.toString("base64");
-      const buffer = Buffer.from(rawcontent, "base64");
+      const buffer = await this.microsoftOutlook.streamToBuffer(messageAttachment);
       const filepath = `${item.id}/${item.name}`;
       // Upload the attachment to the configured directory (File Stash) so it
       // can be accessed later.

package/sources/new-contact/new-contact.mjs

@@ -5,7 +5,7 @@ export default {
   key: "microsoft_outlook-new-contact",
   name: "New Contact Event (Instant)",
   description: "Emit new event when a new Contact is created",
-  version: "0.0.21",
+  version: "0.0.23",
   type: "source",
   hooks: {
     ...common.hooks,

package/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.1.7",
+  version: "0.1.9",
   type: "source",
   dedupe: "unique",
   methods: {

package/sources/new-email-in-shared-folder/new-email-in-shared-folder.mjs

@@ -7,7 +7,7 @@ export default {
   key: "microsoft_outlook-new-email-in-shared-folder",
   name: "New Email in Shared Folder Event",
   description: "Emit new event when an email is received in specified shared folders.",
-  version: "0.0.7",
+  version: "0.0.9",
   type: "source",
   dedupe: "unique",
   props: {