Skip to content

Commit 26637cd

Browse files
authored
fix: When Installing Calendar App, Set Primary Calendar As Selected Calendar (#12291)
* GCal set primary calendar on install * Outlook set default calendar as selected cal * Zoho create selected calendar on install * Lark create selected cal on install
1 parent 529054a commit 26637cd

File tree

4 files changed

+132
-4
lines changed

4 files changed

+132
-4
lines changed

packages/app-store/googlecalendar/api/callback.ts

+28-1
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,41 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
4141
const token = await oAuth2Client.getToken(code);
4242
key = token.res?.data;
4343

44-
await prisma.credential.create({
44+
const credential = await prisma.credential.create({
4545
data: {
4646
type: "google_calendar",
4747
key,
4848
userId: req.session.user.id,
4949
appId: "google-calendar",
5050
},
5151
});
52+
53+
// Set the primary calendar as the first selected calendar
54+
55+
// We can ignore this type error because we just validated the key when we init oAuth2Client
56+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
57+
//@ts-ignore
58+
oAuth2Client.setCredentials(key);
59+
60+
const calendar = google.calendar({
61+
version: "v3",
62+
auth: oAuth2Client,
63+
});
64+
65+
const cals = await calendar.calendarList.list({ fields: "items(id,summary,primary,accessRole)" });
66+
67+
const primaryCal = cals.data.items?.find((cal) => cal.primary);
68+
69+
if (primaryCal?.id) {
70+
await prisma.selectedCalendar.create({
71+
data: {
72+
userId: req.session.user.id,
73+
externalId: primaryCal.id,
74+
credentialId: credential.id,
75+
integration: "google_calendar",
76+
},
77+
});
78+
}
5279
}
5380

5481
if (state?.installGoogleVideo) {

packages/app-store/larkcalendar/api/callback.ts

+26
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,32 @@ async function getHandler(req: NextApiRequest, res: NextApiResponse) {
8989
});
9090
}
9191

92+
const primaryCalendarResponse = await fetch(
93+
`https://${LARK_HOST}/open-apis/calendar/v4/calendars/primary`,
94+
{
95+
method: "GET",
96+
headers: {
97+
Authorization: `Bearer ${key.access_token}`,
98+
"Content-Type": "application/json",
99+
},
100+
}
101+
);
102+
103+
if (primaryCalendarResponse.status === 200) {
104+
const primaryCalendar = await primaryCalendarResponse.json();
105+
106+
if (primaryCalendar.data.calendars.calendar.calendar_id && req.session?.user?.id) {
107+
await prisma.selectedCalendar.create({
108+
data: {
109+
userId: req.session?.user.id,
110+
integration: "lark_calendar",
111+
externalId: primaryCalendar.data.calendars.calendar.calendar_id as string,
112+
credentialId: currentCredential?.id,
113+
},
114+
});
115+
}
116+
}
117+
92118
res.redirect(
93119
getSafeRedirectUrl(state?.returnTo) ??
94120
getInstalledAppPath({ variant: "calendar", slug: "lark-calendar" })

packages/app-store/office365calendar/api/callback.ts

+47-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import type { Calendar as OfficeCalendar } from "@microsoft/microsoft-graph-types-beta";
12
import type { NextApiRequest, NextApiResponse } from "next";
23

34
import { WEBAPP_URL } from "@calcom/lib/constants";
5+
import { handleErrorsJson } from "@calcom/lib/errors";
46
import { getSafeRedirectUrl } from "@calcom/lib/getSafeRedirectUrl";
57
import prisma from "@calcom/prisma";
68

@@ -65,7 +67,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
6567
responseBody.expiry_date = Math.round(+new Date() / 1000 + responseBody.expires_in); // set expiry date in seconds
6668
delete responseBody.expires_in;
6769

68-
await prisma.credential.create({
70+
const credential = await prisma.credential.create({
6971
data: {
7072
type: "office365_calendar",
7173
key: responseBody,
@@ -74,6 +76,50 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
7476
},
7577
});
7678

79+
// Set the isDefaultCalendar as selectedCalendar
80+
// If a user has multiple calendars, keep on making calls until we find the default calendar
81+
let defaultCalendar: OfficeCalendar | undefined = undefined;
82+
let requestUrl = "https://graph.microsoft.com/v1.0/me/calendars?$select=id,isDefaultCalendar";
83+
let finishedParsingCalendars = false;
84+
85+
while (!finishedParsingCalendars) {
86+
const calRequest = await fetch(requestUrl, {
87+
method: "GET",
88+
headers: {
89+
Authorization: `Bearer ${responseBody.access_token}`,
90+
"Content-Type": "application/json",
91+
},
92+
});
93+
let calBody = await handleErrorsJson<{ value: OfficeCalendar[]; "@odata.nextLink"?: string }>(calRequest);
94+
95+
if (typeof responseBody === "string") {
96+
calBody = JSON.parse(responseBody) as { value: OfficeCalendar[] };
97+
}
98+
99+
const findDefaultCalendar = calBody.value.find((calendar) => calendar.isDefaultCalendar);
100+
101+
if (findDefaultCalendar) {
102+
defaultCalendar = findDefaultCalendar;
103+
}
104+
105+
if (calBody["@odata.nextLink"]) {
106+
requestUrl = calBody["@odata.nextLink"];
107+
} else {
108+
finishedParsingCalendars = true;
109+
}
110+
}
111+
112+
if (defaultCalendar?.id && req.session?.user?.id) {
113+
await prisma.selectedCalendar.create({
114+
data: {
115+
userId: req.session?.user.id,
116+
integration: "office365_calendar",
117+
externalId: defaultCalendar.id,
118+
credentialId: credential.id,
119+
},
120+
});
121+
}
122+
77123
const state = decodeOAuthState(req);
78124
return res.redirect(
79125
getSafeRedirectUrl(state?.returnTo) ??

packages/app-store/zohocalendar/api/callback.ts

+31-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import { WEBAPP_URL } from "@calcom/lib/constants";
55
import { getSafeRedirectUrl } from "@calcom/lib/getSafeRedirectUrl";
66
import logger from "@calcom/lib/logger";
77
import { defaultHandler, defaultResponder } from "@calcom/lib/server";
8+
import prisma from "@calcom/prisma";
89

910
import getAppKeysFromSlug from "../../_utils/getAppKeysFromSlug";
1011
import getInstalledAppPath from "../../_utils/getInstalledAppPath";
11-
import createOAuthAppCredential from "../../_utils/oauth/createOAuthAppCredential";
1212
import { decodeOAuthState } from "../../_utils/oauth/decodeOAuthState";
1313
import config from "../config.json";
1414
import type { ZohoAuthCredentials } from "../types/ZohoCalendar";
@@ -64,7 +64,36 @@ async function getHandler(req: NextApiRequest, res: NextApiResponse) {
6464
expires_in: Math.round(+new Date() / 1000 + responseBody.expires_in),
6565
};
6666

67-
await createOAuthAppCredential({ appId: config.slug, type: config.type }, key, req);
67+
const credential = await prisma.credential.create({
68+
data: {
69+
type: config.type,
70+
key,
71+
userId: req.session.user.id,
72+
appId: config.slug,
73+
},
74+
});
75+
76+
const calendarResponse = await fetch("https://calendar.zoho.com/api/v1/calendars", {
77+
method: "GET",
78+
headers: {
79+
Authorization: `Bearer ${key.access_token}`,
80+
"Content-Type": "application/json",
81+
},
82+
});
83+
const data = await calendarResponse.json();
84+
85+
const primaryCalendar = data.calendars.find((calendar: any) => calendar.isdefault);
86+
87+
if (primaryCalendar.uid) {
88+
await prisma.selectedCalendar.create({
89+
data: {
90+
userId: req.session.user.id,
91+
integration: config.type,
92+
externalId: primaryCalendar.uid,
93+
credentialId: credential.id,
94+
},
95+
});
96+
}
6897

6998
res.redirect(
7099
getSafeRedirectUrl(state?.returnTo) ?? getInstalledAppPath({ variant: config.variant, slug: config.slug })

0 commit comments

Comments
 (0)