Rename property and fix navigation to IdP

Author: LauraBeatris

packages/clerk-js/src/core/resources/EnterpriseAccount.ts

@@ -95,7 +95,7 @@ export class EnterpriseAccountConnection extends BaseResource implements Enterpr
   protocol!: EnterpriseAccountResource['protocol'];
   provider!: EnterpriseAccountResource['provider'];
   syncUserAttributes!: boolean;
-  allowAccountLinking!: boolean;
+  allowOrganizationAccountLinking!: boolean;
   createdAt!: Date;
   updatedAt!: Date;
   enterpriseConnectionId: string | null = '';
@@ -117,7 +117,7 @@ export class EnterpriseAccountConnection extends BaseResource implements Enterpr
       this.allowSubdomains = data.allow_subdomains;
       this.allowIdpInitiated = data.allow_idp_initiated;
       this.disableAdditionalIdentifications = data.disable_additional_identifications;
-      this.allowAccountLinking = data.allow_account_linking;
+      this.allowOrganizationAccountLinking = data.allow_organization_account_linking;
       this.createdAt = unixEpochToDate(data.created_at);
       this.updatedAt = unixEpochToDate(data.updated_at);
       this.enterpriseConnectionId = data.enterprise_connection_id;
@@ -140,7 +140,7 @@ export class EnterpriseAccountConnection extends BaseResource implements Enterpr
       allow_subdomains: this.allowSubdomains,
       allow_idp_initiated: this.allowIdpInitiated,
       disable_additional_identifications: this.disableAdditionalIdentifications,
-      allow_account_linking: this.allowAccountLinking,
+      allow_organization_account_linking: this.allowOrganizationAccountLinking,
       enterprise_connection_id: this.enterpriseConnectionId,
       created_at: this.createdAt.getTime(),
       updated_at: this.updatedAt.getTime(),

packages/clerk-js/src/core/resources/__tests__/User.test.ts

@@ -86,7 +86,7 @@ describe('User', () => {
         object: 'enterprise_account_connection',
         name: 'Acme Corp SSO',
         active: true,
-        allow_account_linking: true,
+        allow_organization_account_linking: true,
         domain: 'acme.com',
         protocol: 'saml',
         provider: 'saml_okta',
@@ -121,7 +121,7 @@ describe('User', () => {
 
     expect(connections).toHaveLength(1);
     expect(connections[0].name).toBe('Acme Corp SSO');
-    expect(connections[0].allowAccountLinking).toBe(true);
+    expect(connections[0].allowOrganizationAccountLinking).toBe(true);
   });
 
   it('creates a web3 wallet', async () => {

packages/shared/src/types/enterpriseAccount.ts

@@ -36,7 +36,7 @@ export interface EnterpriseAccountConnectionResource extends ClerkResource {
   protocol: EnterpriseProtocol;
   provider: EnterpriseProvider;
   syncUserAttributes: boolean;
-  allowAccountLinking: boolean;
+  allowOrganizationAccountLinking: boolean;
   enterpriseConnectionId: string | null;
   __internal_toSnapshot: () => EnterpriseAccountConnectionJSONSnapshot;
 }

packages/shared/src/types/json.ts

@@ -272,7 +272,7 @@ export interface EnterpriseAccountConnectionJSON extends ClerkResourceJSON {
   protocol: EnterpriseProtocol;
   provider: EnterpriseProvider;
   sync_user_attributes: boolean;
-  allow_account_linking: boolean;
+  allow_organization_account_linking: boolean;
   created_at: number;
   updated_at: number;
   enterprise_connection_id: string | null;

packages/ui/src/components/UserProfile/EnterpriseAccountsSection.tsx

@@ -1,4 +1,5 @@
 import { appendModalState } from '@clerk/shared/internal/clerk-js/queryStateParams';
+import { windowNavigate } from '@clerk/shared/internal/clerk-js/windowNavigate';
 import { useReverification, useUser } from '@clerk/shared/react';
 import type {
   EnterpriseAccountConnectionResource,
@@ -12,22 +13,19 @@ import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
 import { ProfileSection } from '@/ui/elements/Section';
 import { ThreeDotsMenu } from '@/ui/elements/ThreeDotsMenu';
 import { handleError } from '@/ui/utils/errorHandler';
-import { sleep } from '@/ui/utils/sleep';
 
 import { ProviderIcon } from '../../common';
 import { useUserProfileContext } from '../../contexts';
 import { Badge, Box, descriptors, Flex, localizationKeys, Text } from '../../customizables';
 import { Action } from '../../elements/Action';
 import { useActionContext } from '../../elements/Action/ActionRoot';
-import { useRouter } from '../../router';
 import type { PropsOfComponent } from '../../styledSystem';
 import { RemoveEnterpriseAccountForm } from './RemoveResourceForm';
 
 const EnterpriseConnectMenuButton = (props: { connection: EnterpriseAccountConnectionResource }) => {
   const { connection } = props;
   const card = useCardState();
   const { user } = useUser();
-  const { navigate } = useRouter();
   const { componentName, mode } = useUserProfileContext();
   const isModal = mode === 'modal';
   const loadingKey = `enterprise_${connection.id}`;
@@ -47,11 +45,13 @@ const EnterpriseConnectMenuButton = (props: { connection: EnterpriseAccountConne
     }
 
     card.setLoading(loadingKey);
+
     return createExternalAccount()
       .then(res => {
         if (res?.verification?.externalVerificationRedirectURL) {
-          void sleep(2000).then(() => card.setIdle(loadingKey));
-          void navigate(res.verification.externalVerificationRedirectURL.href);
+          windowNavigate(res.verification.externalVerificationRedirectURL);
+        } else {
+          card.setIdle(loadingKey);
         }
       })
       .catch(err => {
@@ -142,7 +142,7 @@ export const EnterpriseAccountsSection = withCardStateProvider(() => {
 
   useEffect(() => {
     user?.getEnterpriseConnections?.().then(connections => {
-      setEnterpriseConnections(connections.filter(c => c.allowAccountLinking));
+      setEnterpriseConnections(connections.filter(c => c.allowOrganizationAccountLinking));
     });
   }, [user]);