Skip to content

Scheduling infrastructure for absolutely everyone.

chore: Add logging to `msteams` (#23684)

Joe Au-Yeung08edd4f36197
diff --git a/packages/app-store/office365video/lib/VideoApiAdapter.ts b/packages/app-store/office365video/lib/VideoApiAdapter.ts
index 9648acb2dea..04bc6ad348d 100644
--- a/packages/app-store/office365video/lib/VideoApiAdapter.ts
+++ b/packages/app-store/office365video/lib/VideoApiAdapter.ts
@@ -1,13 +1,12 @@
import { z } from "zod";
import { triggerDelegationCredentialErrorWebhook } from "@calcom/features/webhooks/lib/triggerDelegationCredentialErrorWebhook";
-import logger from "@calcom/lib/logger";
import {
CalendarAppDelegationCredentialConfigurationError,
CalendarAppDelegationCredentialInvalidGrantError,
} from "@calcom/lib/CalendarAppError";
-import { handleErrorsRaw } from "@calcom/lib/errors";
import { HttpError } from "@calcom/lib/http-error";
+import logger from "@calcom/lib/logger";
import type { CalendarEvent } from "@calcom/types/Calendar";
import type { CredentialForCalendarServiceWithTenantId } from "@calcom/types/Credential";
import type { PartialReference } from "@calcom/types/EventManager";
@@ -39,6 +38,7 @@ const getO365VideoAppKeys = async () => {
};
const TeamsVideoApiAdapter = (credential: CredentialForCalendarServiceWithTenantId): VideoApiAdapter => {
+ const log = logger.getSubLogger({ prefix: ["TeamsVideoApiAdapter"] });
let azureUserId: string | null;
const tokenResponse = oAuthManagerHelper.getTokenObjectFromCredential(credential);
@@ -228,57 +228,92 @@ const TeamsVideoApiAdapter = (credential: CredentialForCalendarServiceWithTenant
return Promise.resolve([]);
},
updateMeeting: async (bookingRef: PartialReference, event: CalendarEvent) => {
- const resultString = await auth
- .requestRaw({
+ try {
+ const response = await auth.requestRaw({
url: `${await getUserEndpoint()}/onlineMeetings`,
options: {
method: "POST",
body: JSON.stringify(translateEvent(event)),
},
- })
- .then(handleErrorsRaw);
-
- const resultObject = JSON.parse(resultString);
+ });
- return Promise.resolve({
- type: "office365_video",
- id: resultObject.id,
- password: "",
- url: resultObject.joinWebUrl || resultObject.joinUrl,
- });
+ if (!response.ok) {
+ throw new HttpError({
+ statusCode: response.status,
+ message: response.statusText,
+ });
+ }
+
+ const resultString = await response.text();
+ const resultObject = JSON.parse(resultString);
+
+ return Promise.resolve({
+ type: "office365_video",
+ id: resultObject.id,
+ password: "",
+ url: resultObject.joinWebUrl || resultObject.joinUrl,
+ });
+ } catch (error) {
+ log.error(`Error updating MS Teams meeting for booking ${event.uid}`, error);
+ if (error instanceof HttpError) {
+ throw error;
+ }
+ throw new HttpError({
+ statusCode: 500,
+ message: `Error updating MS Teams meeting for booking ${event.uid}`,
+ });
+ }
},
- deleteMeeting: () => {
+ deleteMeeting:() => {
return Promise.resolve([]);
},
createMeeting: async (event: CalendarEvent): Promise<VideoCallData> => {
const url = `${await getUserEndpoint()}/onlineMeetings`;
- const resultString = await auth
- .requestRaw({
+ try {
+ const response = await auth.requestRaw({
url,
options: {
method: "POST",
body: JSON.stringify(translateEvent(event)),
},
- })
- .then(handleErrorsRaw);
+ });
+
+ if (!response.ok) {
+ throw new HttpError({
+ statusCode: response.status,
+ message: response.statusText,
+ });
+ }
+
+ const resultString = await response.text();
+
+ const resultObject = JSON.parse(resultString);
+
+ if (!resultObject.id || !resultObject.joinUrl || !resultObject.joinWebUrl) {
+ throw new HttpError({
+ statusCode: 500,
+ message: `Error creating MS Teams meeting: ${resultObject.error?.message || "missing required fields in response"}`,
+ });
+ }
- const resultObject = JSON.parse(resultString);
+ log.debug("Teams meeting created", { meetingId: resultObject.id });
- if (!resultObject.id || !resultObject.joinUrl || !resultObject.joinWebUrl) {
+ return Promise.resolve({
+ type: "office365_video",
+ id: resultObject.id,
+ password: "",
+ url: resultObject.joinWebUrl || resultObject.joinUrl,
+ });
+ } catch (error) {
+ log.error(`Error creating MS Teams meeting for booking ${event.uid}`, error);
+ if (error instanceof HttpError) {
+ throw error;
+ }
throw new HttpError({
statusCode: 500,
- message: `Error creating MS Teams meeting: ${resultObject.error?.message || "missing required fields in response"}`,
+ message: `Error creating MS Teams meeting for booking ${event.uid}`,
});
}
-
- logger.debug("Teams meeting created", { meetingId: resultObject.id });
-
- return Promise.resolve({
- type: "office365_video",
- id: resultObject.id,
- password: "",
- url: resultObject.joinWebUrl || resultObject.joinUrl,
- });
},
};
};