maronato/cal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix/format without time zone (#7820) 

* Format Office365 as non-UTC (defer to timeZone)

* Ensure the start_time is provided in UTC
This commit is contained in:
Alex van Andel 2023-03-18 22:47:15 +01:00 committed by GitHub
parent f0c7d7ff29
commit 27c29c65e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/app-store/office365calendar/lib/CalendarService.ts
View File

@ -253,7 +253,6 @@ export default class Office365CalendarService implements Calendar {
};
private translateEvent = (event: CalendarEvent) => {
const utcOffset = dayjs(event.startTime).tz(event.organizer.timeZone).utcOffset() / 60;
return {
subject: event.title,
body: {
@ -261,11 +260,11 @@ export default class Office365CalendarService implements Calendar {
content: getRichDescription(event),
},
start: {
dateTime: dayjs(event.startTime).utcOffset(utcOffset).format(),
dateTime: dayjs(event.startTime).tz(event.organizer.timeZone).format("YYYY-MM-DDTHH:mm:ss"),
timeZone: event.organizer.timeZone,
},
end: {
dateTime: dayjs(event.endTime).utcOffset(utcOffset).format(),
dateTime: dayjs(event.endTime).tz(event.organizer.timeZone).format("YYYY-MM-DDTHH:mm:ss"),
timeZone: event.organizer.timeZone,
},
attendees: event.attendees.map((attendee) => ({

3
packages/app-store/zoomvideo/lib/VideoApiAdapter.ts
View File

@ -196,12 +196,11 @@ const ZoomVideoApiAdapter = (credential: CredentialPayload): VideoApiAdapter =>
};
const recurrence = getRecurrence(event);
const utcOffset = dayjs(event.startTime).tz(event.organizer.timeZone).utcOffset() / 60;
// Documentation at: https://marketplace.zoom.us/docs/api-reference/zoom-api/meetings/meetingcreate
return {
topic: event.title,
type: 2, // Means that this is a scheduled meeting
start_time: dayjs(event.startTime).utcOffset(utcOffset).format(),
start_time: dayjs(event.startTime).utc().format(),
duration: (new Date(event.endTime).getTime() - new Date(event.startTime).getTime()) / 60000,
//schedule_for: "string", TODO: Used when scheduling the meeting for someone else (needed?)
timezone: event.organizer.timeZone,