Skip to content

feat(providers): improve microsoft provider #444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JeanMeijer wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat(providers): improve microsoft provider #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92883cb
wip
JeanMeijer Dec 28, 2025
fa60b9e
wip
JeanMeijer Dec 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
206 changes: 152 additions & 54 deletions packages/providers/src/calendars/microsoft-calendar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,15 @@ import type {
ResponseToEventInput,
} from "../interfaces/providers";
import { ProviderError } from "../lib/provider-error";
import { parseCalendar } from "./microsoft-calendar/calendars";
import { formatDate, formatEvent } from "./microsoft-calendar/events/format";
import { parseEvent } from "./microsoft-calendar/events/parse";
import { parseScheduleItem } from "./microsoft-calendar/freebusy";
import type { MicrosoftEvent } from "./microsoft-calendar/interfaces";
import {
calendarPath,
parseMicrosoftCalendar,
} from "./microsoft-calendar/calendars";
import {
eventResponseStatusPath,
parseMicrosoftEvent,
toMicrosoftDate,
toMicrosoftEvent,
} from "./microsoft-calendar/events";
import { parseScheduleItem } from "./microsoft-calendar/freebusy";
import type { MicrosoftEvent } from "./microsoft-calendar/interfaces";
} from "./microsoft-calendar/utils";

const MAX_EVENTS_PER_CALENDAR = 250;

