From 4211ec1a82cad4611728a79802d8c876e8a3f6ae Mon Sep 17 00:00:00 2001
From: Hariom Balhara <hariombalhara@gmail.com>
Date: Tue, 18 Oct 2022 16:48:39 +0530
Subject: [PATCH] Fix App Redirect logic to allow EventTypeApps requiring auth
 to correctly redirect (#5065)

Co-authored-by: zomars <zomars@me.com>
---
 packages/app-store/_utils/useAddAppMutation.ts |  7 ++++++-
 packages/app-store/apps.browser.generated.tsx  |  1 -
 .../components/InstallAppButton.tsx            | 18 ------------------
 .../wipemycalother/components/index.ts         |  1 -
 4 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 packages/app-store/stripepayment/components/InstallAppButton.tsx

diff --git a/packages/app-store/_utils/useAddAppMutation.ts b/packages/app-store/_utils/useAddAppMutation.ts
index 2093de6540..228f4846c6 100644
--- a/packages/app-store/_utils/useAddAppMutation.ts
+++ b/packages/app-store/_utils/useAddAppMutation.ts
@@ -39,10 +39,15 @@ function useAddAppMutation(_type: App["type"] | null, options?: Parameters<typeo
     }
 
     const json = await res.json();
+
+    if (!isOmniInstall) {
+      window.location.href = json.url;
+      return;
+    }
     // Skip redirection only if it is an OmniInstall and redirect URL isn't of some other origin
     // This allows installation of apps like Stripe to still redirect to their authentication pages.
     // TODO: For Omni installation to authenticate and come back to the page where installation was initiated, some changes need to be done in all apps' add callbacks
-    if (!(isOmniInstall && !json.url.startsWith(window.location.origin))) {
+    if (!json.url.startsWith(window.location.origin)) {
       window.location.href = json.url;
     }
   }, options);
diff --git a/packages/app-store/apps.browser.generated.tsx b/packages/app-store/apps.browser.generated.tsx
index da2438ae1b..ea3bf0d08e 100644
--- a/packages/app-store/apps.browser.generated.tsx
+++ b/packages/app-store/apps.browser.generated.tsx
@@ -21,7 +21,6 @@ export const InstallAppButtonMap = {
   office365video: dynamic(() => import("./office365video/components/InstallAppButton")),
   riverside: dynamic(() => import("./riverside/components/InstallAppButton")),
   slackmessaging: dynamic(() => import("./slackmessaging/components/InstallAppButton")),
-  stripepayment: dynamic(() => import("./stripepayment/components/InstallAppButton")),
   tandemvideo: dynamic(() => import("./tandemvideo/components/InstallAppButton")),
   vital: dynamic(() => import("./vital/components/InstallAppButton")),
   whereby: dynamic(() => import("./whereby/components/InstallAppButton")),
diff --git a/packages/app-store/stripepayment/components/InstallAppButton.tsx b/packages/app-store/stripepayment/components/InstallAppButton.tsx
deleted file mode 100644
index 4e665f8ee6..0000000000
--- a/packages/app-store/stripepayment/components/InstallAppButton.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import type { InstallAppButtonProps } from "@calcom/app-store/types";
-
-import useAddAppMutation from "../../_utils/useAddAppMutation";
-
-export default function InstallAppButton(props: InstallAppButtonProps) {
-  const mutation = useAddAppMutation("stripe_payment");
-
-  return (
-    <>
-      {props.render({
-        onClick() {
-          mutation.mutate("");
-        },
-        loading: mutation.isLoading,
-      })}
-    </>
-  );
-}
diff --git a/packages/app-store/wipemycalother/components/index.ts b/packages/app-store/wipemycalother/components/index.ts
index 1aa02304a2..09a1499635 100644
--- a/packages/app-store/wipemycalother/components/index.ts
+++ b/packages/app-store/wipemycalother/components/index.ts
@@ -1,2 +1 @@
-export { default as InstallAppButton } from "./InstallAppButton";
 export { WipeMyCalActionButton } from "./wipeMyCalActionButton";