Skip to content

Conversation

@panteliselef
Copy link
Member

@panteliselef panteliselef commented Oct 24, 2025

Description

The new tests would fail prior to this fix.

Checklist

  • pnpm test runs as expected.
  • pnpm build runs as expected.
  • (If applicable) JSDoc comments have been added or updated for any package exports
  • (If applicable) Documentation has been updated

Type of change

  • 🐛 Bug fix
  • 🌟 New feature
  • 🔨 Breaking change
  • 📖 Refactoring / dependency upgrade / documentation
  • other:

Summary by CodeRabbit

  • Bug Fixes

    • Plan data now refreshes reliably when switching between user and organization views; counts and context-specific plans display correctly.
    • Ensured the correct organization context is used for both authenticated and unauthenticated flows.
  • Tests

    • Added tests covering concurrent user/org views and preventing parameter leakage between contexts.
  • Chores

    • Prepared a patch changeset for a patch release.

@panteliselef panteliselef self-assigned this Oct 24, 2025
@vercel
Copy link

vercel bot commented Oct 24, 2025

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Preview Comments Updated (UTC)
clerk-js-sandbox Ready Ready Preview Comment Oct 25, 2025 2:10am

@changeset-bot
Copy link

changeset-bot bot commented Oct 24, 2025

🦋 Changeset detected

Latest commit: bf211d3

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 19 packages
Name Type
@clerk/shared Patch
@clerk/agent-toolkit Patch
@clerk/astro Patch
@clerk/backend Patch
@clerk/chrome-extension Patch
@clerk/clerk-js Patch
@clerk/elements Patch
@clerk/expo-passkeys Patch
@clerk/clerk-expo Patch
@clerk/express Patch
@clerk/fastify Patch
@clerk/nextjs Patch
@clerk/nuxt Patch
@clerk/react-router Patch
@clerk/clerk-react Patch
@clerk/remix Patch
@clerk/tanstack-react-start Patch
@clerk/testing Patch
@clerk/vue Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Oct 24, 2025

Note

Currently processing new changes in this PR. This may take a few minutes, please wait...

📥 Commits

Reviewing files that changed from the base of the PR and between 123552a and bf211d3.

📒 Files selected for processing (1)
  • packages/shared/src/react/hooks/__tests__/usePlans.spec.tsx (4 hunks)
 ______________________________________________________
< GPU fans at max RPM: ready to blow away regressions. >
 ------------------------------------------------------
  \
   \   \
        \ /\
        ( )
      .( o ).

Tip

You can disable the changed files summary in the walkthrough.

Disable the reviews.changed_files_summary setting in your project's settings in CodeRabbit to disable the changed files summary in the walkthrough.

Walkthrough

Fixes a bug in usePlans() where stale data persisted when the for property changed by normalizing the for value via safeFor/isForOrganization and routing fetches and result shaping through that normalized value.

Changes

Cohort / File(s) Summary
Billing hook logic
packages/shared/src/react/hooks/createBillingPaginatedHook.tsx
Adds safeFor (default 'user') and isForOrganization; replaces direct _for checks with isForOrganization for fetch parameters, billingEnabled selection, and result payload construction to ensure consistent routing of for across authenticated/unauthenticated paths.
Tests for usePlans
packages/shared/src/react/hooks/__tests__/usePlans.spec.tsx
Updates mocks to include a for field and adds tests that mount user and organization hooks together, and conditional rendering tests to assert correct fetch calls and absence of parameter leakage.
Release note
.changeset/bitter-paths-march.md
Adds a patch changeset for @clerk/shared documenting the bug fix for stale data in usePlans() when for changes.

Sequence Diagram(s)

sequenceDiagram
  participant Component as Consumer Component
  participant Hook as createBillingPaginatedHook
  participant Fetch as fetchFn
  Note over Hook: safeFor := normalize(_for) (default 'user')\nisForOrganization := (safeFor === 'organization')
  Component->>Hook: call hook(...) with _for
  Hook->>Hook: derive safeFor, isForOrganization\nbuild hookParams (orgId only if isForOrganization && auth)
  Hook->>Fetch: fetch(hookParams)
  Fetch-->>Hook: data (each item includes `for`: safeFor)
  Hook-->>Component: normalized result (includes orgId when isForOrganization/authenticated)
  alt subsequent renders with changed `_for`
    Component->>Hook: call hook(...) with new _for
    Hook->>Hook: derive new safeFor -> ensures fresh fetch with correct params
  end
