mythic-insight/calcom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Fixed Google Calendar custom destination calendar deletion (#1486)

Browse source 
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
This commit is contained in:
Philip Niedertscheider 2022-01-13 20:47:15 +01:00 committed by GitHub
parent f8c036164c
commit 9c94aadbf7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/integrations/calendar/CalendarManager.ts
View file

@ -170,10 +170,10 @@ export const updateEvent = async (
}; };
}; };
export const deleteEvent = (credential: Credential, uid: string): Promise<unknown> => { export const deleteEvent = (credential: Credential, uid: string, event: CalendarEvent): Promise<unknown> => {
const calendar = getCalendar(credential); const calendar = getCalendar(credential);
if (calendar) { if (calendar) {
return calendar.deleteEvent(uid); return calendar.deleteEvent(uid, event);
} }
return Promise.resolve({}); return Promise.resolve({});

2
lib/integrations/calendar/interfaces/Calendar.ts
View file

@ -66,7 +66,7 @@ export interface Calendar {
updateEvent(uid: string, event: CalendarEvent): Promise<any>; updateEvent(uid: string, event: CalendarEvent): Promise<any>;
deleteEvent(uid: string): Promise<unknown>; deleteEvent(uid: string, event: CalendarEvent): Promise<unknown>;
getAvailability( getAvailability(
dateFrom: string, dateFrom: string,

6
lib/integrations/calendar/services/GoogleCalendarService.ts
View file

@ -185,7 +185,7 @@ export default class GoogleCalendarService implements Calendar {
); );
} }
async deleteEvent(uid: string): Promise<void> { async deleteEvent(uid: string, event: CalendarEvent): Promise<void> {
return new Promise((resolve, reject) => return new Promise((resolve, reject) =>
this.auth.getToken().then((myGoogleAuth) => { this.auth.getToken().then((myGoogleAuth) => {
const calendar = google.calendar({ const calendar = google.calendar({
@ -195,7 +195,9 @@ export default class GoogleCalendarService implements Calendar {
calendar.events.delete( calendar.events.delete(
{ {
auth: myGoogleAuth, auth: myGoogleAuth,
calendarId: "primary", calendarId: event.destinationCalendar?.externalId
? event.destinationCalendar.externalId
: "primary",
eventId: uid, eventId: uid,
sendNotifications: true, sendNotifications: true,
sendUpdates: "all", sendUpdates: "all",

4
pages/api/cancel.ts
View file

@ -40,6 +40,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
email: true, email: true,
timeZone: true, timeZone: true,
name: true, name: true,
destinationCalendar: true,
}, },
}, },
attendees: true, attendees: true,
@ -105,6 +106,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
uid: bookingToDelete?.uid, uid: bookingToDelete?.uid,
location: bookingToDelete?.location, location: bookingToDelete?.location,
language: t, language: t,
destinationCalendar: bookingToDelete?.user.destinationCalendar,
}; };
// Hook up the webhook logic here // Hook up the webhook logic here
@ -141,7 +143,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
if (credential.type.endsWith("_calendar")) { if (credential.type.endsWith("_calendar")) {
const calendar = getCalendar(credential); const calendar = getCalendar(credential);
return calendar?.deleteEvent(bookingRefUid); return calendar?.deleteEvent(bookingRefUid, evt);
} else if (credential.type.endsWith("_video")) { } else if (credential.type.endsWith("_video")) {
return deleteMeeting(credential, bookingRefUid); return deleteMeeting(credential, bookingRefUid);
} }