Skip to content
Merged
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
6 changes: 6 additions & 0 deletions .changeset/orange-eggs-start.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@clerk/shared': patch
'@clerk/types': patch
---

Remove `treatPendingAsSignedOut` from `useSession` and always return pending session
14 changes: 5 additions & 9 deletions packages/shared/src/react/hooks/useSession.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type { PendingSessionOptions, UseSessionReturn } from '@clerk/types';
import type { UseSessionReturn } from '@clerk/types';

import { eventMethodCalled } from '../../telemetry/events/method-called';
import { useAssertWrappedByClerkProvider, useClerkInstanceContext, useSessionContext } from '../contexts';

type UseSession = (options?: PendingSessionOptions) => UseSessionReturn;
type UseSession = () => UseSessionReturn;

const hookName = `useSession`;
/**
Expand Down Expand Up @@ -55,7 +55,7 @@ const hookName = `useSession`;
* </Tab>
* </Tabs>
*/
export const useSession: UseSession = (options = {}) => {
export const useSession: UseSession = () => {
useAssertWrappedByClerkProvider(hookName);

const session = useSessionContext();
Expand All @@ -67,13 +67,9 @@ export const useSession: UseSession = (options = {}) => {
return { isLoaded: false, isSignedIn: undefined, session: undefined };
}

const pendingAsSignedOut =
session?.status === 'pending' &&
(options.treatPendingAsSignedOut ?? clerk.__internal_getOption('treatPendingAsSignedOut'));
const isSignedOut = session === null || pendingAsSignedOut;
if (isSignedOut) {
if (session === null) {
return { isLoaded: true, isSignedIn: false, session: null };
}

return { isLoaded: true, isSignedIn: true, session };
return { isLoaded: true, isSignedIn: clerk.isSignedIn, session };
};
2 changes: 1 addition & 1 deletion packages/types/src/hooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ export type UseSessionReturn =
}
| {
isLoaded: true;
isSignedIn: true;
isSignedIn: boolean;
session: SignedInSessionResource;
};

Expand Down
Loading