From 8f2cb0522d1251b8c019e7b62b81d29471c13bd8 Mon Sep 17 00:00:00 2001 From: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Date: Wed, 2 Apr 2025 09:59:18 +0100 Subject: [PATCH] fix: google signin getting started redirect (#20501) * fix redirect conditions * remove addiiotnal query call --- .../hooks/useRedirectToOnboardingIfNeeded.tsx | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/packages/features/auth/lib/hooks/useRedirectToOnboardingIfNeeded.tsx b/packages/features/auth/lib/hooks/useRedirectToOnboardingIfNeeded.tsx index 522fa3a3c5..f18c95c696 100644 --- a/packages/features/auth/lib/hooks/useRedirectToOnboardingIfNeeded.tsx +++ b/packages/features/auth/lib/hooks/useRedirectToOnboardingIfNeeded.tsx @@ -6,7 +6,6 @@ import { useEffect } from "react"; import dayjs from "@calcom/dayjs"; import { useFlagMap } from "@calcom/features/flags/context/provider"; -import { useEmailVerifyCheck } from "@calcom/trpc/react/hooks/useEmailVerifyCheck"; import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery"; const shouldShowOnboarding = ( @@ -32,24 +31,23 @@ export const ONBOARDING_NEXT_REDIRECT = { export function useRedirectToOnboardingIfNeeded() { const router = useRouter(); - const query = useMeQuery(); - const user = query.data; + const { data: user, isLoading } = useMeQuery(); const flags = useFlagMap(); - const { data: email } = useEmailVerifyCheck(); + const needsEmailVerification = + !user?.emailVerified && user?.identityProvider === "CAL" && flags["email-verification"]; - const needsEmailVerification = !email?.isVerified && flags["email-verification"]; - - const isRedirectingToOnboarding = user && shouldShowOnboarding(user); + const shouldRedirectToOnboarding = user && shouldShowOnboarding(user); + const canRedirect = !isLoading && shouldRedirectToOnboarding && !needsEmailVerification; useEffect(() => { - if (isRedirectingToOnboarding && !needsEmailVerification) { + if (canRedirect) { router.replace("/getting-started"); } - // eslint-disable-next-line react-hooks/exhaustive-deps - }, [isRedirectingToOnboarding, needsEmailVerification]); + }, [canRedirect, router]); return { - isRedirectingToOnboarding, + isLoading, + shouldRedirectToOnboarding, }; }