Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions apps/dashboard/src/hooks/use-connect-switch-confirmation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@ import { useOrganizationList } from '@clerk/react';
import { type MouseEvent, useCallback, useEffect, useMemo, useState } from 'react';
import { useCrossAppNavigation } from '@/hooks/use-cross-app-navigation';
import { APP_IDS, type AppId } from '@/utils/apps';
import {
beginConnectProvisioning,
hasExplicitConnectMembership,
withConnectProvisioningIntent,
} from '@/utils/connect';
import { hasExplicitConnectMembership, withConnectProvisioningIntent } from '@/utils/connect';

type UseConnectSwitchConfirmationOptions = {
targetAppId: AppId;
Expand Down Expand Up @@ -61,8 +57,6 @@ export function useConnectSwitchConfirmation({

const handleConfirm = useCallback(() => {
setIsModalOpen(false);
// Set the same-origin flag and append `?provision=1` for the cross-origin handoff.
beginConnectProvisioning();
navigateCrossApp(withConnectProvisioningIntent(href), openInNewTab);
}, [href, navigateCrossApp, openInNewTab]);

Expand Down
3 changes: 1 addition & 2 deletions apps/dashboard/src/pages/sign-in.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { IS_NOVU_CONNECT, IS_SELF_HOSTED } from '@/config';
import { useSegment } from '@/context/segment';
import { buildAppHomeRoute, getCurrentAppId } from '@/utils/apps';
import { clerkSignupAppearance } from '@/utils/clerk-appearance';
import { beginConnectProvisioning, buildConnectProvisionOrgListPath } from '@/utils/connect';
import { buildConnectProvisionOrgListPath } from '@/utils/connect';
import {
buildAbsoluteConnectUrl,
buildPrimarySignInUrl,
Expand Down Expand Up @@ -71,7 +71,6 @@ export const SignInPage = () => {
hasRedirectedRef.current = true;

if (isConnectSignIn) {
beginConnectProvisioning();
window.location.assign(connectProvisionRedirect);

return;
Expand Down
3 changes: 1 addition & 2 deletions apps/dashboard/src/pages/sign-up.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { PageMeta } from '@/components/page-meta';
import { IS_NOVU_CONNECT, IS_SELF_HOSTED } from '@/config';
import { useSegment } from '@/context/segment';
import { clerkSignupAppearance } from '@/utils/clerk-appearance';
import { beginConnectProvisioning, buildConnectProvisionOrgListPath } from '@/utils/connect';
import { buildConnectProvisionOrgListPath } from '@/utils/connect';
import {
buildAbsoluteConnectUrl,
buildPrimarySignUpUrl,
Expand Down Expand Up @@ -68,7 +68,6 @@ export const SignUpPage = () => {
}

hasRedirectedRef.current = true;
beginConnectProvisioning();
window.location.assign(connectProvisionRedirect);
}, [isLoaded, isSignedIn, isConnectSignUp, connectProvisionRedirect]);

Expand Down
Loading