fix(shared): Fix useClearQueriesOnSignOut hook defects

[jacekradko]

Description

Fix several defects in useClearQueriesOnSignOut hook and its call sites that could cause React hook order failures and incorrect behavior during authentication state transitions.

Changes

1. useClearQueriesOnSignOut.ts

• Moved authenticated check inside useEffect to comply with React Rules of Hooks
• Removed eslint-disable-next-line react-hooks/rules-of-hooks comment
• Added authenticated to the dependency array

2. useOrganizationList.tsx, useOrganization.tsx, useAPIKeys.rq.tsx, useAPIKeys.swr.tsx

• Changed authenticated: Boolean(user) → authenticated: true
• Changed isSignedIn: Boolean(user) → isSignedIn: user !== null
• Changed isSignedIn: Boolean(organization) → isSignedIn: organization !== null

3. Added useClearQueriesOnSignOut.spec.ts

• 13 new tests covering hook order stability, sign-out transitions, and edge cases

Fixes: USER-4251

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

Release Notes

• Bug Fixes

  • Fixed useClearQueriesOnSignOut hook to properly clear queries when signing out.

• Tests

  • Added comprehensive test suite for useClearQueriesOnSignOut hook, validating query clearing behavior and authentication state transitions.

_{✏️ Tip: You can customize this high-level summary in your review settings.}

[vercel]

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

Project	Deployment	Review	Updated (UTC)
clerk-js-sandbox	Ready	Preview, Comment	Jan 7, 2026 4:05am

[changeset-bot]

🦋 Changeset detected

Latest commit: 47b7f20

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/expo-passkeys	Patch
@clerk/expo	Patch
@clerk/express	Patch
@clerk/fastify	Patch
@clerk/localizations	Patch
@clerk/nextjs	Patch
@clerk/nuxt	Patch
@clerk/react-router	Patch
@clerk/react	Patch
@clerk/tanstack-react-start	Patch
@clerk/testing	Patch
@clerk/ui	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

[pkg-pr-new]

Open in StackBlitz

@clerk/agent-toolkit

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

@clerk/astro

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

@clerk/backend

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

@clerk/chrome-extension

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

@clerk/clerk-js

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

@clerk/dev-cli

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

@clerk/expo

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

@clerk/expo-passkeys

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

@clerk/express

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

@clerk/fastify

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

@clerk/localizations

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

@clerk/nextjs

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

@clerk/nuxt

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

@clerk/react

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

@clerk/react-router

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

@clerk/shared

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

@clerk/tanstack-react-start

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

@clerk/testing

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

@clerk/ui

npm i https://pkg.pr.new/@clerk/ui@7544

@clerk/upgrade

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

@clerk/vue

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

commit: 47b7f20

[coderabbitai]

📝 Walkthrough

Walkthrough

This pull request addresses bugs in the useClearQueriesOnSignOut hook and related call sites. The main changes include: moving the authentication guard from an early return into the useEffect body in useClearQueriesOnSignOut, replacing explicit Boolean casts with explicit null comparisons (!== null) for sign-in state checks across multiple hooks, and changing the authenticated flag in cache keys from Boolean user evaluations to hardcoded true values. Additionally, a comprehensive test suite is added for the hook to validate query clearing behavior across various authentication state transitions.

Pre-merge checks

✅ Passed checks (5 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title 'fix(shared): Fix useClearQueriesOnSignOut hook defects' accurately summarizes the main change: fixing defects in the useClearQueriesOnSignOut hook and its call sites.
Linked Issues check	✅ Passed	All three coding requirements from USER-4251 are met: authenticated check moved inside useEffect [USER-4251], authenticated hardcoded to true across call sites [USER-4251], and isSignedIn changed to explicit null-checks [USER-4251].
Out of Scope Changes check	✅ Passed	All changes directly address the linked issue objectives: useClearQueriesOnSignOut hook fix, authenticated hardcoding at call sites, isSignedIn null-checks, and comprehensive test coverage.
Docstring Coverage	✅ Passed	Docstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.

---

📜 Recent review details

Configuration used: Repository YAML (base), Organization UI (inherited)

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 158c604 and 47b7f20.

📒 Files selected for processing (7)

• .changeset/polite-cars-lose.md
• packages/shared/src/react/hooks/__tests__/useClearQueriesOnSignOut.spec.ts
• packages/shared/src/react/hooks/useAPIKeys.rq.tsx
• packages/shared/src/react/hooks/useAPIKeys.swr.tsx
• packages/shared/src/react/hooks/useClearQueriesOnSignOut.ts
• packages/shared/src/react/hooks/useOrganization.tsx
• packages/shared/src/react/hooks/useOrganizationList.tsx

🧰 Additional context used

📓 Path-based instructions (15)

**/*.{js,jsx,ts,tsx}

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

All code must pass ESLint checks with the project's configuration

Files:

• packages/shared/src/react/hooks/useClearQueriesOnSignOut.ts
• packages/shared/src/react/hooks/useAPIKeys.rq.tsx
• packages/shared/src/react/hooks/useAPIKeys.swr.tsx
• packages/shared/src/react/hooks/__tests__/useClearQueriesOnSignOut.spec.ts
• packages/shared/src/react/hooks/useOrganizationList.tsx
• packages/shared/src/react/hooks/useOrganization.tsx

**/*.{js,jsx,ts,tsx,json,md,yml,yaml}

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

Use Prettier for consistent code formatting

Files:

• packages/shared/src/react/hooks/useClearQueriesOnSignOut.ts
• packages/shared/src/react/hooks/useAPIKeys.rq.tsx
• packages/shared/src/react/hooks/useAPIKeys.swr.tsx
• packages/shared/src/react/hooks/__tests__/useClearQueriesOnSignOut.spec.ts
• packages/shared/src/react/hooks/useOrganizationList.tsx
• packages/shared/src/react/hooks/useOrganization.tsx

packages/**/src/**/*.{ts,tsx}

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

TypeScript is required for all packages

Files:

• packages/shared/src/react/hooks/useClearQueriesOnSignOut.ts
• packages/shared/src/react/hooks/useAPIKeys.rq.tsx
• packages/shared/src/react/hooks/useAPIKeys.swr.tsx
• packages/shared/src/react/hooks/__tests__/useClearQueriesOnSignOut.spec.ts
• packages/shared/src/react/hooks/useOrganizationList.tsx
• packages/shared/src/react/hooks/useOrganization.tsx

**/*.{ts,tsx,js,jsx}

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

Follow established naming conventions (PascalCase for components, camelCase for variables)

Files:

• packages/shared/src/react/hooks/useClearQueriesOnSignOut.ts
• packages/shared/src/react/hooks/useAPIKeys.rq.tsx
• packages/shared/src/react/hooks/useAPIKeys.swr.tsx
• packages/shared/src/react/hooks/__tests__/useClearQueriesOnSignOut.spec.ts
• packages/shared/src/react/hooks/useOrganizationList.tsx
• packages/shared/src/react/hooks/useOrganization.tsx

packages/**/src/**/*.{ts,tsx,js,jsx}

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

packages/**/src/**/*.{ts,tsx,js,jsx}: Maintain comprehensive JSDoc comments for public APIs
Use tree-shaking friendly exports
Validate all inputs and sanitize outputs
All public APIs must be documented with JSDoc
Use dynamic imports for optional features
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
Implement proper logging with different levels

Files:

• packages/shared/src/react/hooks/useClearQueriesOnSignOut.ts
• packages/shared/src/react/hooks/useAPIKeys.rq.tsx
• packages/shared/src/react/hooks/useAPIKeys.swr.tsx
• packages/shared/src/react/hooks/__tests__/useClearQueriesOnSignOut.spec.ts
• packages/shared/src/react/hooks/useOrganizationList.tsx
• packages/shared/src/react/hooks/useOrganization.tsx

**/*.ts?(x)

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

Use proper TypeScript error types

Files:

• packages/shared/src/react/hooks/useClearQueriesOnSignOut.ts
• packages/shared/src/react/hooks/useAPIKeys.rq.tsx
• packages/shared/src/react/hooks/useAPIKeys.swr.tsx
• packages/shared/src/react/hooks/__tests__/useClearQueriesOnSignOut.spec.ts
• packages/shared/src/react/hooks/useOrganizationList.tsx
• packages/shared/src/react/hooks/useOrganization.tsx

**/*.{ts,tsx}

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

**/*.{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
Implement type guards for unknown types using the pattern function isType(value: unknown): value is Type
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 in classes
Use protected for inheritance hierarchies
Use public explicitly for clarity in public APIs
Use mixins for shared behavior across unrelated classes in TypeScript
Use generic constraints with bounded type parameters like <T extends { id: string }>
Use utility types like Omit, Partial, and Pick for data transformation instead of manual type construction
Use discriminated unions instead of boolean flags for state management and API responses
Use mapped types for transforming object types
Use conditional types for type-level logic
Leverage template literal types for string manipulation at the type level
Use ES6 imports/exports consistently
Use default exports sparingly, prefer named exports
Document functions with JSDoc comments including @param, @returns, @throws, and @example tags
Create custom error classes that extend Error for specific error types
Use the Result pattern for error handling instead of throwing exceptions
Use optional chaining (?.) and nullish coalescing (??) operators for safe property access
Let TypeScript infer obvious types to reduce verbosity
Use const assertions with as const for literal types
Use satisfies operator for type checking without widening types
Declare readonly arrays and objects for immutable data structures
Use spread operator and array spread for immutable updates instead of mutations
Use lazy loading for large types...

Files:

• packages/shared/src/react/hooks/useClearQueriesOnSignOut.ts
• packages/shared/src/react/hooks/useAPIKeys.rq.tsx
• packages/shared/src/react/hooks/useAPIKeys.swr.tsx
• packages/shared/src/react/hooks/__tests__/useClearQueriesOnSignOut.spec.ts
• packages/shared/src/react/hooks/useOrganizationList.tsx
• packages/shared/src/react/hooks/useOrganization.tsx

**/*.{js,ts,jsx,tsx}

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

Use ESLint with custom configurations tailored for different package types

Files:

• packages/shared/src/react/hooks/useClearQueriesOnSignOut.ts
• packages/shared/src/react/hooks/useAPIKeys.rq.tsx
• packages/shared/src/react/hooks/useAPIKeys.swr.tsx
• packages/shared/src/react/hooks/__tests__/useClearQueriesOnSignOut.spec.ts
• packages/shared/src/react/hooks/useOrganizationList.tsx
• packages/shared/src/react/hooks/useOrganization.tsx

**/*.{js,ts,jsx,tsx,json,md,yml,yaml}

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

Use Prettier for code formatting across all packages

Files:

• packages/shared/src/react/hooks/useClearQueriesOnSignOut.ts
• packages/shared/src/react/hooks/useAPIKeys.rq.tsx
• packages/shared/src/react/hooks/useAPIKeys.swr.tsx
• packages/shared/src/react/hooks/__tests__/useClearQueriesOnSignOut.spec.ts
• packages/shared/src/react/hooks/useOrganizationList.tsx
• packages/shared/src/react/hooks/useOrganization.tsx

**/*

⚙️ CodeRabbit configuration file

If there are no tests added or modified as part of the PR, please suggest that tests be added to cover the changes.

**/*: Only comment on issues that would block merging, ignore minor or stylistic concerns.
Restrict feedback to errors, security risks, or functionality-breaking problems.
Do not post comments on code style, formatting, or non-critical improvements.
Keep reviews short: flag only issues that make the PR unsafe to merge.
Group similar issues into a single comment instead of posting multiple notes.
Skip repetition: if a pattern repeats, mention it once at a summary level only.
Do not add general suggestions, focus strictly on merge-blocking concerns.
If there are no critical problems, respond with minimal approval (e.g., 'Looks good'). Do not add additional review.
Avoid line-by-line commentary unless it highlights a critical bug or security hole.
Highlight only issues that could cause runtime errors, data loss, or severe maintainability issues.
Ignore minor optimization opportunities, focus solely on correctness and safety.
Provide a top-level summary of critical blockers rather than detailed per-line notes.
Comment only when the issue must be resolved before merge, otherwise remain silent.
When in doubt, err on the side of fewer comments, brevity and blocking issues only.
Avoid posting any refactoring issues.

Files:

• packages/shared/src/react/hooks/useClearQueriesOnSignOut.ts
• packages/shared/src/react/hooks/useAPIKeys.rq.tsx
• packages/shared/src/react/hooks/useAPIKeys.swr.tsx
• packages/shared/src/react/hooks/__tests__/useClearQueriesOnSignOut.spec.ts
• packages/shared/src/react/hooks/useOrganizationList.tsx
• packages/shared/src/react/hooks/useOrganization.tsx

**/*.tsx

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

**/*.tsx: Use error boundaries in React components
Minimize re-renders in React components

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

Files:

• packages/shared/src/react/hooks/useAPIKeys.rq.tsx
• packages/shared/src/react/hooks/useAPIKeys.swr.tsx
• packages/shared/src/react/hooks/useOrganizationList.tsx
• packages/shared/src/react/hooks/useOrganization.tsx

**/*.{md,tsx}

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

Update documentation for API changes

Files:

• packages/shared/src/react/hooks/useAPIKeys.rq.tsx
• packages/shared/src/react/hooks/useAPIKeys.swr.tsx
• packages/shared/src/react/hooks/useOrganizationList.tsx
• packages/shared/src/react/hooks/useOrganization.tsx

**/*.{jsx,tsx}

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

**/*.{jsx,tsx}: Always use functional components with hooks instead of class components
Follow PascalCase naming for components (e.g., 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
Separate UI components from business logic components
Use useState for simple state management in React components
Use useReducer for complex state logic in React components
Implement proper state initialization in React components
Use proper state updates with callbacks in React components
Implement proper state cleanup in React components
Use Context API for theme/authentication state management
Implement proper state persistence in React applications
Use React.memo for expensive components
Implement proper useCallback for handlers in React components
Use proper useMemo for expensive computations in React components
Implement proper virtualization for lists in React components
Use proper code splitting with React.lazy in React applications
Implement proper cleanup in useEffect hooks
Use proper refs for DOM access in React components
Implement proper event listener cleanup in React components
Use proper abort controllers for fetch in React components
Implement proper subscription cleanup in React components
Use proper HTML elements for semantic HTML in React components
Implement proper ARIA attributes for accessibility in React components
Use proper heading hierarchy in React components
Implement proper form labels in React components
Use proper button types in React components
Implement proper focus management for keyboard navigation in React components
Use proper keyboard shortcuts in React components
Implement proper tab order in React components
Use proper ...

Files:

• packages/shared/src/react/hooks/useAPIKeys.rq.tsx
• packages/shared/src/react/hooks/useAPIKeys.swr.tsx
• packages/shared/src/react/hooks/useOrganizationList.tsx
• packages/shared/src/react/hooks/useOrganization.tsx

**/*.{test,spec}.{ts,tsx,js,jsx}

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

**/*.{test,spec}.{ts,tsx,js,jsx}: Unit tests are required for all new functionality
Verify proper error handling and edge cases
Include tests for all new features

Files:

• packages/shared/src/react/hooks/__tests__/useClearQueriesOnSignOut.spec.ts

**/*.{test,spec,e2e}.{ts,tsx,js,jsx}

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

Use real Clerk instances for integration tests

Files:

• packages/shared/src/react/hooks/__tests__/useClearQueriesOnSignOut.spec.ts

🧬 Code graph analysis (5)

packages/shared/src/react/hooks/useAPIKeys.rq.tsx (2)

packages/shared/src/react/hooks/createCacheKeys.ts (1)

• createCacheKeys (7-23)

packages/shared/src/react/stable-keys.ts (1)

• STABLE_KEYS (30-51)

packages/shared/src/react/hooks/useAPIKeys.swr.tsx (2)

packages/shared/src/react/hooks/createCacheKeys.ts (1)

• createCacheKeys (7-23)

packages/shared/src/react/stable-keys.ts (1)

• STABLE_KEYS (30-51)

packages/shared/src/react/hooks/__tests__/useClearQueriesOnSignOut.spec.ts (1)

packages/shared/src/react/hooks/useClearQueriesOnSignOut.ts (2)

• withInfiniteKey (6-6)
• useClearQueriesOnSignOut (28-61)

packages/shared/src/react/hooks/useOrganizationList.tsx (2)

packages/react/src/isomorphicClerk.ts (1)

• user (730-736)

packages/shared/src/react/hooks/createCacheKeys.ts (1)

• createCacheKeys (7-23)

packages/shared/src/react/hooks/useOrganization.tsx (3)

packages/react/src/isomorphicClerk.ts (1)

• organization (738-744)

packages/shared/src/react/hooks/createCacheKeys.ts (1)

• createCacheKeys (7-23)

packages/shared/src/react/stable-keys.ts (1)

• STABLE_KEYS (30-51)

⏰ 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). (25)

• GitHub Check: Integration Tests (billing, chrome, RQ)
• GitHub Check: Integration Tests (billing, chrome)
• GitHub Check: Integration Tests (machine, chrome, RQ)
• GitHub Check: Integration Tests (vue, chrome)
• GitHub Check: Integration Tests (nextjs, chrome, 16, RQ)
• GitHub Check: Integration Tests (handshake:staging, chrome)
• GitHub Check: Integration Tests (sessions, chrome)
• GitHub Check: Integration Tests (nextjs, chrome, 15)
• GitHub Check: Integration Tests (machine, chrome)
• GitHub Check: Integration Tests (astro, chrome)
• GitHub Check: Integration Tests (nuxt, chrome)
• GitHub Check: Integration Tests (quickstart, chrome, 15)
• GitHub Check: Integration Tests (localhost, chrome)
• GitHub Check: Integration Tests (sessions:staging, chrome)
• GitHub Check: Integration Tests (quickstart, chrome, 16)
• GitHub Check: Integration Tests (nextjs, chrome, 16)
• GitHub Check: Integration Tests (tanstack-react-start, chrome)
• GitHub Check: Integration Tests (express, chrome)
• GitHub Check: Integration Tests (handshake, chrome)
• GitHub Check: Integration Tests (custom, chrome)
• GitHub Check: Integration Tests (react-router, chrome)
• GitHub Check: Integration Tests (ap-flows, chrome)
• GitHub Check: Integration Tests (generic, chrome)
• GitHub Check: Analyze (javascript-typescript)
• GitHub Check: semgrep-cloud-platform/scan

🔇 Additional comments (2)

packages/shared/src/react/hooks/__tests__/useClearQueriesOnSignOut.spec.ts (1)

1-317: Tests look comprehensive and correct.

The test suite thoroughly covers hook order stability, sign-out transitions, authenticated parameter behavior, onCleanup callback timing, and state transitions. No critical issues found.

packages/shared/src/react/hooks/useOrganizationList.tsx (1)

319-319: The original review comment incorrectly identifies a critical issue with the user !== null check.

The code is correct. The user type from useUserContext() is explicitly UserResource | null | undefined (as defined in packages/shared/src/react/contexts.tsx line 20), not just UserResource | undefined. This enables a three-state model:

• user === undefined: loading state
• user === null: signed out state
• user === UserResource: signed in state

The change from Boolean(user) to user !== null correctly distinguishes between loading (where undefined !== null = true) and signed out (where null !== null = false). This pattern aligns with the PR's objective to avoid undesired cache clearing during transitive loading states.

This identical pattern already exists throughout the codebase (e.g., usePaymentAttemptQuery.rq.tsx:33, useStatementQuery.rq.tsx:33, createBillingPaginatedHook.tsx:132).

Likely an incorrect or invalid review comment.

---

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