From 50521ce2bb58ffc9c73123e207b11ed6c8a3307f Mon Sep 17 00:00:00 2001
From: Joe Au-Yeung <j.auyeung419@gmail.com>
Date: Mon, 31 Oct 2022 17:48:32 -0400
Subject: [PATCH] WIP

---
 apps/web/pages/settings/teams/new/[[...step]].tsx  |  3 +--
 packages/features/ee/payments/api/webhook.ts       |  4 ----
 .../ee/teams/components/v2/AddNewTeamMembers.tsx   | 14 +++++++++-----
 packages/lib/webstorage.ts                         |  8 ++++++++
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/apps/web/pages/settings/teams/new/[[...step]].tsx b/apps/web/pages/settings/teams/new/[[...step]].tsx
index beb2b68598..cf9a8f7f08 100644
--- a/apps/web/pages/settings/teams/new/[[...step]].tsx
+++ b/apps/web/pages/settings/teams/new/[[...step]].tsx
@@ -127,8 +127,7 @@ const CreateNewTeamPage = () => {
               {currentStep === "add-team-members" && (
                 <AddNewTeamMembers
                   nextStep={(values: PendingMember[]) => {
-                    console.log("🚀 ~ file: [[...step]].tsx ~ line 126 ~ CreateNewTeamPage ~ values", values);
-                    // setNewTeamData({ ...newTeamData, members: [...values] });
+                    localStorage.removeItem("newTeamValues");
                     purchaseTeamMutation.mutate({
                       ...newTeamData,
                       members: [...values],
diff --git a/packages/features/ee/payments/api/webhook.ts b/packages/features/ee/payments/api/webhook.ts
index 28520f5a63..5db373ccbb 100644
--- a/packages/features/ee/payments/api/webhook.ts
+++ b/packages/features/ee/payments/api/webhook.ts
@@ -199,12 +199,8 @@ async function handleTeamSubscriptionSuccess(event: Stripe.Event) {
         },
       },
     });
-    console.log("🚀 ~ file: webhook.ts ~ line 199 ~ handleTeamSubscriptionSuccess ~ members", members);
 
     const teamOwner = members.find((member) => member.role === "OWNER");
-    console.log("🚀 ~ file: webhook.ts ~ line 204 ~ handleTeamSubscriptionSuccess ~ teamOwner", teamOwner);
-
-    console.log("🚀 ~ file: webhook.ts ~ line 184 ~ handleTeamSubscriptionSuccess ~ team", team);
 
     await Promise.all(
       members.map(
diff --git a/packages/features/ee/teams/components/v2/AddNewTeamMembers.tsx b/packages/features/ee/teams/components/v2/AddNewTeamMembers.tsx
index 9e8211f082..1cb855ce31 100644
--- a/packages/features/ee/teams/components/v2/AddNewTeamMembers.tsx
+++ b/packages/features/ee/teams/components/v2/AddNewTeamMembers.tsx
@@ -1,4 +1,5 @@
 import { useSession } from "next-auth/react";
+import { useRouter } from "next/router";
 import { useState, useEffect } from "react";
 import { useForm, Controller, useFieldArray } from "react-hook-form";
 
@@ -6,6 +7,7 @@ import MemberInvitationModal from "@calcom/features/ee/teams/components/MemberIn
 import { classNames } from "@calcom/lib";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { localStorage } from "@calcom/lib/webstorage";
 import { trpc } from "@calcom/trpc/react";
 import { Icon } from "@calcom/ui";
 import { Avatar, Badge, Button, showToast } from "@calcom/ui/v2/core";
@@ -18,6 +20,7 @@ import { NewMemberForm } from "../MemberInvitationModal";
 const AddNewTeamMembers = (props: { nextStep: (values: PendingMember[]) => void }) => {
   const { t } = useLocale();
   const session = useSession();
+  const router = useRouter();
 
   const [memberInviteModal, setMemberInviteModal] = useState(false);
   const [inviteMemberInput, setInviteMemberInput] = useState<NewMemberForm>({
@@ -48,12 +51,13 @@ const AddNewTeamMembers = (props: { nextStep: (values: PendingMember[]) => void
   });
 
   useEffect(() => {
-    if (session.status !== "loading" && !formMethods.getValues("members").length) {
-      console.log(
-        "🚀 ~ file: AddNewTeamMembers.tsx ~ line 54 ~ useEffect ~ session?.data.user",
-        session?.data.user
-      );
+    const newTeamValues = localStorage.getItem("newTeamValues");
+    if (!newTeamValues) router.push("/settings");
+  }, []);
 
+  // Set current user as team owner
+  useEffect(() => {
+    if (session.status !== "loading" && !formMethods.getValues("members").length) {
       membersFieldArray.append({
         name: session?.data.user.name || "",
         email: session?.data.user.email || "",
diff --git a/packages/lib/webstorage.ts b/packages/lib/webstorage.ts
index 47cbd00e3b..b16fdeb8c4 100644
--- a/packages/lib/webstorage.ts
+++ b/packages/lib/webstorage.ts
@@ -21,4 +21,12 @@ export const localStorage = {
       return;
     }
   },
+  removeItem(key: string) {
+    try {
+      // eslint-disable-next-line @calcom/eslint/avoid-web-storage
+      window.localStorage.removeItem(key);
+    } catch (e) {
+      return;
+    }
+  },
 };