@pipedream/microsoft_outlook_calendar 0.6.1 → 0.7.1

package/actions/create-calendar-event/create-calendar-event.mjs

@@ -3,7 +3,7 @@ import microsoftOutlook from "../../microsoft_outlook_calendar.app.mjs";
 export default {
   type: "action",
   key: "microsoft_outlook_calendar-create-calendar-event",
-  version: "0.0.11",
+  version: "0.0.12",
   annotations: {
     destructiveHint: false,
     openWorldHint: true,

package/actions/delete-calendar-event/delete-calendar-event.mjs

@@ -3,7 +3,7 @@ import microsoftOutlook from "../../microsoft_outlook_calendar.app.mjs";
 export default {
   type: "action",
   key: "microsoft_outlook_calendar-delete-calendar-event",
-  version: "0.0.6",
+  version: "0.0.7",
   annotations: {
     destructiveHint: true,
     openWorldHint: true,

package/actions/delete-recurring-event-instance/delete-recurring-event-instance.mjs

@@ -4,7 +4,7 @@ import { ConfigurationError } from "@pipedream/platform";
 export default {
   type: "action",
   key: "microsoft_outlook_calendar-delete-recurring-event-instance",
-  version: "0.0.3",
+  version: "0.0.4",
   annotations: {
     destructiveHint: true,
     openWorldHint: true,

package/actions/get-schedule/get-schedule.mjs

@@ -8,7 +8,7 @@ export default {
   key: "microsoft_outlook_calendar-get-schedule",
   name: "Get Free/Busy Schedule",
   description: "Get the free/busy availability information for a collection of users, distributions lists, or resources (rooms or equipment) for a specified time period. [See the documentation](https://learn.microsoft.com/en-us/graph/api/calendar-getschedule)",
-  version: "0.0.8",
+  version: "0.0.9",
   annotations: {
     destructiveHint: false,
     openWorldHint: true,
@@ -48,13 +48,6 @@ export default {
     },
   },
   methods: {
-    getSchedule(opts = {}) {
-      return this.microsoftOutlook._makeRequest({
-        method: "POST",
-        path: "/me/calendar/getSchedule",
-        ...opts,
-      });
-    },
     convertWorkingHoursToItemTimezone(response) {
       const workingHours = response?.workingHours;
 
@@ -93,8 +86,8 @@ export default {
 
     const schedules = utils.parseArray(this.schedules);
 
-    const { value } = await this.getSchedule({
-      $,
+    const { value } = await this.microsoftOutlook.getSchedule({
+      timeZone: this.timeZone,
       data: {
         schedules,
         startTime: {
@@ -107,9 +100,6 @@ export default {
         },
         availabilityViewInterval: this.availabilityViewInterval,
       },
-      headers: {
-        Prefer: `outlook.timezone="${this.timeZone}"`,
-      },
     });
 
     if (value?.length > 0 && value[0].workingHours) {

package/actions/list-events/list-events.mjs

@@ -1,10 +1,11 @@
+import { ConfigurationError } from "@pipedream/platform";
 import microsoftOutlook from "../../microsoft_outlook_calendar.app.mjs";
 
 export default {
   key: "microsoft_outlook_calendar-list-events",
   name: "List Events",
   description: "Get a list of event objects in the user's mailbox. [See the documentation](https://learn.microsoft.com/en-us/graph/api/user-list-events)",
-  version: "0.0.7",
+  version: "0.0.9",
   annotations: {
     destructiveHint: false,
     openWorldHint: true,
@@ -37,25 +38,19 @@ export default {
       label: "Include Recurring",
       description: "Whether to include recurring events",
       optional: true,
-      reloadProps: true,
     },
-  },
-  additionalProps() {
-    if (!this.includeRecurring) {
-      return {};
-    }
-    return {
-      startDateTime: {
-        type: "string",
-        label: "Start Date Time",
-        description: "The start date and time of the time range, represented in ISO 8601 format. For example, `2019-11-08T19:00:00-08:00`",
-      },
-      endDateTime: {
-        type: "string",
-        label: "End Date Time",
-        description: "The end date and time of the time range, represented in ISO 8601 format. For example, `2019-11-08T20:00:00-08:00`",
-      },
-    };
+    startDateTime: {
+      type: "string",
+      label: "Start Date Time",
+      description: "If `Include Recurring` is true, this is the start date and time of the time range, represented in ISO 8601 format. For example, `2019-11-08T19:00:00-08:00`.",
+      optional: true,
+    },
+    endDateTime: {
+      type: "string",
+      label: "End Date Time",
+      description: "If `Include Recurring` is true, this is the end date and time of the time range, represented in ISO 8601 format. For example, `2019-11-08T20:00:00-08:00`.",
+      optional: true,
+    },
   },
   async run({ $ }) {
     const params = {
@@ -64,7 +59,12 @@ export default {
       "$top": this.maxResults,
     };
 
-    const { value = [] } = !this.includeRecurring
+    const { includeRecurring } = this;
+    if (includeRecurring && (!this.startDateTime || !this.endDateTime)) {
+      throw new ConfigurationError("`Start Date Time` and `End Date Time` are required when `Include Recurring` is true");
+    }
+
+    const { value = [] } = !includeRecurring
       ? await this.microsoftOutlook.listCalendarEvents({
         $,
         params,
@@ -78,7 +78,7 @@ export default {
         },
       });
 
-    const events = !this.includeRecurring
+    const events = !includeRecurring
       ? value.filter((event) => !event.recurrence)
       : value;
 

package/actions/search-contacts/search-contacts.mjs

@@ -4,7 +4,7 @@ export default {
   key: "microsoft_outlook_calendar-search-contacts",
   name: "Search Contacts",
   description: "Search for contacts by name from your saved contacts list and retrieve their email addresses. [See the documentation](https://learn.microsoft.com/en-us/graph/api/user-list-contacts)",
-  version: "0.0.2",
+  version: "0.0.3",
   type: "action",
   annotations: {
     destructiveHint: false,

package/actions/search-people/search-people.mjs

@@ -4,7 +4,7 @@ export default {
   key: "microsoft_outlook_calendar-search-people",
   name: "Search People",
   description: "Retrieve a collection of person objects ordered by their relevance to the user, based on communication and collaboration patterns and business relationships. [See the documentation](https://learn.microsoft.com/en-us/graph/api/user-list-people)",
-  version: "0.0.2",
+  version: "0.0.3",
   type: "action",
   annotations: {
     destructiveHint: false,

package/actions/update-calendar-event/update-calendar-event.mjs

@@ -3,7 +3,7 @@ import microsoftOutlook from "../../microsoft_outlook_calendar.app.mjs";
 export default {
   type: "action",
   key: "microsoft_outlook_calendar-update-calendar-event",
-  version: "0.0.6",
+  version: "0.0.7",
   annotations: {
     destructiveHint: true,
     openWorldHint: true,

package/actions/update-recurring-event-instance/update-recurring-event-instance.mjs

@@ -4,7 +4,7 @@ import { ConfigurationError } from "@pipedream/platform";
 export default {
   type: "action",
   key: "microsoft_outlook_calendar-update-recurring-event-instance",
-  version: "0.0.3",
+  version: "0.0.4",
   annotations: {
     destructiveHint: false,
     openWorldHint: true,

package/microsoft_outlook_calendar.app.mjs

@@ -1,6 +1,6 @@
-import {
-  axios, ConfigurationError,
-} from "@pipedream/platform";
+import { Client } from "@microsoft/microsoft-graph-client";
+import "isomorphic-fetch";
+import pickBy from "lodash.pickby";
 
 export default {
   type: "app",
@@ -122,139 +122,85 @@ 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
-    } = {}) {
-      try {
-        const config = {
-          url: this._getUrl(path),
-          headers: this._getHeaders(headers),
-          ...otherConfig,
-        };
-        return await axios($ ?? this, config);
-      } catch (error) {
-        throw new ConfigurationError(error.message);
-      }
-    },
-    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 this._makeRequest({
-        method: "PATCH",
-        path: `/subscriptions/${hookId}`,
-        ...args,
-      });
+      return await this.client().api(`/subscriptions/${hookId}`)
+        .patch(data);
     },
-    async deleteHook({
-      hookId,
-      ...args
-    } = {}) {
-      return this._makeRequest({
-        method: "DELETE",
-        path: `/subscriptions/${hookId}`,
-        ...args,
-      });
+    async deleteHook({ hookId } = {}) {
+      return await this.client().api(`/subscriptions/${hookId}`)
+        .delete();
     },
     async getSupportedTimeZones() {
-      return this._makeRequest({
-        method: "GET",
-        path: "/me/outlook/supportedTimeZones",
-      });
+      return await this.client().api("/me/outlook/supportedTimeZones")
+        .get();
     },
-    async createCalendarEvent(args = {}) {
-      return this._makeRequest({
-        method: "POST",
-        path: "/me/events",
-        ...args,
-      });
+    async createCalendarEvent({ data = {} } = {}) {
+      return await this.client().api("/me/events")
+        .post(data);
     },
     async updateCalendarEvent({
-      eventId, ...args
-    }) {
-      return this._makeRequest({
-        method: "PATCH",
-        path: `/me/events/${eventId}`,
-        ...args,
-      });
+      eventId, data = {},
+    } = {}) {
+      return await this.client().api(`/me/events/${eventId}`)
+        .patch(data);
     },
-    async deleteCalendarEvent({
-      eventId, ...args
-    }) {
-      return this._makeRequest({
-        method: "DELETE",
-        path: `/me/events/${eventId}`,
-        ...args,
-      });
+    async deleteCalendarEvent({ eventId } = {}) {
+      return await this.client().api(`/me/events/${eventId}`)
+        .delete();
     },
-    async listCalendarEvents(args = {}) {
-      return this._makeRequest({
-        method: "GET",
-        path: "/me/events",
-        ...args,
-      });
+    async listCalendarEvents({ params = {} } = {}) {
+      return await this.client().api("/me/events")
+        .query(pickBy(params))
+        .get();
     },
     async getCalendarEvent({
-      eventId,
-      ...args
+      eventId, params = {},
     } = {}) {
-      return this._makeRequest({
-        method: "GET",
-        path: `/me/events/${eventId}`,
-        ...args,
-      });
+      return await this.client().api(`/me/events/${eventId}`)
+        .query(pickBy(params))
+        .get();
     },
-    async listCalendarView(args = {}) {
-      return this._makeRequest({
-        method: "GET",
-        path: "/me/calendar/calendarView",
-        ...args,
-      });
+    async listCalendarView({ params = {} } = {}) {
+      return await this.client().api("/me/calendar/calendarView")
+        .query(pickBy(params))
+        .get();
     },
     async listEventInstances({
-      eventId, ...args
-    }) {
-      return this._makeRequest({
-        method: "GET",
-        path: `/me/events/${eventId}/instances`,
-        ...args,
-      });
-    },
-    async listContacts(args = {}) {
-      return this._makeRequest({
-        method: "GET",
-        path: "/me/contacts",
-        ...args,
-      });
-    },
-    async listPeople(args = {}) {
-      return this._makeRequest({
-        method: "GET",
-        path: "/me/people",
-        ...args,
-      });
+      eventId, params = {},
+    } = {}) {
+      return await this.client().api(`/me/events/${eventId}/instances`)
+        .query(pickBy(params))
+        .get();
+    },
+    async listContacts({ params = {} } = {}) {
+      return await this.client().api("/me/contacts")
+        .query(pickBy(params))
+        .get();
+    },
+    async listPeople({ params = {} } = {}) {
+      return await this.client().api("/me/people")
+        .query(pickBy(params))
+        .get();
+    },
+    async getSchedule({
+      timeZone, data = {},
+    } = {}) {
+      return await this.client().api("/me/calendar/getSchedule")
+        .header("Prefer", `outlook.timezone="${timeZone}"`)
+        .post(data);
     },
   },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pipedream/microsoft_outlook_calendar",
-  "version": "0.6.1",
+  "version": "0.7.1",
   "description": "Pipedream Microsoft Outlook Calendar Components",
   "main": "microsoft_outlook_calendar.app.mjs",
   "keywords": [
@@ -15,9 +15,12 @@
     "access": "public"
   },
   "dependencies": {
+    "@microsoft/microsoft-graph-client": "^3.0.7",
     "@pipedream/microsoft_outlook": "^1.7.3",
     "@pipedream/pipedream": "^0.4.2",
     "@pipedream/platform": "^3.1.1",
+    "isomorphic-fetch": "^3.0.0",
+    "lodash.pickby": "^4.6.0",
     "luxon": "^3.7.2",
     "windows-iana": "^5.1.0"
   }

package/sources/new-calendar-event/new-calendar-event.mjs

@@ -5,7 +5,7 @@ export default {
   key: "microsoft_outlook_calendar-new-calendar-event",
   name: "New Calendar Event (Instant)",
   description: "Emit new event when a new Calendar event is created",
-  version: "0.0.11",
+  version: "0.0.12",
   type: "source",
   hooks: {
     ...common.hooks,

package/sources/new-upcoming-event/new-upcoming-event.mjs

@@ -6,7 +6,7 @@ export default {
   key: "microsoft_outlook_calendar-new-upcoming-event",
   name: "New Upcoming Calendar Event",
   description: "Emit new event when a Calendar event is upcoming, this source is using `reminderMinutesBeforeStart` property of the event to determine the time it should emit.",
-  version: "0.0.7",
+  version: "0.0.8",
   type: "source",
   props: {
     ...common.props,

package/sources/new-upcoming-event-polling/new-upcoming-event-polling.mjs

@@ -5,7 +5,7 @@ export default {
   key: "microsoft_outlook_calendar-new-upcoming-event-polling",
   name: "New Upcoming Calendar Event (Polling)",
   description: "Emit new event based on a time interval before an upcoming calendar event. [See the documentation](https://docs.microsoft.com/en-us/graph/api/user-list-events)",
-  version: "0.0.3",
+  version: "0.0.4",
   type: "source",
   dedupe: "unique",
   props: {

package/sources/updated-calendar-event/updated-calendar-event.mjs

@@ -5,7 +5,7 @@ export default {
   key: "microsoft_outlook_calendar-updated-calendar-event",
   name: "New Calendar Event Update (Instant)",
   description: "Emit new event when a Calendar event is updated",
-  version: "0.0.11",
+  version: "0.0.12",
   type: "source",
   hooks: {
     ...common.hooks,