Expand Down Expand Up @@ -73,7 +70,7 @@ export class MicrosoftCalendarProvider implements CalendarProvider {
.get();

return (response.value as MicrosoftCalendar[]).map((calendar) => ({
...parseMicrosoftCalendar({
...parseCalendar({
calendar,
providerAccountId: this.providerAccountId,
}),
Expand All @@ -90,7 +87,7 @@ export class MicrosoftCalendarProvider implements CalendarProvider {
)
.get()) as MicrosoftCalendar;

return parseMicrosoftCalendar({
return parseCalendar({
calendar,
providerAccountId: this.providerAccountId,
});
Expand All @@ -105,7 +102,7 @@ export class MicrosoftCalendarProvider implements CalendarProvider {
name: calendar.name,
});

return parseMicrosoftCalendar({
return parseCalendar({
calendar: createdCalendar,
providerAccountId: this.providerAccountId,
});
Expand All @@ -121,7 +118,7 @@ export class MicrosoftCalendarProvider implements CalendarProvider {
.api(calendarPath(calendarId))
.patch(calendar);

return parseMicrosoftCalendar({
return parseCalendar({
calendar: updatedCalendar,
providerAccountId: this.providerAccountId,
});
Expand Down Expand Up @@ -158,10 +155,45 @@ export class MicrosoftCalendarProvider implements CalendarProvider {
.get();

const events = (response.value as MicrosoftEvent[]).map(
(event: MicrosoftEvent) => parseMicrosoftEvent({ event, calendar }),
(event: MicrosoftEvent) => parseEvent({ event, calendar }),
);

return { events, recurringMasterEvents: [] };
const instances = events.filter((e) => e.recurringEventId);
const masters = new Set<string>([]);

for (const instance of instances) {
masters.add(instance.recurringEventId!);
}

if (masters.size === 0) {
return { events, recurringMasterEvents: [] };
}

const recurringMasterEvents = await this.recurringEvents(
calendar,
Array.from(masters),
timeZone,
);

return { events, recurringMasterEvents };
});
}

async recurringEvents(
calendar: Calendar,
recurringEventIds: string[],
timeZone: string,
): Promise<CalendarEvent[]> {
return this.withErrorHandler("recurringEvents", async () => {
const uniqueIds = new Set<string>(recurringEventIds);

if (uniqueIds.size === 0) {
return [];
}

return Promise.all(
Array.from(uniqueIds).map((id) => this.event(calendar, id, timeZone)),
);
});
}

Expand All @@ -176,7 +208,7 @@ export class MicrosoftCalendarProvider implements CalendarProvider {
syncToken: string | undefined;
status: "incremental" | "full";
}> {
return this.withErrorHandler("sync", async () => {
const runSync = async (token: string | undefined) => {
const startTime = timeMin?.withTimeZone("UTC").toInstant().toString();
const endTime = timeMax?.withTimeZone("UTC").toInstant().toString();

Expand All @@ -198,7 +230,7 @@ export class MicrosoftCalendarProvider implements CalendarProvider {
const changes: CalendarEventSyncItem[] = [];

do {
const url: string = pageToken ?? initialSyncToken ?? baseUrl.toString();
const url: string = pageToken ?? token ?? baseUrl.toString();

const response = await this.graphClient
.api(url)
Expand All @@ -207,12 +239,6 @@ export class MicrosoftCalendarProvider implements CalendarProvider {
.top(MAX_EVENTS_PER_CALENDAR)
.get();

// if (!initialSyncToken && !pageToken && startTime && endTime) {
// request.filter(
// `start/dateTime ge '${startTime}' and end/dateTime le '${endTime}'`,
// );
// }

for (const item of response.value as MicrosoftEvent[]) {
if (!item?.id) {
continue;
Expand All @@ -235,7 +261,7 @@ export class MicrosoftCalendarProvider implements CalendarProvider {

changes.push({
status: "updated",
event: parseMicrosoftEvent({
event: parseEvent({
event: item,
calendar,
}),
Expand All @@ -246,14 +272,72 @@ export class MicrosoftCalendarProvider implements CalendarProvider {
syncToken = response["@odata.deltaLink"];
} while (pageToken);

const instances = changes
.filter((e) => e.status !== "deleted" && e.event.recurringEventId)
.map(({ event }) => (event as CalendarEvent).recurringEventId!);

const recurringEvents = await this.recurringEvents(
calendar,
instances,
timeZone,
);

changes.push(
...recurringEvents.map((event) => ({
status: "updated" as const,
event,
})),
);

return {
changes,
syncToken,
status: "incremental",
};
};

return this.withErrorHandler("sync", async () => {
try {
const result = await runSync(initialSyncToken);

return { ...result, status: "incremental" };
} catch (error) {
if (!this.isFullSyncRequiredError(error)) {
throw error;
}

const result = await runSync(undefined);

if (initialSyncToken === result.syncToken) {
return {
changes: [],
syncToken: initialSyncToken,
status: "incremental",
};
}

return { ...result, status: "full" };
}
});
}

private isFullSyncRequiredError(error: unknown): boolean {
if (typeof error !== "object" || error === null) {
return false;
}

const err = error as { statusCode?: number; code?: string };

if (err.statusCode === 410) {
return true;
}

if (err.code === "syncStateNotFound" || err.code === "resyncRequired") {
return true;
}

return false;
}

async event(
calendar: Calendar,
eventId: string,
Expand All @@ -265,7 +349,7 @@ export class MicrosoftCalendarProvider implements CalendarProvider {
.header("Prefer", `outlook.timezone="${timeZone}"`)
.get();

return parseMicrosoftEvent({
return parseEvent({
event,
calendar,
});
Expand All @@ -279,9 +363,9 @@ export class MicrosoftCalendarProvider implements CalendarProvider {
return this.withErrorHandler("createEvent", async () => {
const createdEvent: MicrosoftEvent = await this.graphClient
.api(`${calendarPath(calendar.id)}/events`)
.post(toMicrosoftEvent(event));
.post(formatEvent(event));

return parseMicrosoftEvent({
return parseEvent({
event: createdEvent,
calendar,
});
Expand All @@ -301,7 +385,7 @@ export class MicrosoftCalendarProvider implements CalendarProvider {
// .headers({
// ...(event.etag ? { "If-Match": event.etag } : {}),
// })
.patch(toMicrosoftEvent(event));
.patch(formatEvent(event));

// Then, handle response status update if present (Microsoft-specific approach)
if (event.response && event.response.status !== "unknown") {
Expand All @@ -315,7 +399,7 @@ export class MicrosoftCalendarProvider implements CalendarProvider {
});
}

return parseMicrosoftEvent({
return parseEvent({
event: updatedEvent,
calendar,
});
Expand All @@ -327,41 +411,57 @@ export class MicrosoftCalendarProvider implements CalendarProvider {
*
* @param calendarId - The calendar identifier
* @param eventId - The event identifier
* @param sendUpdate - Whether to notify attendees (cancels the event if true)
*/
async deleteEvent(
calendarId: string,
eventId: string,
// eslint-disable-next-line @typescript-eslint/no-unused-vars
sendUpdate: boolean = true,
): Promise<void> {
await this.withErrorHandler("deleteEvent", async () => {
await this.graphClient
.api(`${calendarPath(calendarId)}/events/${eventId}`)
.delete();
if (sendUpdate) {
try {
await this.graphClient
.api(`${calendarPath(calendarId)}/events/${eventId}/cancel`)
.post({});
} catch {
Copy link
Copy Markdown
Contributor

@cubic-dev-ai cubic-dev-ai bot Dec 28, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2: Empty catch block swallows all errors from cancel API. If cancel fails for unexpected reasons (network error, auth issue, rate limit), the code silently falls back to delete without notifications. Consider catching only expected errors (e.g., 'cancel endpoint not available for this event type') and re-throwing unexpected errors.

Prompt for AI agents 
Check if this issue is valid — if so, understand the root cause and fix it. At packages/providers/src/calendars/microsoft-calendar.ts, line 427:

<comment>Empty catch block swallows all errors from cancel API. If cancel fails for unexpected reasons (network error, auth issue, rate limit), the code silently falls back to delete without notifications. Consider catching only expected errors (e.g., &#39;cancel endpoint not available for this event type&#39;) and re-throwing unexpected errors.</comment>

<file context>
@@ -327,41 +411,57 @@ export class MicrosoftCalendarProvider implements CalendarProvider {
+          await this.graphClient
+            .api(`${calendarPath(calendarId)}/events/${eventId}/cancel`)
+            .post({});
+        } catch {
+          await this.graphClient
+            .api(`${calendarPath(calendarId)}/events/${eventId}`)
</file context>
Suggested change
} catch {
} catch (error) {
// Only fallback to delete if cancel endpoint is not available for this event
const err = error as { statusCode?: number; code?: string };
if (err.statusCode !== 400 && err.code !== 'ErrorInvalidRequest') {
throw error;
}
Fix with Cubic

await this.graphClient
.api(`${calendarPath(calendarId)}/events/${eventId}`)
.delete();
}
} else {
await this.graphClient
.api(`${calendarPath(calendarId)}/events/${eventId}`)
.delete();
}
});
}

async moveEvent(
sourceCalendar: Calendar,
destinationCalendar: Calendar,
eventId: string,
// eslint-disable-next-line @typescript-eslint/no-unused-vars
sendUpdate: boolean = true,
): Promise<CalendarEvent> {
return this.withErrorHandler("moveEvent", async () => {
// Placeholder: Microsoft Graph does not have a direct move endpoint.
// This could be implemented by creating a new event in destination and deleting the original,
// preserving fields as needed.
const event = await this.event(sourceCalendar, eventId, "UTC");
const sourceEvent: MicrosoftEvent = await this.graphClient
.api(`${calendarPath(sourceCalendar.id)}/events/${eventId}`)
.header("Prefer", `outlook.timezone="UTC"`)
.get();

return {
...event,
calendar: {
id: destinationCalendar.id,
provider: destinationCalendar.provider,
},
readOnly: event.readOnly,
};
const createdEvent: MicrosoftEvent = await this.graphClient
.api(`${calendarPath(destinationCalendar.id)}/events`)
.post(sourceEvent);

await this.graphClient
.api(`${calendarPath(sourceCalendar.id)}/events/${eventId}`)
.header("Prefer", sendUpdate ? "" : "return=minimal")
Copy link
Copy Markdown
Contributor

@cubic-dev-ai cubic-dev-ai bot Dec 28, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1: The sendUpdate parameter doesn't actually control attendee notifications. The 'Prefer: return=minimal' header only affects response size, not notification behavior. When sendUpdate is true, an empty header value is set which has no effect. Consider documenting this limitation or removing the unused parameter.

Prompt for AI agents 
Check if this issue is valid — if so, understand the root cause and fix it. At packages/providers/src/calendars/microsoft-calendar.ts, line 458:

<comment>The `sendUpdate` parameter doesn&#39;t actually control attendee notifications. The &#39;Prefer: return=minimal&#39; header only affects response size, not notification behavior. When `sendUpdate` is true, an empty header value is set which has no effect. Consider documenting this limitation or removing the unused parameter.</comment>

<file context>
@@ -327,41 +411,57 @@ export class MicrosoftCalendarProvider implements CalendarProvider {
+
+      await this.graphClient
+        .api(`${calendarPath(sourceCalendar.id)}/events/${eventId}`)
+        .header(&quot;Prefer&quot;, sendUpdate ? &quot;&quot; : &quot;return=minimal&quot;)
+        .delete();
+
</file context>
Fix with Cubic

.delete();

return parseEvent({
event: createdEvent,
calendar: destinationCalendar,
});
});
}

Expand Down Expand Up @@ -389,15 +489,13 @@ export class MicrosoftCalendarProvider implements CalendarProvider {
timeMax: Temporal.ZonedDateTime,
): Promise<CalendarFreeBusy[]> {
return this.withErrorHandler("getSchedule", async () => {
const body = {
schedules,
startTime: toMicrosoftDate({ value: timeMin }),
endTime: toMicrosoftDate({ value: timeMax }),
};

const response = await this.graphClient
.api("/me/calendar/getSchedule")
.post(body);
.post({
schedules,
startTime: formatDate({ value: timeMin }),
endTime: formatDate({ value: timeMax }),
});

// TODO: Handle errors
const data = response.value as ScheduleInformation[];
Expand Down
16 changes: 5 additions & 11 deletions packages/providers/src/calendars/microsoft-calendar/calendars.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,25 @@ import type { Calendar as MicrosoftCalendar } from "@microsoft/microsoft-graph-t

import type { Calendar } from "../../interfaces";

interface ParseMicrosoftCalendarOptions {
interface ParseCalendarOptions {
providerAccountId: string;
calendar: MicrosoftCalendar;
}

export function parseMicrosoftCalendar({
export function parseCalendar({
providerAccountId,
calendar,
}: ParseMicrosoftCalendarOptions): Calendar {
}: ParseCalendarOptions): Calendar {
return {
id: calendar.id!,
name: calendar.name!,
primary: calendar.isDefaultCalendar!,
primary: Boolean(calendar.isDefaultCalendar),
provider: {
id: "microsoft",
accountId: providerAccountId,
},
color: calendar.hexColor!,
readOnly: !calendar.canEdit,
readOnly: calendar.canEdit === false,
Copy link
Copy Markdown
Contributor

@cubic-dev-ai cubic-dev-ai bot Dec 28, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2: Semantic change in readOnly handling: When canEdit is undefined/null, the old logic (!calendar.canEdit) defaulted to read-only (safer), but the new logic (calendar.canEdit === false) now defaults to writable. Consider using calendar.canEdit !== true to preserve the conservative behavior, or document this intentional change.

Prompt for AI agents 
Check if this issue is valid — if so, understand the root cause and fix it. At packages/providers/src/calendars/microsoft-calendar/calendars.ts, line 23:

<comment>Semantic change in `readOnly` handling: When `canEdit` is `undefined`/`null`, the old logic (`!calendar.canEdit`) defaulted to read-only (safer), but the new logic (`calendar.canEdit === false`) now defaults to writable. Consider using `calendar.canEdit !== true` to preserve the conservative behavior, or document this intentional change.</comment>

<file context>
@@ -2,31 +2,25 @@ import type { Calendar as MicrosoftCalendar } from &quot;@microsoft/microsoft-graph-t
     },
     color: calendar.hexColor!,
-    readOnly: !calendar.canEdit,
+    readOnly: calendar.canEdit === false,
     syncToken: null,
   };
</file context>
Suggested change
readOnly: calendar.canEdit === false,
readOnly: calendar.canEdit !== true,
Fix with Cubic

syncToken: null,
};
}

export function calendarPath(calendarId: string) {
return calendarId === "primary"
? "/me/calendar"
: `/me/calendars/${calendarId}`;
}
Loading