Merge branch 'main' into fix/token-poller-race-condition

Author: jacekradko

.changeset/afraid-women-buy.md

@@ -0,0 +1,7 @@
+---
+'@clerk/clerk-js': patch
+---
+
+Prevent enable organization prompt from appearing if there is a session with a pending `choose-organization` task.
+
+This resolves an issue where, after organizations are enabled via the Dashboard, cached environment resources may cause the prompt to show again when the user is redirected to complete the `choose-organization` task.

.changeset/nice-planes-glow.md

@@ -0,0 +1,2 @@
+---
+---

.changeset/violet-carrots-pull.md

@@ -0,0 +1,5 @@
+---
+'@clerk/backend': minor
+---
+
+Export `UserDeletedJSON` type from API resources

integration/presets/envs.ts

@@ -42,15 +42,6 @@ const withEmailCodes = base
   .setEnvVariable('public', 'CLERK_PUBLISHABLE_KEY', instanceKeys.get('with-email-codes').pk)
   .setEnvVariable('private', 'CLERK_ENCRYPTION_KEY', constants.E2E_CLERK_ENCRYPTION_KEY || 'a-key');
 
-const withBroadcastChannel = withEmailCodes
-  .clone()
-  .setId('withBroadcastChannel')
-  .setEnvVariable(
-    'public',
-    'CLERK_JS_URL',
-    constants.E2E_APP_CLERK_JS || 'http://localhost:18211/clerk.channel.browser.js',
-  );
-
 const sessionsProd1 = base
   .clone()
   .setId('sessionsProd1')
