When deleting video app, change locations to Cal Video (#3022)

* tRPC endpoint to delete credentials

* Replace deleted app with daily

* Updated Jitisi logo

* Update logo size

* Update logo size

* Fix type error

* Remove type as prop

* Add isPrismaArray to lib

* Address feedback

* Remove connect calednar

* Expire payment sessions and cancel payment intent

* Expire payment sessions and cancel payment intent

* Refactor input

Co-authored-by: Omar López <zomars@me.com>

* Remove console.log

Co-authored-by: Omar López <zomars@me.com>

* Address feedback

* Find connected account on Stripe

* Fix type error

* Add interactive transactions

* Remove console.logs

* Remove console.log

Co-authored-by: Omar López <zomars@me.com>

Author: joeauyeung

apps/web/components/integrations/DisconnectIntegration.tsx

@@ -6,6 +6,8 @@ import showToast from "@calcom/lib/notification";
 import { ButtonBaseProps } from "@calcom/ui/Button";
 import { Dialog } from "@calcom/ui/Dialog";
 
+import { trpc } from "@lib/trpc";
+
 import ConfirmationDialogContent from "@components/dialog/ConfirmationDialogContent";
 
 export default function DisconnectIntegration(props: {
@@ -14,32 +16,23 @@ export default function DisconnectIntegration(props: {
   render: (renderProps: ButtonBaseProps) => JSX.Element;
   onOpenChange: (isOpen: boolean) => unknown | Promise<unknown>;
 }) {
+  const { id } = props;
   const { t } = useLocale();
   const [modalOpen, setModalOpen] = useState(false);
-  const mutation = useMutation(
-    async () => {
-      const res = await fetch("/api/integrations", {
-        method: "DELETE",
-        body: JSON.stringify({ id: props.id }),
-        headers: {
-          "Content-Type": "application/json",
-        },
-      });
-      if (!res.ok) {
-        throw new Error("Something went wrong");
-      }
-      return res.json();
+
+  const mutation = trpc.useMutation("viewer.deleteCredential", {
+    onSettled: async () => {
+      await props.onOpenChange(modalOpen);
     },
-    {
-      async onSettled() {
-        await props.onOpenChange(modalOpen);
-      },
-      onSuccess(data) {
-        showToast(data.message, "success");
-        setModalOpen(false);
-      },
-    }
-  );
+    onSuccess: () => {
+      showToast("Integration deleted successfully", "success");
+      setModalOpen(false);
+    },
+    onError: () => {
+      throw new Error("Something went wrong");
+    },
+  });
+
   return (
     <>
       <Dialog open={modalOpen} onOpenChange={setModalOpen}>
@@ -49,7 +42,7 @@ export default function DisconnectIntegration(props: {
           confirmBtnText={t("yes_remove_app")}
           cancelBtnText="Cancel"
           onConfirm={() => {
-            mutation.mutate();
+            mutation.mutate({ id });
           }}>
           {t("are_you_sure_you_want_to_remove_this_app")}
         </ConfirmationDialogContent>

apps/web/ee/lib/stripe/server.ts

@@ -151,6 +151,27 @@ export async function refund(
   }
 }
 
+export const closePayments = async (paymentIntentId: string, stripeAccount: string) => {
+  try {
+    // Expire all current sessions
+    const sessions = await stripe.checkout.sessions.list(
+      {
+        payment_intent: paymentIntentId,
+      },
+      { stripeAccount }
+    );
+    for (const session of sessions.data) {
+      await stripe.checkout.sessions.expire(session.id, { stripeAccount });
+    }
+    // Then cancel the payment intent
+    await stripe.paymentIntents.cancel(paymentIntentId, { stripeAccount });
+    return;
+  } catch (e) {
+    console.error(e);
+    return;
+  }
+};
+
 async function handleRefundError(opts: { event: CalendarEvent; reason: string; paymentId: string }) {
   console.error(`refund failed: ${opts.reason} for booking '${opts.event.uid}'`);
   await sendOrganizerPaymentRefundFailedEmail({

apps/web/pages/apps/installed.tsx

@@ -21,7 +21,6 @@ import Shell, { ShellSubHeading } from "@components/Shell";
 import SkeletonLoader from "@components/apps/SkeletonLoader";
 import { CalendarListContainer } from "@components/integrations/CalendarListContainer";
 import DisconnectIntegration from "@components/integrations/DisconnectIntegration";
-import DisconnectStripeIntegration from "@components/integrations/DisconnectStripeIntegration";
 import IntegrationListItem from "@components/integrations/IntegrationListItem";
 import SubHeadingTitleWithConnections from "@components/integrations/SubHeadingTitleWithConnections";
 
@@ -42,7 +41,7 @@ function ConnectOrDisconnectIntegrationButton(props: {
   if (credentialId) {
     if (type === "stripe_payment") {
       return (
-        <DisconnectStripeIntegration
+        <DisconnectIntegration
           id={credentialId}
           render={(btnProps) => (
             <Button {...btnProps} color="warn" data-testid="integration-connection-button">

apps/web/pages/event-types/[type].tsx

@@ -729,24 +729,12 @@ const EventTypePage = (props: inferSSRProps<typeof getServerSideProps>) => {
                     <div className="flex flex-grow items-center">
                       <svg
                         className="h-6 w-6"
-                        viewBox="0 0 64 64"
+                        viewBox="0 0 60 60"
                         fill="none"
                         xmlns="http://www.w3.org/2000/svg">
                         <path
-                          d="M32 0C49.6733 0 64 14.3267 64 32C64 49.6733 49.6733 64 32 64C14.3267 64 0 49.6733 0 32C0 14.3267 14.3267 0 32 0Z"
-                          fill="#E5E5E4"
-                        />
-                        <path
-                          d="M32.0002 0.623047C49.3292 0.623047 63.3771 14.6709 63.3771 31.9999C63.3771 49.329 49.3292 63.3768 32.0002 63.3768C14.6711 63.3768 0.623291 49.329 0.623291 31.9999C0.623291 14.6709 14.6716 0.623047 32.0002 0.623047Z"
-                          fill="white"
-                        />
-                        <path
-                          d="M31.9998 3.14014C47.9386 3.14014 60.8597 16.0612 60.8597 32C60.8597 47.9389 47.9386 60.8599 31.9998 60.8599C16.0609 60.8599 3.13989 47.9389 3.13989 32C3.13989 16.0612 16.0609 3.14014 31.9998 3.14014Z"
-                          fill="#4A8CFF"
-                        />
-                        <path
-                          d="M13.1711 22.9581V36.5206C13.1832 39.5875 15.6881 42.0558 18.743 42.0433H38.5125C39.0744 42.0433 39.5266 41.5911 39.5266 41.0412V27.4788C39.5145 24.4119 37.0096 21.9435 33.9552 21.956H14.1857C13.6238 21.956 13.1716 22.4082 13.1716 22.9581H13.1711ZM40.7848 28.2487L48.9469 22.2864C49.6557 21.6998 50.2051 21.8462 50.2051 22.9095V41.0903C50.2051 42.2999 49.5329 42.1536 48.9469 41.7134L40.7848 35.7631V28.2487Z"
-                          fill="white"
+                          d="M45.4181 23.2445C45.0316 22.4169 44.4086 21.7223 43.6277 21.2487C42.6993 20.6602 41.5397 20.5354 40.7313 20.5354C40.4591 20.5354 40.1871 20.5495 39.9163 20.5776H39.8961C39.9105 20.4663 39.9393 20.3223 39.9633 20.2051C40.0037 19.9997 40.0497 19.7664 40.0757 19.5235C40.1832 18.4819 39.8126 17.0803 39.1301 15.9543C39.0216 15.7747 39.0254 15.7133 39.0254 15.7133C39.0596 15.6624 39.0995 15.6157 39.1445 15.5741L39.2069 15.5088C40.8206 13.7808 41.3083 11.881 40.6545 9.85058C39.4152 6.00002 39.083 6.00002 38.8401 6.00002C38.786 5.99948 38.7323 6.01041 38.6827 6.03209C38.633 6.05376 38.5886 6.08569 38.5521 6.12578C38.5118 6.1746 38.4823 6.23142 38.4656 6.29249C38.4489 6.35356 38.4454 6.41747 38.4552 6.48002C38.5809 7.75682 38.2929 9.58466 38.1009 10.2807C37.8657 11.1562 37.0449 12.4618 34.4529 13.7031C34.2709 13.7806 34.0851 13.8489 33.8961 13.9075C33.0504 14.1907 31.6373 14.664 30.852 15.745C30.2597 16.4391 30.1166 17.1341 29.8603 18.3888C29.6318 19.5043 29.4475 20.8627 29.8085 22.4842C29.8449 22.6445 29.8795 22.7789 29.9112 22.8989C29.9333 22.9843 29.9525 23.0583 29.9669 23.1226L29.9976 23.1159L29.9659 23.1245C29.9899 23.2205 29.9745 23.2435 29.94 23.2675C29.8153 23.3169 29.6869 23.3564 29.556 23.3856C29.172 23.4471 28.788 23.5152 28.4213 23.5872C27.2539 23.7879 23.7249 24.3965 22.0997 26.9837C21.0965 28.5792 20.9544 30.6634 21.6753 33.1853C22.4232 35.6813 23.9073 37.3968 24.923 37.7462L24.9393 37.752C25.0123 37.7846 25.0824 37.8125 25.1505 37.8355C25.1505 37.9056 25.1438 37.991 25.1352 38.087C25.1281 38.1293 25.1214 38.1754 25.115 38.2253C25.0037 39.0394 24.6197 39.9168 24.228 39.9398C24.0216 39.8995 23.2037 39.4358 22.6248 39.0557C22.4392 38.9347 22.2632 38.8189 22.0968 38.7082C20.4811 37.6387 19.5902 37.0502 18.2289 36.8986C18.1824 36.8936 18.1356 36.891 18.0888 36.8909C16.6488 36.8909 14.0568 39.3158 14.0021 44.1485C13.9742 46.5696 14.2277 48.7824 14.7576 50.7264C15.1358 52.1203 15.539 52.9142 15.6561 53.1264L16.1227 54L16.3358 53.04C17.459 47.952 18.8453 46.7261 21.1521 45.2592C22.8427 46.8432 25.0632 47.6784 27.5918 47.6784C29.723 47.6784 31.9531 47.0592 33.8693 45.9341C35.7518 44.8301 37.2053 43.3421 38.0933 41.6227C38.2411 41.7187 38.4197 41.8435 38.5377 41.9261C38.9601 42.2218 39.0494 42.2842 39.2001 42.2842H39.2136C39.3787 42.2774 40.9358 41.7552 42.5304 39.8074C43.4568 38.6755 44.2209 37.2758 44.8008 35.6448C45.5189 33.6288 45.9528 31.248 46.1006 28.5706C46.2638 26.3223 46.0353 24.5319 45.4219 23.2493L45.4181 23.2445ZM39.4449 10.3027C39.5788 10.8426 39.5962 11.4049 39.4958 11.952C39.3461 13.0157 38.8949 13.968 38.1249 14.8368C38.7811 13.3969 39.2257 11.8698 39.4449 10.3027V10.3027ZM38.3313 16.9047C38.5659 17.2594 38.7449 17.6479 38.8622 18.0567C38.9924 18.5927 38.9691 19.1546 38.795 19.6781C38.5195 20.3338 38.1499 20.665 37.6958 20.665H37.6353C37.4753 20.6409 37.3219 20.5847 37.1841 20.4999C36.6005 20.1581 36.2846 19.2519 36.5121 18.5875C36.5217 18.5683 36.5304 18.5482 36.539 18.5271C36.5765 18.4311 36.683 18.2467 36.9787 17.9616C37.4011 17.5882 38.0184 17.1168 38.3294 16.9056L38.3313 16.9047ZM31.5729 16.7242L31.5787 16.7136V16.704C31.7035 16.3968 32.5627 15.8995 33.1329 15.5703C33.204 15.528 33.275 15.4867 33.3461 15.4464C33.5958 15.3153 33.8522 15.1971 34.1141 15.0922C35.052 14.6928 36.5141 14.0707 37.7179 12.912C37.3685 14.137 36.5275 16.2 35.1451 17.449C34.8379 17.7264 34.2177 17.9722 33.4987 18.2563C32.724 18.5616 31.7928 18.9283 30.8894 19.4823C30.9595 18.7757 31.1774 17.5431 31.5681 16.7242H31.5729ZM30.9729 20.7159C31.4376 20.3319 32.2881 19.8115 35.075 18.8919C35.0942 18.9783 35.1163 19.0896 35.1374 19.2C35.1547 19.2835 35.1729 19.3786 35.1941 19.4823C35.3765 20.3827 35.5781 21.3946 37.4529 21.9562C37.2782 22.3402 36.9192 22.9891 36.7944 23.113L36.7531 23.1485L36.7243 23.1955C36.3595 23.7811 34.3877 25.0589 33.5045 25.0589C33.4665 25.0593 33.4286 25.0564 33.3912 25.0503C32.8593 24.9475 31.6382 23.8627 31.2792 23.0611C30.5851 21.4877 30.7272 20.9203 30.9681 20.7197L30.9729 20.7159ZM24.0293 35.1581C23.0078 33.6384 22.2341 30.983 22.7409 28.848V28.8384C22.9857 27.6768 23.7969 26.9933 24.132 26.7533L24.18 26.7178C24.6773 26.2839 25.6949 25.8259 27.0465 25.4256C27.2385 25.3757 27.3441 25.3536 27.3489 25.3536C27.5976 25.3018 27.8693 25.2394 28.1333 25.1789C28.6328 25.0513 29.1392 24.9523 29.6501 24.8823C29.7768 24.8688 29.9054 24.8448 30.0283 24.8208C30.1944 24.7844 30.3634 24.7625 30.5333 24.7555C30.6688 24.7483 30.8031 24.7839 30.9173 24.8573C31.4184 25.4525 32.6453 26.6275 33.4497 26.6967H33.4737H33.5006C34.4165 26.6477 35.8517 25.7539 37.7678 24.0384C38.0933 23.7504 38.3957 23.4989 38.6923 23.2791L38.7288 23.2512C39.2517 22.8546 39.8275 22.533 40.4395 22.296C40.2389 22.9527 40.0795 24.0749 40.7275 25.656C41.0645 26.4739 41.7115 28.3171 42.2481 30.1219C43.1717 33.2304 43.043 33.7776 43.0248 33.8285C42.9992 33.9341 42.9574 34.0351 42.9009 34.128C42.8289 34.1141 42.7593 34.0895 42.6945 34.055C42.2289 33.84 41.7067 33.456 41.0961 33.0048C39.9633 32.1744 38.555 31.1414 36.4939 30.336C34.98 29.7456 33.4747 29.4451 32.0222 29.4451C31.4203 29.4441 30.8198 29.5013 30.2289 29.616C26.9822 30.2563 25.2705 31.6877 24.3518 32.4576L24.3451 32.4634C24.2847 32.5123 24.2409 32.5787 24.2198 32.6534C24.1987 32.7282 24.2012 32.8077 24.227 32.881C24.2535 32.9531 24.3017 33.0152 24.365 33.0587C24.4283 33.1022 24.5035 33.125 24.5803 33.1238C24.6638 33.1238 24.7454 33.1008 25.0152 33.023C25.988 32.7332 26.9835 32.5257 27.9912 32.4029C28.3522 32.3608 28.7154 32.3393 29.0789 32.3386C30.6504 32.3386 32.0961 32.8186 33.6264 33.8582C33.9768 34.151 34.1909 34.345 34.3205 34.4726L34.188 34.5072L33.2597 34.7693C30.9614 35.4192 27.4872 36.4013 25.8427 36.4013C25.7166 36.4023 25.5906 36.3949 25.4654 36.3792C25.0392 36.3168 24.5189 35.8714 24.036 35.159L24.0293 35.1581ZM17.2507 46.8173C16.6038 47.6606 16.1274 48.6219 15.8481 49.6474C15.539 48.1661 15.1761 45.7296 15.3825 43.8326C15.8126 39.9024 17.7595 38.5862 18.0485 38.5171H18.0667C18.083 38.5171 18.1022 38.5171 18.1406 38.5584C18.2961 38.7274 18.6321 39.4406 18.3873 42.3907C18.3297 42.9984 18.4757 43.513 18.8232 43.92C19.0586 44.1892 19.3548 44.3985 19.6872 44.5306C18.7501 45.1495 17.9249 45.923 17.2469 46.8182L17.2507 46.8173ZM20.5598 42.96C20.4584 43.0054 20.3492 43.0308 20.2382 43.0349C20.1992 43.0383 20.1599 43.0329 20.1233 43.0189C20.0867 43.0049 20.0538 42.9828 20.027 42.9542C19.9646 42.889 19.8235 42.6662 19.8686 42.0086C19.9003 41.6851 19.9454 41.3626 19.9877 41.0486C20.0819 40.4573 20.1384 39.8606 20.1566 39.2621C21.2913 40.0051 22.5489 40.7923 23.363 41.1552C22.8312 41.6266 21.7243 42.4742 20.5598 42.9619V42.96ZM35.3678 42.8544C33.5373 44.7625 31.0651 45.9252 28.428 46.1184C28.115 46.1414 27.803 46.153 27.5025 46.153C24.0302 46.153 22.2657 44.6794 21.4545 43.8586C25.3781 42.1661 26.1739 39.7459 26.5214 38.689C26.555 38.5862 26.5857 38.497 26.6174 38.4202C26.7672 38.3453 27.2433 38.1322 28.7121 37.5821C29.8641 37.1674 31.2456 36.7027 32.4638 36.2918C33.4785 35.9501 34.355 35.6534 34.8341 35.4778L34.8734 35.4653C34.9694 35.4384 35.027 35.4259 35.0654 35.4192L35.0923 35.4538C35.5387 36.0355 36.275 36.3898 36.2817 36.3946C36.8353 36.6416 37.4273 36.791 38.0318 36.8362C38.0174 38.9338 37.0593 41.1091 35.3736 42.8534L35.3678 42.8544ZM38.411 35.6726C36.9585 35.6726 36.4488 35.2051 35.9736 34.6397C33.6149 31.8278 31.0075 31.367 29.9947 31.2989C29.6702 31.2778 29.3525 31.2672 29.0481 31.2672C28.7928 31.2672 28.5432 31.2739 28.2993 31.2893C29.4742 30.8898 30.7064 30.6849 31.9473 30.6826C34.5489 30.6826 37.0536 31.6042 39.3893 33.4205C40.3416 34.1606 41.0424 34.6858 41.6481 35.1072C41.3531 35.1949 40.9547 35.3069 40.4529 35.4432L40.2609 35.496C39.651 35.6044 39.0333 35.6635 38.4139 35.6726H38.411ZM39.3163 40.9901C39.1637 40.8557 38.9323 40.6416 38.6933 40.4237C38.9129 39.8647 39.0788 39.2861 39.1886 38.6957C39.3019 38.0726 39.3729 37.2557 39.4056 36.8227C40.0954 36.7196 40.7783 36.5744 41.4504 36.3878C42.2597 36.1555 42.8846 35.8915 43.3301 35.591C41.9409 39.0595 39.9288 40.583 39.3163 40.9882V40.9901ZM44.123 33.0576C43.9166 31.3478 43.2245 29.2339 42.9537 28.4122C42.9249 28.3162 42.9009 28.2471 42.8846 28.1962C42.8645 28.1309 42.8021 27.9571 42.6734 27.6019C42.3403 26.6717 41.6453 24.7383 41.5214 24.1661C41.3438 23.3251 41.7451 22.1683 42.0014 22.0675C42.0806 22.0378 42.1645 22.0225 42.2491 22.0224C42.7214 22.0224 43.3051 22.4688 43.7669 23.1888C44.3256 24.0528 44.6568 25.1981 44.7 26.4039C44.796 29.0352 44.5521 31.2336 44.124 33.0576"
+                          fill="#727272"
                         />
                       </svg>
                       <span className="ml-2 text-sm">Jitsi Meet</span>