Merge branch 'main' into jr/integration-build-serve

Author: jacekradko

.changeset/fifty-suits-vanish.md

@@ -0,0 +1,5 @@
+---
+"@clerk/backend": patch
+---
+
+Added date filter parameters to user list endpoint

.changeset/fix-legacy-clerkuictor-compat.md

@@ -0,0 +1,5 @@
+---
+'@clerk/clerk-js': patch
+---
+
+Fix backwards compatibility for legacy `clerkUICtor` option removed in the `ui` prop PR

.changeset/ready-cats-tease.md

@@ -0,0 +1,5 @@
+---
+'@clerk/astro': patch
+---
+
+Fixed an issue when using `ClientRouter` where Clerk components don't load until navigation is performed.

.changeset/thin-camels-refuse.md

@@ -0,0 +1,5 @@
+---
+"@clerk/ui": patch
+---
+
+Fixed an issue where primary identifier in OAuth consent screen shows undefined when signing in with phone number only

packages/astro/src/integration/create-integration.ts

@@ -125,9 +125,10 @@ function createIntegration<Params extends HotloadAstroClerkIntegrationParams>()
             }
 
             if (transitionEnabledOnThisPage()) {
-              const { navigate, swapFunctions } = await import('astro:transitions/client');
+              // We must do the dynamic imports within the event listeners because otherwise we may race and miss initial astro:page-load
+              document.addEventListener('astro:before-swap', async (e) => {
+                const { swapFunctions } = await import('astro:transitions/client');
 
-              document.addEventListener('astro:before-swap', (e) => {
                 const clerkComponents = document.querySelector('#clerk-components');
                 // Keep the div element added by Clerk
                 if (clerkComponents) {
@@ -139,6 +140,8 @@ function createIntegration<Params extends HotloadAstroClerkIntegrationParams>()
               });
 
               document.addEventListener('astro:page-load', async (e) => {
+                const { navigate } = await import('astro:transitions/client');
+
                 await runInjectionScript({
                   ...${JSON.stringify(internalParams)},
                   routerPush: navigate,

packages/backend/src/api/endpoints/UserApi.ts

@@ -40,7 +40,14 @@ type UserListParams = ClerkPaginationRequest<
       | 'last_active_at'
       | 'last_sign_in_at'
     >;
+    /**
+     * @deprecated Use `lastActiveAtAfter` instead. This parameter will be removed in a future version.
+     */
     last_active_at_since?: number;
+    lastActiveAtBefore?: number;
+    lastActiveAtAfter?: number;
+    createdAtBefore?: number;
+    createdAtAfter?: number;
     lastSignInAtAfter?: number;
     lastSignInAtBefore?: number;
     organizationId?: string[];

packages/clerk-js/bundlewatch.config.json

@@ -1,6 +1,6 @@
 {
   "files": [
-    { "path": "./dist/clerk.js", "maxSize": "538KB" },
+    { "path": "./dist/clerk.js", "maxSize": "539KB" },
     { "path": "./dist/clerk.browser.js", "maxSize": "66KB" },
     { "path": "./dist/clerk.chips.browser.js", "maxSize": "66KB" },
     { "path": "./dist/clerk.legacy.browser.js", "maxSize": "106KB" },

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

@@ -2830,5 +2830,31 @@ describe('Clerk singleton', () => {
 
       expect(mockClerkUICtor).toHaveBeenCalled();
     });
+
+    it('supports legacy clerkUICtor option for backwards compatibility', async () => {
+      const mockClerkUIInstance = { mount: vi.fn() };
+      const mockClerkUICtor = vi.fn(() => mockClerkUIInstance);
+
+      const sut = new Clerk(productionPublishableKey);
+      await sut.load({
+        ...mockedLoadOptions,
+        clerkUICtor: mockClerkUICtor,
+      } as any);
+
+      expect(mockClerkUICtor).toHaveBeenCalled();
+    });
+
+    it('supports legacy clerkUiCtor option for backwards compatibility', async () => {
+      const mockClerkUIInstance = { mount: vi.fn() };
+      const mockClerkUICtor = vi.fn(() => mockClerkUIInstance);
+
+      const sut = new Clerk(productionPublishableKey);
+      await sut.load({
+        ...mockedLoadOptions,
+        clerkUiCtor: mockClerkUICtor,
+      } as any);
+
+      expect(mockClerkUICtor).toHaveBeenCalled();
+    });
   });
 });

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

@@ -3277,9 +3277,18 @@ export class Clerk implements ClerkInterface {
   };
 
   #initOptions = (options?: ClerkOptions): ClerkOptions => {
+    // Support legacy clerkUICtor / clerkUiCtor options from older SDK versions.
+    // Convert to the new ui.ClerkUI format so the rest of the codebase only checks one path.
+    const legacy = options as Record<string, unknown> | undefined;
+    const legacyCtor = legacy?.clerkUICtor ?? legacy?.clerkUiCtor;
+    const ui = legacyCtor
+      ? { ...options?.ui, ClerkUI: legacyCtor as NonNullable<ClerkOptions['ui']>['ClerkUI'] }
+      : options?.ui;
+
     return {
       ...defaultOptions,
       ...options,
+      ui,
       allowedRedirectOrigins: createAllowedRedirectOrigins(
         options?.allowedRedirectOrigins,
         this.frontendApi,

packages/ui/src/components/OAuthConsent/OAuthConsent.tsx

@@ -25,7 +25,7 @@ export function OAuthConsentInternal() {
   const { applicationName, logoImageUrl } = useEnvironment().displayConfig;
   const [isUriModalOpen, setIsUriModalOpen] = useState(false);
 
-  const primaryEmailAddress = user?.emailAddresses.find(email => email.id === user.primaryEmailAddress?.id);
+  const primaryIdentifier = user?.primaryEmailAddress?.emailAddress || user?.primaryPhoneNumber?.phoneNumber;
 
   // Filter out offline_access from displayed scopes as it doesn't describe what can be accessed
   const displayedScopes = (scopes || []).filter(item => item.scope !== OFFLINE_ACCESS_SCOPE);
@@ -106,9 +106,7 @@ export function OAuthConsentInternal() {
               </ConnectionHeader>
             )}
             <Header.Title localizationKey={oAuthApplicationName} />
-            <Header.Subtitle
-              localizationKey={`wants to access ${applicationName} on behalf of ${primaryEmailAddress}`}
-            />
+            <Header.Subtitle localizationKey={`wants to access ${applicationName} on behalf of ${primaryIdentifier}`} />
           </Header.Root>
           <Box
             sx={t => ({