Loading

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Poem

🐰
I hopped through props and found a trail,
stale plans behind a shifting veil.
safeFor set the pathway straight,
now each fetch finds the proper gate.
Nibbles of bugs — gone without fail.

Pre-merge checks and finishing touches

✅ Passed checks (3 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title Check ✅ Passed The pull request title "fix(shared): Add for in cache key for unauthed hooks" directly aligns with the primary objective and changes in this pull request. The changeset confirms this is a bug fix for @clerk/shared addressing stale data in usePlans() when the for property changed. The code changes in createBillingPaginatedHook.tsx introduce safeFor routing and ensure the for field is consistently used in fetch logic, which directly implements the cache key differentiation described in the title. The title is concise, uses standard commit conventions, and clearly communicates the core change without unnecessary noise.
Docstring Coverage ✅ Passed Docstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.

Comment @coderabbitai help to get the list of available commands and usage tips.

@pkg-pr-new
Copy link

pkg-pr-new bot commented Oct 24, 2025

Open in StackBlitz

@clerk/agent-toolkit

npm i https://pkg.pr.new/@clerk/agent-toolkit@7067

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@7067

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@7067

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@7067

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@7067

@clerk/dev-cli

npm i https://pkg.pr.new/@clerk/dev-cli@7067

@clerk/elements

npm i https://pkg.pr.new/@clerk/elements@7067

@clerk/clerk-expo

npm i https://pkg.pr.new/@clerk/clerk-expo@7067

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@7067

@clerk/express

npm i https://pkg.pr.new/@clerk/express@7067

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@7067

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@7067

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@7067

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@7067

@clerk/clerk-react

npm i https://pkg.pr.new/@clerk/clerk-react@7067

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@7067

@clerk/remix

npm i https://pkg.pr.new/@clerk/remix@7067

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@7067

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@7067

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@7067

@clerk/themes

npm i https://pkg.pr.new/@clerk/themes@7067

@clerk/types

npm i https://pkg.pr.new/@clerk/types@7067

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@7067

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@7067

commit: bf211d3

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

📜 Review details

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Disabled knowledge base sources:

  • Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

📥 Commits

Reviewing files that changed from the base of the PR and between d1a186c and 9b4e135.

📒 Files selected for processing (3)
  • .changeset/bitter-paths-march.md (1 hunks)
  • packages/shared/src/react/hooks/__tests__/usePlans.spec.tsx (3 hunks)
  • packages/shared/src/react/hooks/createBillingPaginatedHook.tsx (3 hunks)
🧰 Additional context used
📓 Path-based instructions (11)
.changeset/**

📄 CodeRabbit inference engine (.cursor/rules/monorepo.mdc)

Automated releases must use Changesets.

Files:

  • .changeset/bitter-paths-march.md
**/*.{js,jsx,ts,tsx}

📄 CodeRabbit inference engine (.cursor/rules/development.mdc)

**/*.{js,jsx,ts,tsx}: All code must pass ESLint checks with the project's configuration
Follow established naming conventions (PascalCase for components, camelCase for variables)
Maintain comprehensive JSDoc comments for public APIs
Use dynamic imports for optional features
All public APIs must be documented with JSDoc
Provide meaningful error messages to developers
Include error recovery suggestions where applicable
Log errors appropriately for debugging
Lazy load components and features when possible
Implement proper caching strategies
Use efficient data structures and algorithms
Profile and optimize critical paths
Validate all inputs and sanitize outputs
Implement proper logging with different levels

Files:

  • packages/shared/src/react/hooks/__tests__/usePlans.spec.tsx
  • packages/shared/src/react/hooks/createBillingPaginatedHook.tsx
**/*.{js,jsx,ts,tsx,json,css,scss,md,yaml,yml}

📄 CodeRabbit inference engine (.cursor/rules/development.mdc)

Use Prettier for consistent code formatting

Files:

  • packages/shared/src/react/hooks/__tests__/usePlans.spec.tsx
  • packages/shared/src/react/hooks/createBillingPaginatedHook.tsx
packages/**/*.{ts,tsx}

📄 CodeRabbit inference engine (.cursor/rules/development.mdc)

TypeScript is required for all packages

Files:

  • packages/shared/src/react/hooks/__tests__/usePlans.spec.tsx
  • packages/shared/src/react/hooks/createBillingPaginatedHook.tsx
packages/**/*.{ts,tsx,d.ts}

📄 CodeRabbit inference engine (.cursor/rules/development.mdc)

Packages should export TypeScript types alongside runtime code

Files:

  • packages/shared/src/react/hooks/__tests__/usePlans.spec.tsx
  • packages/shared/src/react/hooks/createBillingPaginatedHook.tsx
**/*.{ts,tsx}

📄 CodeRabbit inference engine (.cursor/rules/development.mdc)

Use proper TypeScript error types

**/*.{ts,tsx}: Always define explicit return types for functions, especially public APIs
Use proper type annotations for variables and parameters where inference isn't clear
Avoid any type - prefer unknown when type is uncertain, then narrow with type guards
Use interface for object shapes that might be extended
Use type for unions, primitives, and computed types
Prefer readonly properties for immutable data structures
Use private for internal implementation details
Use protected for inheritance hierarchies
Use public explicitly for clarity in public APIs
Prefer readonly for properties that shouldn't change after construction
Prefer composition and interfaces over deep inheritance chains
Use mixins for shared behavior across unrelated classes
Implement dependency injection for loose coupling
Let TypeScript infer when types are obvious
Use const assertions for literal types: as const
Use satisfies operator for type checking without widening
Use mapped types for transforming object types
Use conditional types for type-level logic
Leverage template literal types for string manipulation
Use ES6 imports/exports consistently
Use default exports sparingly, prefer named exports
Use type-only imports: import type { ... } from ...
No any types without justification
Proper error handling with typed errors
Consistent use of readonly for immutable data
Proper generic constraints
No unused type parameters
Proper use of utility types instead of manual type construction
Type-only imports where possible
Proper tree-shaking friendly exports
No circular dependencies
Efficient type computations (avoid deep recursion)

Files:

  • packages/shared/src/react/hooks/__tests__/usePlans.spec.tsx
  • packages/shared/src/react/hooks/createBillingPaginatedHook.tsx
**/*.{jsx,tsx}

📄 CodeRabbit inference engine (.cursor/rules/development.mdc)

**/*.{jsx,tsx}: Use error boundaries in React components
Minimize re-renders in React components

**/*.{jsx,tsx}: Always use functional components with hooks instead of class components
Follow PascalCase naming for components: UserProfile, NavigationMenu
Keep components focused on a single responsibility - split large components
Limit component size to 150-200 lines; extract logic into custom hooks
Use composition over inheritance - prefer smaller, composable components
Export components as named exports for better tree-shaking
One component per file with matching filename and component name
Use useState for simple state management
Use useReducer for complex state logic
Implement proper state initialization
Use proper state updates with callbacks
Implement proper state cleanup
Use Context API for theme/authentication
Implement proper state selectors
Use proper state normalization
Implement proper state persistence
Use React.memo for expensive components
Implement proper useCallback for handlers
Use proper useMemo for expensive computations
Implement proper virtualization for lists
Use proper code splitting with React.lazy
Implement proper cleanup in useEffect
Use proper refs for DOM access
Implement proper event listener cleanup
Use proper abort controllers for fetch
Implement proper subscription cleanup
Use proper HTML elements
Implement proper ARIA attributes
Use proper heading hierarchy
Implement proper form labels
Use proper button types
Implement proper focus management
Use proper keyboard shortcuts
Implement proper tab order
Use proper skip links
Implement proper focus traps
Implement proper error boundaries
Use proper error logging
Implement proper error recovery
Use proper error messages
Implement proper error fallbacks
Use proper form validation
Implement proper error states
Use proper error messages
Implement proper form submission
Use proper form reset
Use proper component naming
Implement proper file naming
Use proper prop naming
Implement proper...

Files:

  • packages/shared/src/react/hooks/__tests__/usePlans.spec.tsx
  • packages/shared/src/react/hooks/createBillingPaginatedHook.tsx
packages/**/*.{test,spec}.{js,jsx,ts,tsx}

📄 CodeRabbit inference engine (.cursor/rules/monorepo.mdc)

Unit tests should use Jest or Vitest as the test runner.

Files:

  • packages/shared/src/react/hooks/__tests__/usePlans.spec.tsx
**/*.{js,ts,tsx,jsx}

📄 CodeRabbit inference engine (.cursor/rules/monorepo.mdc)

Support multiple Clerk environment variables (CLERK_, NEXT_PUBLIC_CLERK_, etc.) for configuration.

Files:

  • packages/shared/src/react/hooks/__tests__/usePlans.spec.tsx
  • packages/shared/src/react/hooks/createBillingPaginatedHook.tsx
**/*.tsx

📄 CodeRabbit inference engine (.cursor/rules/react.mdc)

**/*.tsx: Use proper type definitions for props and state
Leverage TypeScript's type inference where possible
Use proper event types for handlers
Implement proper generic types for reusable components
Use proper type guards for conditional rendering

Files:

  • packages/shared/src/react/hooks/__tests__/usePlans.spec.tsx
  • packages/shared/src/react/hooks/createBillingPaginatedHook.tsx
**/__tests__/**/*.{ts,tsx}

📄 CodeRabbit inference engine (.cursor/rules/typescript.mdc)

**/__tests__/**/*.{ts,tsx}: Create type-safe test builders/factories
Use branded types for test isolation
Implement proper mock types that match interfaces

Files:

  • packages/shared/src/react/hooks/__tests__/usePlans.spec.tsx
🧬 Code graph analysis (2)
packages/shared/src/react/hooks/__tests__/usePlans.spec.tsx (1)
packages/shared/src/react/hooks/usePlans.tsx (1)
  • usePlans (9-22)
packages/shared/src/react/hooks/createBillingPaginatedHook.tsx (1)
packages/react/src/isomorphicClerk.ts (1)
  • organization (698-704)
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (5)
  • GitHub Check: Build Packages
  • GitHub Check: Formatting | Dedupe | Changeset
  • GitHub Check: semgrep-cloud-platform/scan
  • GitHub Check: semgrep-cloud-platform/scan
  • GitHub Check: Analyze (javascript-typescript)
🔇 Additional comments (10)
.changeset/bitter-paths-march.md (1)

1-5: LGTM!

The changeset follows the proper format and accurately describes the bug fix.

packages/shared/src/react/hooks/__tests__/usePlans.spec.tsx (3)

11-11: LGTM!

The mock data correctly includes the for field to align with the updated behavior.


117-148: LGTM!

This test effectively verifies that user and organization hooks maintain separate cache keys and don't interfere with each other, which is crucial for preventing the stale data bug.


150-180: LGTM!

This test directly addresses the PR's core objective by verifying that changing the for property triggers the correct fetch with updated parameters, preventing stale data.

packages/shared/src/react/hooks/createBillingPaginatedHook.tsx (6)

56-56: LGTM!

Introducing safeFor with a default value of 'user' ensures consistent behavior when the for parameter is not provided.


60-60: LGTM!

Using safeFor ensures the fetcher always receives a valid 'user' or 'organization' value.


79-79: LGTM!

Deriving isForOrganization from safeFor centralizes the organization logic and improves code maintainability.


87-87: LGTM!

Using isForOrganization consistently improves code clarity and maintainability.


90-92: LGTM!

Using isForOrganization for billing enablement check maintains consistency with the refactored logic.


112-112: LGTM!

Using isForOrganization for conditional orgId inclusion in the authenticated branch maintains consistency with the refactored logic.

@panteliselef panteliselef merged commit 791ff19 into main Oct 25, 2025
66 of 69 checks passed
@panteliselef panteliselef deleted the elef/bill-1370-bug-user-plans-visible-in-organization-profile-on-staging branch October 25, 2025 02:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants