public-offering
/
cal.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Riverside,whereby doesnt have videoApi handle that (#3494)

pull/3497/head^2
Hariom Balhara 2022-07-22 17:22:17 +05:30 committed by GitHub
parent 9b5d311136
commit e04cb8fc61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/core/videoClient.ts
View File

@ -6,7 +6,7 @@ import appStore from "@calcom/app-store";
import { sendBrokenIntegrationEmail } from "@calcom/emails"; import { sendBrokenIntegrationEmail } from "@calcom/emails";
import { getUid } from "@calcom/lib/CalEventParser"; import { getUid } from "@calcom/lib/CalEventParser";
import logger from "@calcom/lib/logger"; import logger from "@calcom/lib/logger";
import type { CalendarEvent } from "@calcom/types/Calendar"; import type { CalendarEvent, EventBusyDate } from "@calcom/types/Calendar";
import type { EventResult, PartialReference } from "@calcom/types/EventManager"; import type { EventResult, PartialReference } from "@calcom/types/EventManager";
import type { VideoApiAdapter, VideoApiAdapterFactory, VideoCallData } from "@calcom/types/VideoApiAdapter"; import type { VideoApiAdapter, VideoApiAdapterFactory, VideoCallData } from "@calcom/types/VideoApiAdapter";
@ -29,8 +29,8 @@ const getVideoAdapters = (withCredentials: Credential[]): VideoApiAdapter[] =>
}, []); }, []);
const getBusyVideoTimes = (withCredentials: Credential[]) => const getBusyVideoTimes = (withCredentials: Credential[]) =>
Promise.all(getVideoAdapters(withCredentials).map((c) => c.getAvailability())).then((results) => Promise.all(getVideoAdapters(withCredentials).map((c) => c?.getAvailability())).then((results) =>
results.reduce((acc, availability) => acc.concat(availability), []) results.reduce((acc, availability) => acc.concat(availability), [] as (EventBusyDate | undefined)[])
); );
const createMeeting = async (credential: Credential, calEvent: CalendarEvent) => { const createMeeting = async (credential: Credential, calEvent: CalendarEvent) => {
@ -44,7 +44,7 @@ const createMeeting = async (credential: Credential, calEvent: CalendarEvent) =>
const videoAdapters = getVideoAdapters([credential]); const videoAdapters = getVideoAdapters([credential]);
const [firstVideoAdapter] = videoAdapters; const [firstVideoAdapter] = videoAdapters;
const createdMeeting = await firstVideoAdapter.createMeeting(calEvent).catch(async (e) => { const createdMeeting = await firstVideoAdapter?.createMeeting(calEvent).catch(async (e) => {
await sendBrokenIntegrationEmail(calEvent, "video"); await sendBrokenIntegrationEmail(calEvent, "video");
console.error("createMeeting failed", e, calEvent); console.error("createMeeting failed", e, calEvent);
}); });
@ -79,7 +79,7 @@ const updateMeeting = async (
const [firstVideoAdapter] = getVideoAdapters([credential]); const [firstVideoAdapter] = getVideoAdapters([credential]);
const updatedMeeting = const updatedMeeting =
credential && bookingRef credential && bookingRef
? await firstVideoAdapter.updateMeeting(bookingRef, calEvent).catch(async (e) => { ? await firstVideoAdapter?.updateMeeting(bookingRef, calEvent).catch(async (e) => {
await sendBrokenIntegrationEmail(calEvent, "video"); await sendBrokenIntegrationEmail(calEvent, "video");
log.error("updateMeeting failed", e, calEvent); log.error("updateMeeting failed", e, calEvent);
success = false; success = false;
@ -107,7 +107,11 @@ const updateMeeting = async (
const deleteMeeting = (credential: Credential, uid: string): Promise<unknown> => { const deleteMeeting = (credential: Credential, uid: string): Promise<unknown> => {
if (credential) { if (credential) {
return getVideoAdapters([credential])[0].deleteMeeting(uid); const videoAdapter = getVideoAdapters([credential])[0];
// There are certain video apps with no video adapter defined. e.g. riverby,whereby
if (videoAdapter) {
return videoAdapter.deleteMeeting(uid);
}
} }
return Promise.resolve({}); return Promise.resolve({});

7
packages/types/VideoApiAdapter.d.ts vendored
View File

@ -9,7 +9,9 @@ export interface VideoCallData {
url: string; url: string;
} }
export interface VideoApiAdapter { // VideoApiAdapter is defined by the Video App. The App currently can choose to not define it. So, consider in type that VideoApiAdapter can be undefined.
export type VideoApiAdapter =
| {
createMeeting(event: CalendarEvent): Promise<VideoCallData>; createMeeting(event: CalendarEvent): Promise<VideoCallData>;
updateMeeting(bookingRef: PartialReference, event: CalendarEvent): Promise<VideoCallData>; updateMeeting(bookingRef: PartialReference, event: CalendarEvent): Promise<VideoCallData>;
@ -17,6 +19,7 @@ export interface VideoApiAdapter {
deleteMeeting(uid: string): Promise<unknown>; deleteMeeting(uid: string): Promise<unknown>;
getAvailability(dateFrom?: string, dateTo?: string): Promise<EventBusyDate[]>; getAvailability(dateFrom?: string, dateTo?: string): Promise<EventBusyDate[]>;
} }
| undefined;
export type VideoApiAdapterFactory = (credential: Credential) => VideoApiAdapter; export type VideoApiAdapterFactory = (credential: Credential) => VideoApiAdapter;