@@ -201,7 +192,6 @@ export const envs = {
   withAPCore2ClerkV4,
   withBilling,
   withBillingJwtV2,
-  withBroadcastChannel,
   withCustomRoles,
   withDynamicKeys,
   withEmailCodes,

packages/backend/src/index.ts

@@ -93,6 +93,7 @@ export type {
   SignUpVerificationsJSON,
   SMSMessageJSON,
   UserJSON,
+  UserDeletedJSON,
   VerificationJSON,
   WaitlistEntryJSON,
   Web3WalletJSON,

packages/clerk-js/bundlewatch.config.json

@@ -2,7 +2,6 @@
   "files": [
     { "path": "./dist/clerk.js", "maxSize": "840KB" },
     { "path": "./dist/clerk.browser.js", "maxSize": "83KB" },
-    { "path": "./dist/clerk.channel.browser.js", "maxSize": "83KB" },
     { "path": "./dist/clerk.legacy.browser.js", "maxSize": "127KB" },
     { "path": "./dist/clerk.headless*.js", "maxSize": "65KB" },
     { "path": "./dist/ui-common*.js", "maxSize": "119KB" },

packages/clerk-js/package.json

@@ -42,7 +42,6 @@
     "bundlewatch:fix": "node bundlewatch-fix.mjs",
     "clean": "rimraf ./dist",
     "dev": "rspack serve --config rspack.config.js",
-    "dev:channel": "rspack serve --config rspack.config.js --env variant=\"clerk.channel.browser\"",
     "dev:chips": "rspack serve --config rspack.config.js --env variant=\"clerk.chips.browser\"",
     "dev:headless": "rspack serve --config rspack.config.js --env variant=\"clerk.headless.browser\"",
     "dev:origin": "rspack serve --config rspack.config.js --env devOrigin=http://localhost:${PORT:-4000}",

packages/clerk-js/rspack.config.js

@@ -17,7 +17,6 @@ const variants = {
   clerkHeadlessBrowser: 'clerk.headless.browser',
   clerkLegacyBrowser: 'clerk.legacy.browser',
   clerkCHIPS: 'clerk.chips.browser',
-  clerkChannelBrowser: 'clerk.channel.browser',
 };
 
 const variantToSourceFile = {
@@ -28,7 +27,6 @@ const variantToSourceFile = {
   [variants.clerkHeadlessBrowser]: './src/index.headless.browser.ts',
   [variants.clerkLegacyBrowser]: './src/index.legacy.browser.ts',
   [variants.clerkCHIPS]: './src/index.browser.ts',
-  [variants.clerkChannelBrowser]: './src/index.browser.ts',
 };
 
 /**
@@ -60,7 +58,6 @@ const common = ({ mode, variant, disableRHC = false }) => {
          */
         __BUILD_FLAG_KEYLESS_UI__: isDevelopment(mode),
         __BUILD_DISABLE_RHC__: JSON.stringify(disableRHC),
-        __BUILD_VARIANT_CHANNEL__: variant === variants.clerkChannelBrowser,
         __BUILD_VARIANT_CHIPS__: variant === variants.clerkCHIPS,
       }),
       new rspack.EnvironmentPlugin({
@@ -433,13 +430,6 @@ const prodConfig = ({ mode, env, analysis }) => {
     commonForProdChunked(),
   );
 
-  const clerkChannelBrowser = merge(
-    entryForVariant(variants.clerkChannelBrowser),
-    common({ mode, variant: variants.clerkChannelBrowser }),
-    commonForProd(),
-    commonForProdChunked(),
-  );
-
   const clerkEsm = merge(
     entryForVariant(variants.clerk),
     common({ mode, variant: variants.clerk }),
@@ -554,7 +544,6 @@ const prodConfig = ({ mode, env, analysis }) => {
     clerkHeadless,
     clerkHeadlessBrowser,
     clerkCHIPS,
-    clerkChannelBrowser,
     clerkEsm,
     clerkEsmNoRHC,
     clerkCjs,
@@ -662,11 +651,6 @@ const devConfig = ({ mode, env }) => {
       common({ mode, variant: variants.clerkCHIPS }),
       commonForDev(),
     ),
-    [variants.clerkChannelBrowser]: merge(
-      entryForVariant(variants.clerkChannelBrowser),
-      common({ mode, variant: variants.clerkChannelBrowser }),
-      commonForDev(),
-    ),
   };
 
   if (!entryToConfigMap[variant]) {

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

@@ -2510,6 +2510,11 @@ describe('Clerk singleton', () => {
   });
 
   describe('__internal_attemptToEnableEnvironmentSetting', () => {
+    afterEach(() => {
+      mockEnvironmentFetch.mockReset();
+      mockClientFetch.mockReset();
+    });
+
     describe('for organizations', () => {
       it('does not open prompt if organizations is enabled in development', async () => {
         mockEnvironmentFetch.mockReturnValue(
@@ -2630,6 +2635,68 @@ describe('Clerk singleton', () => {
         expect(result?.isEnabled).toBe(false);
         expect(__internal_openEnableOrganizationsPromptSpy).not.toHaveBeenCalled();
       });
+
+      // Handles case where environment gets enabled via BAPI, but it gets cached and the user is redirected to the choose-organization task
+      // The enable org prompt should not appear in the task screen since orgs have already been enabled
+      it('does not open prompt if organizations is disabled in development and session has choose-organization task', async () => {
+        const mockSession = {
+          id: '1',
+          remove: vi.fn(),
+          status: 'pending',
+          user: {},
+          touch: vi.fn(() => Promise.resolve()),
+          getToken: vi.fn(),
+          lastActiveToken: { getRawString: () => 'mocked-token' },
+          tasks: [{ key: 'choose-organization' }],
+          currentTask: { key: 'choose-organization' },
+          reload: vi.fn(() =>
+            Promise.resolve({
+              id: '1',
+              status: 'pending',
+              user: {},
+              tasks: [{ key: 'choose-organization' }],
+              currentTask: {
+                key: 'choose-organization',
+              },
+            }),
+          ),
+        };
+
+        mockEnvironmentFetch.mockReturnValue(
+          Promise.resolve({
+            userSettings: mockUserSettings,
+            displayConfig: mockDisplayConfig,
+            isSingleSession: () => false,
+            isProduction: () => false,
+            isDevelopmentOrStaging: () => true,
+            organizationSettings: {
+              enabled: false,
+            },
+          }),
+        );
+
+        mockClientFetch.mockReturnValue(
+          Promise.resolve({
+            signedInSessions: [mockSession],
+          }),
+        );
+
+        const sut = new Clerk(developmentPublishableKey);
+
+        const __internal_openEnableOrganizationsPromptSpy = vi.fn();
+        sut.__internal_openEnableOrganizationsPrompt = __internal_openEnableOrganizationsPromptSpy;
+
+        await sut.load();
+
+        const result = await sut.__internal_attemptToEnableEnvironmentSetting({
+          for: 'organizations',
+          caller: 'OrganizationSwitcher',
+        });
+
+        // Contains the organization task, so the prompt should not be opened
+        expect(result?.isEnabled).toBe(true);
+        expect(__internal_openEnableOrganizationsPromptSpy).not.toHaveBeenCalled();
+      });
     });
   });
 });

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

@@ -761,7 +761,11 @@ export class Clerk implements ClerkInterface {
 
     switch (setting) {
       case 'organizations': {
-        const isSettingDisabled = disabledOrganizationsFeature(this, this.environment);
+        const isSettingDisabled =
+          disabledOrganizationsFeature(this, this.environment) &&
+          // Handles case where environment gets enabled via BAPI, but it gets cached and the user is redirected to the choose-organization task
+          // The enable org prompt should not appear in the task screen since orgs have already been enabled
+          this.session?.currentTask?.key !== 'choose-organization';
 
         if (!isSettingDisabled) {
           return { isEnabled: true };