Skip to content
Open
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
10 changes: 10 additions & 0 deletions packages/shared/src/react/hooks/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,16 @@ export type {
} from './useOrganizationEnterpriseConnections';
export { __internal_useOrganizationDomains } from './useOrganizationDomains';
export type { UseOrganizationDomainsParams, UseOrganizationDomainsReturn } from './useOrganizationDomains';
export { __internal_useOrganizationDirectorySync } from './useOrganizationDirectorySync';
export type {
UseOrganizationDirectorySyncParams,
UseOrganizationDirectorySyncReturn,
} from './useOrganizationDirectorySync';
export { __internal_useOrganizationDirectorySyncUsers } from './useOrganizationDirectorySyncUsers';
export type {
UseOrganizationDirectorySyncUsersParams,
UseOrganizationDirectorySyncUsersReturn,
} from './useOrganizationDirectorySyncUsers';
export { __internal_useOrganizationEnterpriseConnectionTestRuns } from './useOrganizationEnterpriseConnectionTestRuns';
export type {
UseOrganizationEnterpriseConnectionTestRunsParams,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import { useMemo } from 'react';

import type { GetDirectorySyncUsersParams } from '../../types/directorySync';
import { INTERNAL_STABLE_KEYS } from '../stable-keys';
import { createCacheKeys } from './createCacheKeys';

/**
* @internal
*/
export function useOrganizationDirectorySyncCacheKeys(params: {
organizationId: string | null;
enterpriseConnectionId: string | null;
}) {
const { organizationId, enterpriseConnectionId } = params;
return useMemo(() => {
return createCacheKeys({
stablePrefix: INTERNAL_STABLE_KEYS.ORGANIZATION_DIRECTORY_SYNC_KEY,
authenticated: Boolean(organizationId),
tracked: {
organizationId: organizationId ?? null,
enterpriseConnectionId: enterpriseConnectionId ?? null,
},
untracked: {
args: {},
},
});
}, [organizationId, enterpriseConnectionId]);
}

/**
* @internal
*/
export function useOrganizationDirectorySyncUsersCacheKeys(params: {
organizationId: string | null;
enterpriseConnectionId: string | null;
args: GetDirectorySyncUsersParams;
}) {
const { organizationId, enterpriseConnectionId, args } = params;
return useMemo(() => {
return createCacheKeys({
stablePrefix: INTERNAL_STABLE_KEYS.ORGANIZATION_DIRECTORY_SYNC_USERS_KEY,
authenticated: Boolean(organizationId),
tracked: {
organizationId: organizationId ?? null,
enterpriseConnectionId: enterpriseConnectionId ?? null,
},
untracked: {
args,
},
});
// The args object is intentionally serialized via the consumer to keep stability.
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [organizationId, enterpriseConnectionId, JSON.stringify(args)]);
}
145 changes: 145 additions & 0 deletions packages/shared/src/react/hooks/useOrganizationDirectorySync.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
import { useCallback } from 'react';

import { isClerkAPIResponseError } from '../../error';
import type { DeletedObjectResource } from '../../types/deletedObject';
import type {
CreateDirectorySyncParams,
DirectorySyncResource,
UpdateDirectorySyncParams,
} from '../../types/directorySync';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useClearQueriesOnSignOut } from './useClearQueriesOnSignOut';
import { useOrganizationDirectorySyncCacheKeys } from './useOrganizationDirectorySync.shared';

export type UseOrganizationDirectorySyncParams = {
enterpriseConnectionId: string | null;
enabled?: boolean;
keepPreviousData?: boolean;
};

export type UseOrganizationDirectorySyncReturn = {
/**
* The connection's directory, `null` when none has been created yet, `undefined` while loading.
* Never carries the bearer token — that only exists on the resources resolved by
* `createDirectorySync` and `rotateDirectorySyncToken`.
*/
data: DirectorySyncResource | null | undefined;
error: Error | null;
isLoading: boolean;
isFetching: boolean;
createDirectorySync: (params?: CreateDirectorySyncParams) => Promise<DirectorySyncResource | undefined>;
updateDirectorySync: (params: UpdateDirectorySyncParams) => Promise<DirectorySyncResource | undefined>;
rotateDirectorySyncToken: () => Promise<DirectorySyncResource | undefined>;
deleteDirectorySync: () => Promise<DeletedObjectResource | undefined>;
revalidate: () => Promise<void>;
};

/**
* The Directory Sync directory bound to an enterprise connection of the active organization.
*
* @internal
*/
function useOrganizationDirectorySync(params: UseOrganizationDirectorySyncParams): UseOrganizationDirectorySyncReturn {
const { enterpriseConnectionId, enabled = true, keepPreviousData = true } = params;
const clerk = useClerkInstanceContext();
const organization = useOrganizationBase();
const [queryClient] = useClerkQueryClient();

const { queryKey, stableKey, authenticated } = useOrganizationDirectorySyncCacheKeys({
organizationId: organization?.id ?? null,
enterpriseConnectionId,
});

const queryEnabled = enabled && clerk.loaded && Boolean(organization) && Boolean(enterpriseConnectionId);

useClearQueriesOnSignOut({
isSignedOut: organization === null,
authenticated,
stableKeys: stableKey,
});

const query = useClerkQuery({
queryKey,
queryFn: async () => {
if (!enterpriseConnectionId) {
throw new Error('enterpriseConnectionId is required to fetch the directory');
}
try {
return (await organization?.getDirectorySync(enterpriseConnectionId)) ?? null;
} catch (err) {
// No directory yet is a first-class state of the setup flow, not an error.
if (isClerkAPIResponseError(err) && err.status === 404) {
return null;
}
throw err;
}
},
enabled: queryEnabled,
placeholderData: defineKeepPreviousDataFn(keepPreviousData),
});

const revalidate = useCallback(
() => queryClient.invalidateQueries({ queryKey: [stableKey] }),
[queryClient, stableKey],
);

const createDirectorySync = useCallback(
async (createParams?: CreateDirectorySyncParams) => {
if (!enterpriseConnectionId) {
return undefined;
}
const created = await organization?.createDirectorySync(enterpriseConnectionId, createParams);
await revalidate();
return created;
},
[organization, enterpriseConnectionId, revalidate],
);

const updateDirectorySync = useCallback(
async (updateParams: UpdateDirectorySyncParams) => {
if (!enterpriseConnectionId) {
return undefined;
}
const updated = await organization?.updateDirectorySync(enterpriseConnectionId, updateParams);
await revalidate();
return updated;
},
[organization, enterpriseConnectionId, revalidate],
);

const rotateDirectorySyncToken = useCallback(async () => {
if (!enterpriseConnectionId) {
return undefined;
}
const rotated = await organization?.rotateDirectorySyncToken(enterpriseConnectionId);
await revalidate();
return rotated;
}, [organization, enterpriseConnectionId, revalidate]);

const deleteDirectorySync = useCallback(async () => {
if (!enterpriseConnectionId) {
return undefined;
}
const deleted = await organization?.deleteDirectorySync(enterpriseConnectionId);
await revalidate();
return deleted;
}, [organization, enterpriseConnectionId, revalidate]);

return {
data: query.data,
error: query.error ?? null,
isLoading: query.isLoading,
isFetching: query.isFetching,
createDirectorySync,
updateDirectorySync,
rotateDirectorySyncToken,
deleteDirectorySync,
revalidate,
};
}

export { useOrganizationDirectorySync as __internal_useOrganizationDirectorySync };
147 changes: 147 additions & 0 deletions packages/shared/src/react/hooks/useOrganizationDirectorySyncUsers.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
import { useCallback, useEffect, useState } from 'react';

import type { DirectorySyncUserResource, GetDirectorySyncUsersParams } from '../../types/directorySync';
import { useClerkInstanceContext } from '../contexts';
import { defineKeepPreviousDataFn } from '../query/keep-previous-data';
import { useClerkQueryClient } from '../query/use-clerk-query-client';
import { useClerkQuery } from '../query/useQuery';
import { useOrganizationBase } from './base/useOrganizationBase';
import { useClearQueriesOnSignOut } from './useClearQueriesOnSignOut';
import { useOrganizationDirectorySyncUsersCacheKeys } from './useOrganizationDirectorySync.shared';

const DEFAULT_POLL_INTERVAL_MS = 2_000;

export type UseOrganizationDirectorySyncUsersParams = {
enterpriseConnectionId: string | null;
/**
* Pass-through fetch parameters (pagination).
* Defaults to `{ initialPage: 1, pageSize: 10 }`.
*/
params?: GetDirectorySyncUsersParams;
/**
* Polling interval (ms) applied while polling is armed via `startPolling`.
*
* @default 2000
*/
pollIntervalMs?: number;
/**
* If `false`, the hook is dormant — no fetch, no polling.
*
* @default true
*/
enabled?: boolean;
keepPreviousData?: boolean;
};

export type UseOrganizationDirectorySyncUsersReturn = {
data: DirectorySyncUserResource[] | undefined;
totalCount: number | undefined;
error: Error | null;
isLoading: boolean;
isFetching: boolean;
/**
* `true` while the hook is actively polling
*/
isPolling: boolean;
/**
* Start polling. Polling runs continuously (new provisions, updates, and
* deprovisions keep appearing) until `stopPolling` is called — callers
* should stop on unmount of the view that armed it.
*/
startPolling: () => void;
/**
* Stop polling.
*/
stopPolling: () => void;
/**
* Force a refetch.
*/
revalidate: () => Promise<void>;
};

/**
* The users provisioned into an enterprise connection's Directory Sync
* directory, most recently touched first. Polls continuously while armed via
* `startPolling`, so the setup flow doubles as a recent-activity feed.
*
* @internal
*/
function useOrganizationDirectorySyncUsers(
params: UseOrganizationDirectorySyncUsersParams,
): UseOrganizationDirectorySyncUsersReturn {
const {
enterpriseConnectionId,
params: fetchParams = { initialPage: 1, pageSize: 10 },
pollIntervalMs = DEFAULT_POLL_INTERVAL_MS,
enabled = true,
keepPreviousData = true,
} = params;

const clerk = useClerkInstanceContext();
const organization = useOrganizationBase();
const [queryClient] = useClerkQueryClient();

const { queryKey, invalidationKey, stableKey, authenticated } = useOrganizationDirectorySyncUsersCacheKeys({
organizationId: organization?.id ?? null,
enterpriseConnectionId,
args: fetchParams,
});

useClearQueriesOnSignOut({
isSignedOut: organization === null,
authenticated,
stableKeys: stableKey,
});

const queryEnabled = enabled && clerk.loaded && Boolean(organization) && Boolean(enterpriseConnectionId);

const [shouldPoll, setShouldPoll] = useState(false);

useEffect(() => {
// Polling intent is scoped to the current connection — clear it when the
// connection changes so a reset/recreate doesn't inherit a stale armed poll.
setShouldPoll(false);
}, [enterpriseConnectionId]);

const query = useClerkQuery({
queryKey,
queryFn: () => {
if (!enterpriseConnectionId) {
throw new Error('enterpriseConnectionId is required to fetch directory users');
}
return organization?.getDirectorySyncUsers(enterpriseConnectionId, fetchParams);
},
refetchInterval: () => (shouldPoll ? pollIntervalMs : false),
enabled: queryEnabled,
refetchIntervalInBackground: false,
placeholderData: defineKeepPreviousDataFn(keepPreviousData),
});

const startPolling = useCallback(() => {
setShouldPoll(true);
}, []);

const stopPolling = useCallback(() => {
setShouldPoll(false);
}, []);

const revalidate = useCallback(async () => {
await queryClient.invalidateQueries({ queryKey: invalidationKey });
}, [queryClient, invalidationKey]);

const isPolling = queryEnabled && shouldPoll;

return {
data: query.data?.data,
totalCount: query.data?.total_count,
error: query.error ?? null,
isLoading: query.isLoading,
isFetching: query.isFetching,
isPolling,
startPolling,
stopPolling,
revalidate,
};
}

export { useOrganizationDirectorySyncUsers as __internal_useOrganizationDirectorySyncUsers };
4 changes: 4 additions & 0 deletions packages/shared/src/react/stable-keys.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ const ENTERPRISE_CONNECTION_TEST_RUNS_KEY = 'enterpriseConnectionTestRuns';
const ORGANIZATION_ENTERPRISE_CONNECTIONS_KEY = 'organizationEnterpriseConnections';
const ORGANIZATION_ENTERPRISE_CONNECTION_TEST_RUNS_KEY = 'organizationEnterpriseConnectionTestRuns';
const ORGANIZATION_DOMAINS_KEY = 'organizationDomains';
const ORGANIZATION_DIRECTORY_SYNC_KEY = 'organizationDirectorySync';
const ORGANIZATION_DIRECTORY_SYNC_USERS_KEY = 'organizationDirectorySyncUsers';

const CREDIT_HISTORY_KEY = 'billing-credit-history';

Expand All @@ -96,6 +98,8 @@ export const INTERNAL_STABLE_KEYS = {
ORGANIZATION_ENTERPRISE_CONNECTIONS_KEY,
ORGANIZATION_ENTERPRISE_CONNECTION_TEST_RUNS_KEY,
ORGANIZATION_DOMAINS_KEY,
ORGANIZATION_DIRECTORY_SYNC_KEY,
ORGANIZATION_DIRECTORY_SYNC_USERS_KEY,
} as const;

export type __internal_ResourceCacheStableKey = (typeof INTERNAL_STABLE_KEYS)[keyof typeof INTERNAL_STABLE_KEYS];
Loading