removing handle errors raw from the Daily video client

calcom · Sep 17, 2021 · ac2dff3 · ac2dff3
1 parent 5f9139f
commit ac2dff3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 22 deletions.
diff --git a/lib/dailyVideoClient.ts b/lib/dailyVideoClient.ts
@@ -32,14 +32,6 @@ function handleErrorsJson(response) {
   return response.json();
 }
 
-function handleErrorsRaw(response) {
-  if (!response.ok) {
-    response.text().then(console.log);
-    throw Error(response.statusText);
-  }
-  return response.text();
-}
-
 const dailyCredential = process.env.DAILY_API_KEY;
 
 interface DailyVideoApiAdapter {
@@ -91,7 +83,7 @@ const DailyVideo = (credential): DailyVideoApiAdapter => {
         headers: {
           Authorization: "Bearer " + dailyCredential,
         },
-      }).then(handleErrorsRaw),
+      }).then(handleErrorsJson),
     dailyUpdateMeeting: (uid: string, event: CalendarEvent) =>
       fetch("https://api.daily.co/v1/rooms/" + uid, {
         method: "POST",
@@ -100,7 +92,7 @@ const DailyVideo = (credential): DailyVideoApiAdapter => {
           "Content-Type": "application/json",
         },
         body: JSON.stringify(translateEvent(event)),
-      }).then(handleErrorsRaw),
+      }).then(handleErrorsJson),
   };
 };
 

diff --git a/pages/api/cancel.ts b/pages/api/cancel.ts
@@ -26,6 +26,7 @@ export default async function handler(req, res) {
         },
       },
       attendees: true,
+      location: true,
       references: {
         select: {
           uid: true,
@@ -52,17 +53,16 @@ export default async function handler(req, res) {
 
   const apiDeletes = async.mapLimit(bookingToDelete.user.credentials, 5, async (credential) => {
     const bookingRefUid = bookingToDelete.references.filter((ref) => ref.type === credential.type)[0]?.uid;
-
     if (bookingRefUid) {
       if (credential.type.endsWith("_calendar")) {
         return await deleteEvent(credential, bookingRefUid);
       } else if (credential.type.endsWith("_video")) {
         return await deleteMeeting(credential, bookingRefUid);
       }
     }
-
     //deleting a Daily meeting
-    const isDaily = bookingToDelete.references.filter((ref) => ref.type === "daily");
+
+    const isDaily = bookingToDelete.location === "integrations:daily";
     const bookingUID = bookingToDelete.references.filter((ref) => ref.type === "daily")[0]?.uid;
     if (isDaily) {
       return await dailyDeleteMeeting(credential, bookingUID);
@@ -74,6 +74,7 @@ export default async function handler(req, res) {
       bookingId: bookingToDelete.id,
     },
   });
+
   const bookingReferenceDeletes = prisma.bookingReference.deleteMany({
     where: {
       bookingId: bookingToDelete.id,

diff --git a/pages/call/[uid].tsx b/pages/call/[uid].tsx
@@ -2,7 +2,6 @@ import { useEffect } from "react";
 import DailyIframe from "@daily-co/daily-js";
 import prisma from "../../lib/prisma";
 import { getSession } from "next-auth/client";
-import type { NextApiRequest } from "next";
 import { useRouter } from "next/router";
 
 export default function JoinCall(props, session) {
@@ -79,17 +78,12 @@ export async function getServerSideProps(context) {
     },
   });
 
+  const session = await getSession();
+
   return {
     props: {
       booking: booking,
+      session: session,
     },
   };
 }
-
-export async function handler(req: NextApiRequest) {
-  const session = await getSession({ req: req });
-
-  if (session) {
-    return session;
-  }
-}