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
5 changes: 5 additions & 0 deletions .changeset/warm-tickets-finish.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/react': patch
---

Ensure ticket-based sign-in and sign-up flows started before Clerk finishes loading can be finalized successfully.
167 changes: 167 additions & 0 deletions packages/react/src/__tests__/stateProxy.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
import type { SignInFutureResource, SignUpFutureResource } from '@clerk/shared/types';
import { describe, expect, it, vi } from 'vitest';

import { StateProxy } from '../stateProxy';

describe('StateProxy', () => {
it('preserves a completed sign-in across chained calls when the client clears its sign-in attempt', async () => {
const emptySignIn = {
status: 'needs_identifier',
createdSessionId: null as string | null,
ticket: vi.fn(() => Promise.resolve({ error: null })),
finalize: vi.fn(() => Promise.reject(new Error('Cannot finalize sign-in without a created session.'))),
};
const completedSignIn = {
status: 'needs_identifier',
createdSessionId: null as string | null,
ticket: vi.fn(() => {
client.signIn = { __internal_future: emptySignIn };
completedSignIn.status = 'complete';
completedSignIn.createdSessionId = 'sess_123';
return Promise.resolve({ error: null });
}),
finalize: vi.fn(() => Promise.resolve({ error: null })),
};
const client = {
signIn: { __internal_future: completedSignIn },
};
const state = {
signInSignal: () => ({ signIn: completedSignIn }),
};
const loadedCallbacks: Array<() => void> = [];
const isomorphicClerk = {
loaded: false,
client,
__internal_state: state,
addOnLoaded: vi.fn((callback: () => void) => loadedCallbacks.push(callback)),
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

const ticketPromise = signIn.ticket({ ticket: 'ticket_123' });
expect(isomorphicClerk.addOnLoaded).toHaveBeenCalledOnce();
expect(completedSignIn.ticket).not.toHaveBeenCalled();

isomorphicClerk.loaded = true;
loadedCallbacks.forEach(callback => callback());
await ticketPromise;

await expect(signIn.finalize()).resolves.toEqual({ error: null });
Comment thread
coderabbitai[bot] marked this conversation as resolved.
expect(signIn.status).toBe('complete');
expect(signIn.createdSessionId).toBe('sess_123');
expect(completedSignIn.finalize).toHaveBeenCalledOnce();
expect(emptySignIn.finalize).not.toHaveBeenCalled();
});

it('preserves a completed sign-up across chained calls when the client clears its sign-up attempt', async () => {
const emptySignUp = {
status: 'missing_requirements',
createdSessionId: null as string | null,
ticket: vi.fn(() => Promise.resolve({ error: null })),
finalize: vi.fn(() =>
Promise.resolve({ error: new Error('Cannot finalize sign-up without a created session.') }),
),
};
const completedSignUp = {
status: 'missing_requirements',
createdSessionId: null as string | null,
ticket: vi.fn(() => {
client.signUp = { __internal_future: emptySignUp };
completedSignUp.status = 'complete';
completedSignUp.createdSessionId = 'sess_123';
return Promise.resolve({ error: null });
}),
finalize: vi.fn(() => Promise.resolve({ error: null })),
};
const client: {
signUp: { __internal_future: typeof completedSignUp | typeof emptySignUp };
} = {
signUp: { __internal_future: completedSignUp },
};
const state = {
signUpSignal: () => ({ signUp: completedSignUp }),
};
const loadedCallbacks: Array<() => void> = [];
const isomorphicClerk = {
loaded: false,
client,
__internal_state: state,
addOnLoaded: vi.fn((callback: () => void) => loadedCallbacks.push(callback)),
};
const signUp = new StateProxy(isomorphicClerk as any).signUpSignal().signUp as SignUpFutureResource;

const ticketPromise = signUp.ticket({ ticket: 'ticket_123' });
expect(isomorphicClerk.addOnLoaded).toHaveBeenCalledOnce();
expect(completedSignUp.ticket).not.toHaveBeenCalled();

isomorphicClerk.loaded = true;
loadedCallbacks.forEach(callback => callback());
await ticketPromise;

await expect(signUp.finalize()).resolves.toEqual({ error: null });
expect(signUp.status).toBe('complete');
expect(signUp.createdSessionId).toBe('sess_123');
expect(completedSignUp.finalize).toHaveBeenCalledOnce();
expect(emptySignUp.finalize).not.toHaveBeenCalled();
});

it('falls back to the client sign-in when the state signal is empty', async () => {
const clientSignIn = {
status: 'needs_first_factor',
create: vi.fn(() => Promise.resolve({ error: null })),
};
const isomorphicClerk = {
loaded: true,
client: { signIn: { __internal_future: clientSignIn } },
__internal_state: { signInSignal: () => ({ signIn: null }) },
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

await expect(signIn.create({ identifier: 'test@example.com' })).resolves.toEqual({ error: null });
expect(signIn.status).toBe('needs_first_factor');
expect(clientSignIn.create).toHaveBeenCalledOnce();
});

it('uses a newer sign-in from the state signal instead of the client attempt', async () => {
const clientSignIn = {
finalize: vi.fn(() => Promise.reject(new Error('Finalized the stale client sign-in.'))),
};
const currentSignIn = {
finalize: vi.fn(() => Promise.resolve({ error: null })),
};
const isomorphicClerk = {
loaded: true,
client: { signIn: { __internal_future: clientSignIn } },
__internal_state: { signInSignal: () => ({ signIn: currentSignIn }) },
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

await expect(signIn.finalize()).resolves.toEqual({ error: null });
expect(currentSignIn.finalize).toHaveBeenCalledOnce();
expect(clientSignIn.finalize).not.toHaveBeenCalled();
});

it('falls back to the fresh client sign-in after the retained state attempt is cleared', async () => {
const clientSignIn = {
status: 'needs_identifier',
};
let stateSignIn: { status: string; finalize: ReturnType<typeof vi.fn> } | null;
const completedSignIn = {
status: 'complete',
finalize: vi.fn(() => {
stateSignIn = null;
return Promise.resolve({ error: null });
}),
};
stateSignIn = completedSignIn;
const isomorphicClerk = {
loaded: true,
client: { signIn: { __internal_future: clientSignIn } },
__internal_state: { signInSignal: () => ({ signIn: stateSignIn }) },
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

expect(signIn.status).toBe('complete');
await expect(signIn.finalize()).resolves.toEqual({ error: null });
expect(signIn.status).toBe('needs_identifier');
});
});
8 changes: 5 additions & 3 deletions packages/react/src/stateProxy.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -134,13 +134,15 @@ export class StateProxy implements State {

private buildSignInProxy() {
const gateProperty = this.gateProperty.bind(this);
const target = () => this.client.signIn.__internal_future;
const target = () => this.state.signInSignal().signIn ?? this.client.signIn.__internal_future;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

in what case would signInSignal().signIn have a different value than the Clerk client? I don't think that's supposed to happen.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

typically they match, but after a ticket completes, the client can replace signIn with an empty attempt while the state signal keeps the completed attempt until finalize() or reset(). the proxy was calling finalize() on the new empty client attempt instead of the retained one

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

{
"response": {
"object": "sign_in_attempt",
"id": "sia_REDACTED",
"status": "complete",
"supported_identifiers": [
"email_address"
],
"supported_first_factors": null,
"supported_second_factors": null,
"first_factor_verification": {
"object": "verification_ticket",
"status": "verified",
"strategy": "ticket",
"attempts": null,
"expire_at": null
},
"second_factor_verification": null,
"identifier": "REDACTED",
"user_data": null,
"created_session_id": "sess_REDACTED",
"abandon_at": "REDACTED_TIMESTAMP",
"locale": "en-US"
},
"client": {
"object": "client",
"id": "client_REDACTED",
"sessions": [
{
"object": "session",
"id": "sess_REDACTED",
"status": "active",
"expire_at": "REDACTED_TIMESTAMP",
"abandon_at": "REDACTED_TIMESTAMP",
"last_active_at": "REDACTED_TIMESTAMP",
"last_active_organization_id": null,
"actor": null,
"user": "REDACTED_USER_OBJECT",
"public_user_data": "REDACTED_PUBLIC_USER_DATA",
"factor_verification_age": [
0,
-1
],
"created_at": "REDACTED_TIMESTAMP",
"updated_at": "REDACTED_TIMESTAMP",
"last_active_token": {
"object": "token",
"jwt": "REDACTED_JWT"
}
}
],
"sign_in": null,
"sign_up": null,
"last_active_session_id": "sess_REDACTED",
"last_authentication_strategy": "ticket",
"cookie_expires_at": null,
"captcha_bypass": false,
"created_at": "REDACTED_TIMESTAMP",
"updated_at": "REDACTED_TIMESTAMP"
}
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Ah yes, this makes sense. When we complete the sign-in from an API request the piggybacked response contains an empty sign-in for the client, which gets propagated to client.signIn. However, we specifically do not propagate this to the signal, which is what the hooks are based on (and what this proxy is being consumed through). I think this should be fine then! We might consider just always calling the signal's value though, but we can do that in the future.


return {
errors: defaultSignInErrors(),
fetchStatus: 'idle' as const,
signIn: {
status: 'needs_identifier' as const,
get status() {
return gateProperty(target, 'status', 'needs_identifier');
},
Comment on lines +143 to +145

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this makes sense to me!

availableStrategies: [],
get isTransferable() {
return gateProperty(target, 'isTransferable', false);
Expand DownExpand Up@@ -255,7 +257,7 @@ export class StateProxy implements State {
private buildSignUpProxy() {
const gateProperty = this.gateProperty.bind(this);
const gateMethod = this.gateMethod.bind(this);
const target = () => this.client.signUp.__internal_future;
const target = () => this.state.signUpSignal().signUp ?? this.client.signUp.__internal_future;

return {
errors: defaultSignUpErrors(),
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
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
5 changes: 5 additions & 0 deletions .changeset/warm-tickets-finish.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/react': patch
---

Ensure ticket-based sign-in and sign-up flows started before Clerk finishes loading can be finalized successfully.
167 changes: 167 additions & 0 deletions packages/react/src/__tests__/stateProxy.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
import type { SignInFutureResource, SignUpFutureResource } from '@clerk/shared/types';
import { describe, expect, it, vi } from 'vitest';

import { StateProxy } from '../stateProxy';

describe('StateProxy', () => {
it('preserves a completed sign-in across chained calls when the client clears its sign-in attempt', async () => {
const emptySignIn = {
status: 'needs_identifier',
createdSessionId: null as string | null,
ticket: vi.fn(() => Promise.resolve({ error: null })),
finalize: vi.fn(() => Promise.reject(new Error('Cannot finalize sign-in without a created session.'))),
};
const completedSignIn = {
status: 'needs_identifier',
createdSessionId: null as string | null,
ticket: vi.fn(() => {
client.signIn = { __internal_future: emptySignIn };
completedSignIn.status = 'complete';
completedSignIn.createdSessionId = 'sess_123';
return Promise.resolve({ error: null });
}),
finalize: vi.fn(() => Promise.resolve({ error: null })),
};
const client = {
signIn: { __internal_future: completedSignIn },
};
const state = {
signInSignal: () => ({ signIn: completedSignIn }),
};
const loadedCallbacks: Array<() => void> = [];
const isomorphicClerk = {
loaded: false,
client,
__internal_state: state,
addOnLoaded: vi.fn((callback: () => void) => loadedCallbacks.push(callback)),
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

const ticketPromise = signIn.ticket({ ticket: 'ticket_123' });
expect(isomorphicClerk.addOnLoaded).toHaveBeenCalledOnce();
expect(completedSignIn.ticket).not.toHaveBeenCalled();

isomorphicClerk.loaded = true;
loadedCallbacks.forEach(callback => callback());
await ticketPromise;

await expect(signIn.finalize()).resolves.toEqual({ error: null });
Comment thread
coderabbitai[bot] marked this conversation as resolved.
expect(signIn.status).toBe('complete');
expect(signIn.createdSessionId).toBe('sess_123');
expect(completedSignIn.finalize).toHaveBeenCalledOnce();
expect(emptySignIn.finalize).not.toHaveBeenCalled();
});

it('preserves a completed sign-up across chained calls when the client clears its sign-up attempt', async () => {
const emptySignUp = {
status: 'missing_requirements',
createdSessionId: null as string | null,
ticket: vi.fn(() => Promise.resolve({ error: null })),
finalize: vi.fn(() =>
Promise.resolve({ error: new Error('Cannot finalize sign-up without a created session.') }),
),
};
const completedSignUp = {
status: 'missing_requirements',
createdSessionId: null as string | null,
ticket: vi.fn(() => {
client.signUp = { __internal_future: emptySignUp };
completedSignUp.status = 'complete';
completedSignUp.createdSessionId = 'sess_123';
return Promise.resolve({ error: null });
}),
finalize: vi.fn(() => Promise.resolve({ error: null })),
};
const client: {
signUp: { __internal_future: typeof completedSignUp | typeof emptySignUp };
} = {
signUp: { __internal_future: completedSignUp },
};
const state = {
signUpSignal: () => ({ signUp: completedSignUp }),
};
const loadedCallbacks: Array<() => void> = [];
const isomorphicClerk = {
loaded: false,
client,
__internal_state: state,
addOnLoaded: vi.fn((callback: () => void) => loadedCallbacks.push(callback)),
};
const signUp = new StateProxy(isomorphicClerk as any).signUpSignal().signUp as SignUpFutureResource;

const ticketPromise = signUp.ticket({ ticket: 'ticket_123' });
expect(isomorphicClerk.addOnLoaded).toHaveBeenCalledOnce();
expect(completedSignUp.ticket).not.toHaveBeenCalled();

isomorphicClerk.loaded = true;
loadedCallbacks.forEach(callback => callback());
await ticketPromise;

await expect(signUp.finalize()).resolves.toEqual({ error: null });
expect(signUp.status).toBe('complete');
expect(signUp.createdSessionId).toBe('sess_123');
expect(completedSignUp.finalize).toHaveBeenCalledOnce();
expect(emptySignUp.finalize).not.toHaveBeenCalled();
});

it('falls back to the client sign-in when the state signal is empty', async () => {
const clientSignIn = {
status: 'needs_first_factor',
create: vi.fn(() => Promise.resolve({ error: null })),
};
const isomorphicClerk = {
loaded: true,
client: { signIn: { __internal_future: clientSignIn } },
__internal_state: { signInSignal: () => ({ signIn: null }) },
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

await expect(signIn.create({ identifier: 'test@example.com' })).resolves.toEqual({ error: null });
expect(signIn.status).toBe('needs_first_factor');
expect(clientSignIn.create).toHaveBeenCalledOnce();
});

it('uses a newer sign-in from the state signal instead of the client attempt', async () => {
const clientSignIn = {
finalize: vi.fn(() => Promise.reject(new Error('Finalized the stale client sign-in.'))),
};
const currentSignIn = {
finalize: vi.fn(() => Promise.resolve({ error: null })),
};
const isomorphicClerk = {
loaded: true,
client: { signIn: { __internal_future: clientSignIn } },
__internal_state: { signInSignal: () => ({ signIn: currentSignIn }) },
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

await expect(signIn.finalize()).resolves.toEqual({ error: null });
expect(currentSignIn.finalize).toHaveBeenCalledOnce();
expect(clientSignIn.finalize).not.toHaveBeenCalled();
});

it('falls back to the fresh client sign-in after the retained state attempt is cleared', async () => {
const clientSignIn = {
status: 'needs_identifier',
};
let stateSignIn: { status: string; finalize: ReturnType<typeof vi.fn> } | null;
const completedSignIn = {
status: 'complete',
finalize: vi.fn(() => {
stateSignIn = null;
return Promise.resolve({ error: null });
}),
};
stateSignIn = completedSignIn;
const isomorphicClerk = {
loaded: true,
client: { signIn: { __internal_future: clientSignIn } },
__internal_state: { signInSignal: () => ({ signIn: stateSignIn }) },
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

expect(signIn.status).toBe('complete');
await expect(signIn.finalize()).resolves.toEqual({ error: null });
expect(signIn.status).toBe('needs_identifier');
});
});
8 changes: 5 additions & 3 deletions packages/react/src/stateProxy.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -134,13 +134,15 @@ export class StateProxy implements State {

private buildSignInProxy() {
const gateProperty = this.gateProperty.bind(this);
const target = () => this.client.signIn.__internal_future;
const target = () => this.state.signInSignal().signIn ?? this.client.signIn.__internal_future;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

in what case would signInSignal().signIn have a different value than the Clerk client? I don't think that's supposed to happen.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

typically they match, but after a ticket completes, the client can replace signIn with an empty attempt while the state signal keeps the completed attempt until finalize() or reset(). the proxy was calling finalize() on the new empty client attempt instead of the retained one

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

{
"response": {
"object": "sign_in_attempt",
"id": "sia_REDACTED",
"status": "complete",
"supported_identifiers": [
"email_address"
],
"supported_first_factors": null,
"supported_second_factors": null,
"first_factor_verification": {
"object": "verification_ticket",
"status": "verified",
"strategy": "ticket",
"attempts": null,
"expire_at": null
},
"second_factor_verification": null,
"identifier": "REDACTED",
"user_data": null,
"created_session_id": "sess_REDACTED",
"abandon_at": "REDACTED_TIMESTAMP",
"locale": "en-US"
},
"client": {
"object": "client",
"id": "client_REDACTED",
"sessions": [
{
"object": "session",
"id": "sess_REDACTED",
"status": "active",
"expire_at": "REDACTED_TIMESTAMP",
"abandon_at": "REDACTED_TIMESTAMP",
"last_active_at": "REDACTED_TIMESTAMP",
"last_active_organization_id": null,
"actor": null,
"user": "REDACTED_USER_OBJECT",
"public_user_data": "REDACTED_PUBLIC_USER_DATA",
"factor_verification_age": [
0,
-1
],
"created_at": "REDACTED_TIMESTAMP",
"updated_at": "REDACTED_TIMESTAMP",
"last_active_token": {
"object": "token",
"jwt": "REDACTED_JWT"
}
}
],
"sign_in": null,
"sign_up": null,
"last_active_session_id": "sess_REDACTED",
"last_authentication_strategy": "ticket",
"cookie_expires_at": null,
"captcha_bypass": false,
"created_at": "REDACTED_TIMESTAMP",
"updated_at": "REDACTED_TIMESTAMP"
}
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Ah yes, this makes sense. When we complete the sign-in from an API request the piggybacked response contains an empty sign-in for the client, which gets propagated to client.signIn. However, we specifically do not propagate this to the signal, which is what the hooks are based on (and what this proxy is being consumed through). I think this should be fine then! We might consider just always calling the signal's value though, but we can do that in the future.


return {
errors: defaultSignInErrors(),
fetchStatus: 'idle' as const,
signIn: {
status: 'needs_identifier' as const,
get status() {
return gateProperty(target, 'status', 'needs_identifier');
},
Comment on lines +143 to +145

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this makes sense to me!

availableStrategies: [],
get isTransferable() {
return gateProperty(target, 'isTransferable', false);
Expand DownExpand Up@@ -255,7 +257,7 @@ export class StateProxy implements State {
private buildSignUpProxy() {
const gateProperty = this.gateProperty.bind(this);
const gateMethod = this.gateMethod.bind(this);
const target = () => this.client.signUp.__internal_future;
const target = () => this.state.signUpSignal().signUp ?? this.client.signUp.__internal_future;

return {
errors: defaultSignUpErrors(),
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
5 changes: 5 additions & 0 deletions .changeset/warm-tickets-finish.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/react': patch
---

Ensure ticket-based sign-in and sign-up flows started before Clerk finishes loading can be finalized successfully.
167 changes: 167 additions & 0 deletions packages/react/src/__tests__/stateProxy.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
import type { SignInFutureResource, SignUpFutureResource } from '@clerk/shared/types';
import { describe, expect, it, vi } from 'vitest';

import { StateProxy } from '../stateProxy';

describe('StateProxy', () => {
it('preserves a completed sign-in across chained calls when the client clears its sign-in attempt', async () => {
const emptySignIn = {
status: 'needs_identifier',
createdSessionId: null as string | null,
ticket: vi.fn(() => Promise.resolve({ error: null })),
finalize: vi.fn(() => Promise.reject(new Error('Cannot finalize sign-in without a created session.'))),
};
const completedSignIn = {
status: 'needs_identifier',
createdSessionId: null as string | null,
ticket: vi.fn(() => {
client.signIn = { __internal_future: emptySignIn };
completedSignIn.status = 'complete';
completedSignIn.createdSessionId = 'sess_123';
return Promise.resolve({ error: null });
}),
finalize: vi.fn(() => Promise.resolve({ error: null })),
};
const client = {
signIn: { __internal_future: completedSignIn },
};
const state = {
signInSignal: () => ({ signIn: completedSignIn }),
};
const loadedCallbacks: Array<() => void> = [];
const isomorphicClerk = {
loaded: false,
client,
__internal_state: state,
addOnLoaded: vi.fn((callback: () => void) => loadedCallbacks.push(callback)),
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

const ticketPromise = signIn.ticket({ ticket: 'ticket_123' });
expect(isomorphicClerk.addOnLoaded).toHaveBeenCalledOnce();
expect(completedSignIn.ticket).not.toHaveBeenCalled();

isomorphicClerk.loaded = true;
loadedCallbacks.forEach(callback => callback());
await ticketPromise;

await expect(signIn.finalize()).resolves.toEqual({ error: null });
Comment thread
coderabbitai[bot] marked this conversation as resolved.
expect(signIn.status).toBe('complete');
expect(signIn.createdSessionId).toBe('sess_123');
expect(completedSignIn.finalize).toHaveBeenCalledOnce();
expect(emptySignIn.finalize).not.toHaveBeenCalled();
});

it('preserves a completed sign-up across chained calls when the client clears its sign-up attempt', async () => {
const emptySignUp = {
status: 'missing_requirements',
createdSessionId: null as string | null,
ticket: vi.fn(() => Promise.resolve({ error: null })),
finalize: vi.fn(() =>
Promise.resolve({ error: new Error('Cannot finalize sign-up without a created session.') }),
),
};
const completedSignUp = {
status: 'missing_requirements',
createdSessionId: null as string | null,
ticket: vi.fn(() => {
client.signUp = { __internal_future: emptySignUp };
completedSignUp.status = 'complete';
completedSignUp.createdSessionId = 'sess_123';
return Promise.resolve({ error: null });
}),
finalize: vi.fn(() => Promise.resolve({ error: null })),
};
const client: {
signUp: { __internal_future: typeof completedSignUp | typeof emptySignUp };
} = {
signUp: { __internal_future: completedSignUp },
};
const state = {
signUpSignal: () => ({ signUp: completedSignUp }),
};
const loadedCallbacks: Array<() => void> = [];
const isomorphicClerk = {
loaded: false,
client,
__internal_state: state,
addOnLoaded: vi.fn((callback: () => void) => loadedCallbacks.push(callback)),
};
const signUp = new StateProxy(isomorphicClerk as any).signUpSignal().signUp as SignUpFutureResource;

const ticketPromise = signUp.ticket({ ticket: 'ticket_123' });
expect(isomorphicClerk.addOnLoaded).toHaveBeenCalledOnce();
expect(completedSignUp.ticket).not.toHaveBeenCalled();

isomorphicClerk.loaded = true;
loadedCallbacks.forEach(callback => callback());
await ticketPromise;

await expect(signUp.finalize()).resolves.toEqual({ error: null });
expect(signUp.status).toBe('complete');
expect(signUp.createdSessionId).toBe('sess_123');
expect(completedSignUp.finalize).toHaveBeenCalledOnce();
expect(emptySignUp.finalize).not.toHaveBeenCalled();
});

it('falls back to the client sign-in when the state signal is empty', async () => {
const clientSignIn = {
status: 'needs_first_factor',
create: vi.fn(() => Promise.resolve({ error: null })),
};
const isomorphicClerk = {
loaded: true,
client: { signIn: { __internal_future: clientSignIn } },
__internal_state: { signInSignal: () => ({ signIn: null }) },
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

await expect(signIn.create({ identifier: 'test@example.com' })).resolves.toEqual({ error: null });
expect(signIn.status).toBe('needs_first_factor');
expect(clientSignIn.create).toHaveBeenCalledOnce();
});

it('uses a newer sign-in from the state signal instead of the client attempt', async () => {
const clientSignIn = {
finalize: vi.fn(() => Promise.reject(new Error('Finalized the stale client sign-in.'))),
};
const currentSignIn = {
finalize: vi.fn(() => Promise.resolve({ error: null })),
};
const isomorphicClerk = {
loaded: true,
client: { signIn: { __internal_future: clientSignIn } },
__internal_state: { signInSignal: () => ({ signIn: currentSignIn }) },
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

await expect(signIn.finalize()).resolves.toEqual({ error: null });
expect(currentSignIn.finalize).toHaveBeenCalledOnce();
expect(clientSignIn.finalize).not.toHaveBeenCalled();
});

it('falls back to the fresh client sign-in after the retained state attempt is cleared', async () => {
const clientSignIn = {
status: 'needs_identifier',
};
let stateSignIn: { status: string; finalize: ReturnType<typeof vi.fn> } | null;
const completedSignIn = {
status: 'complete',
finalize: vi.fn(() => {
stateSignIn = null;
return Promise.resolve({ error: null });
}),
};
stateSignIn = completedSignIn;
const isomorphicClerk = {
loaded: true,
client: { signIn: { __internal_future: clientSignIn } },
__internal_state: { signInSignal: () => ({ signIn: stateSignIn }) },
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

expect(signIn.status).toBe('complete');
await expect(signIn.finalize()).resolves.toEqual({ error: null });
expect(signIn.status).toBe('needs_identifier');
});
});
8 changes: 5 additions & 3 deletions packages/react/src/stateProxy.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -134,13 +134,15 @@ export class StateProxy implements State {

private buildSignInProxy() {
const gateProperty = this.gateProperty.bind(this);
const target = () => this.client.signIn.__internal_future;
const target = () => this.state.signInSignal().signIn ?? this.client.signIn.__internal_future;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

in what case would signInSignal().signIn have a different value than the Clerk client? I don't think that's supposed to happen.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

typically they match, but after a ticket completes, the client can replace signIn with an empty attempt while the state signal keeps the completed attempt until finalize() or reset(). the proxy was calling finalize() on the new empty client attempt instead of the retained one

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

{
"response": {
"object": "sign_in_attempt",
"id": "sia_REDACTED",
"status": "complete",
"supported_identifiers": [
"email_address"
],
"supported_first_factors": null,
"supported_second_factors": null,
"first_factor_verification": {
"object": "verification_ticket",
"status": "verified",
"strategy": "ticket",
"attempts": null,
"expire_at": null
},
"second_factor_verification": null,
"identifier": "REDACTED",
"user_data": null,
"created_session_id": "sess_REDACTED",
"abandon_at": "REDACTED_TIMESTAMP",
"locale": "en-US"
},
"client": {
"object": "client",
"id": "client_REDACTED",
"sessions": [
{
"object": "session",
"id": "sess_REDACTED",
"status": "active",
"expire_at": "REDACTED_TIMESTAMP",
"abandon_at": "REDACTED_TIMESTAMP",
"last_active_at": "REDACTED_TIMESTAMP",
"last_active_organization_id": null,
"actor": null,
"user": "REDACTED_USER_OBJECT",
"public_user_data": "REDACTED_PUBLIC_USER_DATA",
"factor_verification_age": [
0,
-1
],
"created_at": "REDACTED_TIMESTAMP",
"updated_at": "REDACTED_TIMESTAMP",
"last_active_token": {
"object": "token",
"jwt": "REDACTED_JWT"
}
}
],
"sign_in": null,
"sign_up": null,
"last_active_session_id": "sess_REDACTED",
"last_authentication_strategy": "ticket",
"cookie_expires_at": null,
"captcha_bypass": false,
"created_at": "REDACTED_TIMESTAMP",
"updated_at": "REDACTED_TIMESTAMP"
}
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Ah yes, this makes sense. When we complete the sign-in from an API request the piggybacked response contains an empty sign-in for the client, which gets propagated to client.signIn. However, we specifically do not propagate this to the signal, which is what the hooks are based on (and what this proxy is being consumed through). I think this should be fine then! We might consider just always calling the signal's value though, but we can do that in the future.


return {
errors: defaultSignInErrors(),
fetchStatus: 'idle' as const,
signIn: {
status: 'needs_identifier' as const,
get status() {
return gateProperty(target, 'status', 'needs_identifier');
},
Comment on lines +143 to +145

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this makes sense to me!

availableStrategies: [],
get isTransferable() {
return gateProperty(target, 'isTransferable', false);
Expand DownExpand Up@@ -255,7 +257,7 @@ export class StateProxy implements State {
private buildSignUpProxy() {
const gateProperty = this.gateProperty.bind(this);
const gateMethod = this.gateMethod.bind(this);
const target = () => this.client.signUp.__internal_future;
const target = () => this.state.signUpSignal().signUp ?? this.client.signUp.__internal_future;

return {
errors: defaultSignUpErrors(),
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
5 changes: 5 additions & 0 deletions .changeset/warm-tickets-finish.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/react': patch
---

Ensure ticket-based sign-in and sign-up flows started before Clerk finishes loading can be finalized successfully.
167 changes: 167 additions & 0 deletions packages/react/src/__tests__/stateProxy.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
import type { SignInFutureResource, SignUpFutureResource } from '@clerk/shared/types';
import { describe, expect, it, vi } from 'vitest';

import { StateProxy } from '../stateProxy';

describe('StateProxy', () => {
it('preserves a completed sign-in across chained calls when the client clears its sign-in attempt', async () => {
const emptySignIn = {
status: 'needs_identifier',
createdSessionId: null as string | null,
ticket: vi.fn(() => Promise.resolve({ error: null })),
finalize: vi.fn(() => Promise.reject(new Error('Cannot finalize sign-in without a created session.'))),
};
const completedSignIn = {
status: 'needs_identifier',
createdSessionId: null as string | null,
ticket: vi.fn(() => {
client.signIn = { __internal_future: emptySignIn };
completedSignIn.status = 'complete';
completedSignIn.createdSessionId = 'sess_123';
return Promise.resolve({ error: null });
}),
finalize: vi.fn(() => Promise.resolve({ error: null })),
};
const client = {
signIn: { __internal_future: completedSignIn },
};
const state = {
signInSignal: () => ({ signIn: completedSignIn }),
};
const loadedCallbacks: Array<() => void> = [];
const isomorphicClerk = {
loaded: false,
client,
__internal_state: state,
addOnLoaded: vi.fn((callback: () => void) => loadedCallbacks.push(callback)),
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

const ticketPromise = signIn.ticket({ ticket: 'ticket_123' });
expect(isomorphicClerk.addOnLoaded).toHaveBeenCalledOnce();
expect(completedSignIn.ticket).not.toHaveBeenCalled();

isomorphicClerk.loaded = true;
loadedCallbacks.forEach(callback => callback());
await ticketPromise;

await expect(signIn.finalize()).resolves.toEqual({ error: null });
Comment thread
coderabbitai[bot] marked this conversation as resolved.
expect(signIn.status).toBe('complete');
expect(signIn.createdSessionId).toBe('sess_123');
expect(completedSignIn.finalize).toHaveBeenCalledOnce();
expect(emptySignIn.finalize).not.toHaveBeenCalled();
});

it('preserves a completed sign-up across chained calls when the client clears its sign-up attempt', async () => {
const emptySignUp = {
status: 'missing_requirements',
createdSessionId: null as string | null,
ticket: vi.fn(() => Promise.resolve({ error: null })),
finalize: vi.fn(() =>
Promise.resolve({ error: new Error('Cannot finalize sign-up without a created session.') }),
),
};
const completedSignUp = {
status: 'missing_requirements',
createdSessionId: null as string | null,
ticket: vi.fn(() => {
client.signUp = { __internal_future: emptySignUp };
completedSignUp.status = 'complete';
completedSignUp.createdSessionId = 'sess_123';
return Promise.resolve({ error: null });
}),
finalize: vi.fn(() => Promise.resolve({ error: null })),
};
const client: {
signUp: { __internal_future: typeof completedSignUp | typeof emptySignUp };
} = {
signUp: { __internal_future: completedSignUp },
};
const state = {
signUpSignal: () => ({ signUp: completedSignUp }),
};
const loadedCallbacks: Array<() => void> = [];
const isomorphicClerk = {
loaded: false,
client,
__internal_state: state,
addOnLoaded: vi.fn((callback: () => void) => loadedCallbacks.push(callback)),
};
const signUp = new StateProxy(isomorphicClerk as any).signUpSignal().signUp as SignUpFutureResource;

const ticketPromise = signUp.ticket({ ticket: 'ticket_123' });
expect(isomorphicClerk.addOnLoaded).toHaveBeenCalledOnce();
expect(completedSignUp.ticket).not.toHaveBeenCalled();

isomorphicClerk.loaded = true;
loadedCallbacks.forEach(callback => callback());
await ticketPromise;

await expect(signUp.finalize()).resolves.toEqual({ error: null });
expect(signUp.status).toBe('complete');
expect(signUp.createdSessionId).toBe('sess_123');
expect(completedSignUp.finalize).toHaveBeenCalledOnce();
expect(emptySignUp.finalize).not.toHaveBeenCalled();
});

it('falls back to the client sign-in when the state signal is empty', async () => {
const clientSignIn = {
status: 'needs_first_factor',
create: vi.fn(() => Promise.resolve({ error: null })),
};
const isomorphicClerk = {
loaded: true,
client: { signIn: { __internal_future: clientSignIn } },
__internal_state: { signInSignal: () => ({ signIn: null }) },
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

await expect(signIn.create({ identifier: 'test@example.com' })).resolves.toEqual({ error: null });
expect(signIn.status).toBe('needs_first_factor');
expect(clientSignIn.create).toHaveBeenCalledOnce();
});

it('uses a newer sign-in from the state signal instead of the client attempt', async () => {
const clientSignIn = {
finalize: vi.fn(() => Promise.reject(new Error('Finalized the stale client sign-in.'))),
};
const currentSignIn = {
finalize: vi.fn(() => Promise.resolve({ error: null })),
};
const isomorphicClerk = {
loaded: true,
client: { signIn: { __internal_future: clientSignIn } },
__internal_state: { signInSignal: () => ({ signIn: currentSignIn }) },
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

await expect(signIn.finalize()).resolves.toEqual({ error: null });
expect(currentSignIn.finalize).toHaveBeenCalledOnce();
expect(clientSignIn.finalize).not.toHaveBeenCalled();
});

it('falls back to the fresh client sign-in after the retained state attempt is cleared', async () => {
const clientSignIn = {
status: 'needs_identifier',
};
let stateSignIn: { status: string; finalize: ReturnType<typeof vi.fn> } | null;
const completedSignIn = {
status: 'complete',
finalize: vi.fn(() => {
stateSignIn = null;
return Promise.resolve({ error: null });
}),
};
stateSignIn = completedSignIn;
const isomorphicClerk = {
loaded: true,
client: { signIn: { __internal_future: clientSignIn } },
__internal_state: { signInSignal: () => ({ signIn: stateSignIn }) },
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

expect(signIn.status).toBe('complete');
await expect(signIn.finalize()).resolves.toEqual({ error: null });
expect(signIn.status).toBe('needs_identifier');
});
});
8 changes: 5 additions & 3 deletions packages/react/src/stateProxy.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -134,13 +134,15 @@ export class StateProxy implements State {

private buildSignInProxy() {
const gateProperty = this.gateProperty.bind(this);
const target = () => this.client.signIn.__internal_future;
const target = () => this.state.signInSignal().signIn ?? this.client.signIn.__internal_future;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

in what case would signInSignal().signIn have a different value than the Clerk client? I don't think that's supposed to happen.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

typically they match, but after a ticket completes, the client can replace signIn with an empty attempt while the state signal keeps the completed attempt until finalize() or reset(). the proxy was calling finalize() on the new empty client attempt instead of the retained one

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

{
"response": {
"object": "sign_in_attempt",
"id": "sia_REDACTED",
"status": "complete",
"supported_identifiers": [
"email_address"
],
"supported_first_factors": null,
"supported_second_factors": null,
"first_factor_verification": {
"object": "verification_ticket",
"status": "verified",
"strategy": "ticket",
"attempts": null,
"expire_at": null
},
"second_factor_verification": null,
"identifier": "REDACTED",
"user_data": null,
"created_session_id": "sess_REDACTED",
"abandon_at": "REDACTED_TIMESTAMP",
"locale": "en-US"
},
"client": {
"object": "client",
"id": "client_REDACTED",
"sessions": [
{
"object": "session",
"id": "sess_REDACTED",
"status": "active",
"expire_at": "REDACTED_TIMESTAMP",
"abandon_at": "REDACTED_TIMESTAMP",
"last_active_at": "REDACTED_TIMESTAMP",
"last_active_organization_id": null,
"actor": null,
"user": "REDACTED_USER_OBJECT",
"public_user_data": "REDACTED_PUBLIC_USER_DATA",
"factor_verification_age": [
0,
-1
],
"created_at": "REDACTED_TIMESTAMP",
"updated_at": "REDACTED_TIMESTAMP",
"last_active_token": {
"object": "token",
"jwt": "REDACTED_JWT"
}
}
],
"sign_in": null,
"sign_up": null,
"last_active_session_id": "sess_REDACTED",
"last_authentication_strategy": "ticket",
"cookie_expires_at": null,
"captcha_bypass": false,
"created_at": "REDACTED_TIMESTAMP",
"updated_at": "REDACTED_TIMESTAMP"
}
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Ah yes, this makes sense. When we complete the sign-in from an API request the piggybacked response contains an empty sign-in for the client, which gets propagated to client.signIn. However, we specifically do not propagate this to the signal, which is what the hooks are based on (and what this proxy is being consumed through). I think this should be fine then! We might consider just always calling the signal's value though, but we can do that in the future.


return {
errors: defaultSignInErrors(),
fetchStatus: 'idle' as const,
signIn: {
status: 'needs_identifier' as const,
get status() {
return gateProperty(target, 'status', 'needs_identifier');
},
Comment on lines +143 to +145

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this makes sense to me!

availableStrategies: [],
get isTransferable() {
return gateProperty(target, 'isTransferable', false);
Expand DownExpand Up@@ -255,7 +257,7 @@ export class StateProxy implements State {
private buildSignUpProxy() {
const gateProperty = this.gateProperty.bind(this);
const gateMethod = this.gateMethod.bind(this);
const target = () => this.client.signUp.__internal_future;
const target = () => this.state.signUpSignal().signUp ?? this.client.signUp.__internal_future;

return {
errors: defaultSignUpErrors(),
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
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
5 changes: 5 additions & 0 deletions .changeset/warm-tickets-finish.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/react': patch
---

Ensure ticket-based sign-in and sign-up flows started before Clerk finishes loading can be finalized successfully.
167 changes: 167 additions & 0 deletions packages/react/src/__tests__/stateProxy.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
import type { SignInFutureResource, SignUpFutureResource } from '@clerk/shared/types';
import { describe, expect, it, vi } from 'vitest';

import { StateProxy } from '../stateProxy';

describe('StateProxy', () => {
it('preserves a completed sign-in across chained calls when the client clears its sign-in attempt', async () => {
const emptySignIn = {
status: 'needs_identifier',
createdSessionId: null as string | null,
ticket: vi.fn(() => Promise.resolve({ error: null })),
finalize: vi.fn(() => Promise.reject(new Error('Cannot finalize sign-in without a created session.'))),
};
const completedSignIn = {
status: 'needs_identifier',
createdSessionId: null as string | null,
ticket: vi.fn(() => {
client.signIn = { __internal_future: emptySignIn };
completedSignIn.status = 'complete';
completedSignIn.createdSessionId = 'sess_123';
return Promise.resolve({ error: null });
}),
finalize: vi.fn(() => Promise.resolve({ error: null })),
};
const client = {
signIn: { __internal_future: completedSignIn },
};
const state = {
signInSignal: () => ({ signIn: completedSignIn }),
};
const loadedCallbacks: Array<() => void> = [];
const isomorphicClerk = {
loaded: false,
client,
__internal_state: state,
addOnLoaded: vi.fn((callback: () => void) => loadedCallbacks.push(callback)),
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

const ticketPromise = signIn.ticket({ ticket: 'ticket_123' });
expect(isomorphicClerk.addOnLoaded).toHaveBeenCalledOnce();
expect(completedSignIn.ticket).not.toHaveBeenCalled();

isomorphicClerk.loaded = true;
loadedCallbacks.forEach(callback => callback());
await ticketPromise;

await expect(signIn.finalize()).resolves.toEqual({ error: null });
Comment thread
coderabbitai[bot] marked this conversation as resolved.
expect(signIn.status).toBe('complete');
expect(signIn.createdSessionId).toBe('sess_123');
expect(completedSignIn.finalize).toHaveBeenCalledOnce();
expect(emptySignIn.finalize).not.toHaveBeenCalled();
});

it('preserves a completed sign-up across chained calls when the client clears its sign-up attempt', async () => {
const emptySignUp = {
status: 'missing_requirements',
createdSessionId: null as string | null,
ticket: vi.fn(() => Promise.resolve({ error: null })),
finalize: vi.fn(() =>
Promise.resolve({ error: new Error('Cannot finalize sign-up without a created session.') }),
),
};
const completedSignUp = {
status: 'missing_requirements',
createdSessionId: null as string | null,
ticket: vi.fn(() => {
client.signUp = { __internal_future: emptySignUp };
completedSignUp.status = 'complete';
completedSignUp.createdSessionId = 'sess_123';
return Promise.resolve({ error: null });
}),
finalize: vi.fn(() => Promise.resolve({ error: null })),
};
const client: {
signUp: { __internal_future: typeof completedSignUp | typeof emptySignUp };
} = {
signUp: { __internal_future: completedSignUp },
};
const state = {
signUpSignal: () => ({ signUp: completedSignUp }),
};
const loadedCallbacks: Array<() => void> = [];
const isomorphicClerk = {
loaded: false,
client,
__internal_state: state,
addOnLoaded: vi.fn((callback: () => void) => loadedCallbacks.push(callback)),
};
const signUp = new StateProxy(isomorphicClerk as any).signUpSignal().signUp as SignUpFutureResource;

const ticketPromise = signUp.ticket({ ticket: 'ticket_123' });
expect(isomorphicClerk.addOnLoaded).toHaveBeenCalledOnce();
expect(completedSignUp.ticket).not.toHaveBeenCalled();

isomorphicClerk.loaded = true;
loadedCallbacks.forEach(callback => callback());
await ticketPromise;

await expect(signUp.finalize()).resolves.toEqual({ error: null });
expect(signUp.status).toBe('complete');
expect(signUp.createdSessionId).toBe('sess_123');
expect(completedSignUp.finalize).toHaveBeenCalledOnce();
expect(emptySignUp.finalize).not.toHaveBeenCalled();
});

it('falls back to the client sign-in when the state signal is empty', async () => {
const clientSignIn = {
status: 'needs_first_factor',
create: vi.fn(() => Promise.resolve({ error: null })),
};
const isomorphicClerk = {
loaded: true,
client: { signIn: { __internal_future: clientSignIn } },
__internal_state: { signInSignal: () => ({ signIn: null }) },
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

await expect(signIn.create({ identifier: 'test@example.com' })).resolves.toEqual({ error: null });
expect(signIn.status).toBe('needs_first_factor');
expect(clientSignIn.create).toHaveBeenCalledOnce();
});

it('uses a newer sign-in from the state signal instead of the client attempt', async () => {
const clientSignIn = {
finalize: vi.fn(() => Promise.reject(new Error('Finalized the stale client sign-in.'))),
};
const currentSignIn = {
finalize: vi.fn(() => Promise.resolve({ error: null })),
};
const isomorphicClerk = {
loaded: true,
client: { signIn: { __internal_future: clientSignIn } },
__internal_state: { signInSignal: () => ({ signIn: currentSignIn }) },
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

await expect(signIn.finalize()).resolves.toEqual({ error: null });
expect(currentSignIn.finalize).toHaveBeenCalledOnce();
expect(clientSignIn.finalize).not.toHaveBeenCalled();
});

it('falls back to the fresh client sign-in after the retained state attempt is cleared', async () => {
const clientSignIn = {
status: 'needs_identifier',
};
let stateSignIn: { status: string; finalize: ReturnType<typeof vi.fn> } | null;
const completedSignIn = {
status: 'complete',
finalize: vi.fn(() => {
stateSignIn = null;
return Promise.resolve({ error: null });
}),
};
stateSignIn = completedSignIn;
const isomorphicClerk = {
loaded: true,
client: { signIn: { __internal_future: clientSignIn } },
__internal_state: { signInSignal: () => ({ signIn: stateSignIn }) },
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

expect(signIn.status).toBe('complete');
await expect(signIn.finalize()).resolves.toEqual({ error: null });
expect(signIn.status).toBe('needs_identifier');
});
});
8 changes: 5 additions & 3 deletions packages/react/src/stateProxy.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -134,13 +134,15 @@ export class StateProxy implements State {

private buildSignInProxy() {
const gateProperty = this.gateProperty.bind(this);
const target = () => this.client.signIn.__internal_future;
const target = () => this.state.signInSignal().signIn ?? this.client.signIn.__internal_future;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

in what case would signInSignal().signIn have a different value than the Clerk client? I don't think that's supposed to happen.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

typically they match, but after a ticket completes, the client can replace signIn with an empty attempt while the state signal keeps the completed attempt until finalize() or reset(). the proxy was calling finalize() on the new empty client attempt instead of the retained one

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

{
"response": {
"object": "sign_in_attempt",
"id": "sia_REDACTED",
"status": "complete",
"supported_identifiers": [
"email_address"
],
"supported_first_factors": null,
"supported_second_factors": null,
"first_factor_verification": {
"object": "verification_ticket",
"status": "verified",
"strategy": "ticket",
"attempts": null,
"expire_at": null
},
"second_factor_verification": null,
"identifier": "REDACTED",
"user_data": null,
"created_session_id": "sess_REDACTED",
"abandon_at": "REDACTED_TIMESTAMP",
"locale": "en-US"
},
"client": {
"object": "client",
"id": "client_REDACTED",
"sessions": [
{
"object": "session",
"id": "sess_REDACTED",
"status": "active",
"expire_at": "REDACTED_TIMESTAMP",
"abandon_at": "REDACTED_TIMESTAMP",
"last_active_at": "REDACTED_TIMESTAMP",
"last_active_organization_id": null,
"actor": null,
"user": "REDACTED_USER_OBJECT",
"public_user_data": "REDACTED_PUBLIC_USER_DATA",
"factor_verification_age": [
0,
-1
],
"created_at": "REDACTED_TIMESTAMP",
"updated_at": "REDACTED_TIMESTAMP",
"last_active_token": {
"object": "token",
"jwt": "REDACTED_JWT"
}
}
],
"sign_in": null,
"sign_up": null,
"last_active_session_id": "sess_REDACTED",
"last_authentication_strategy": "ticket",
"cookie_expires_at": null,
"captcha_bypass": false,
"created_at": "REDACTED_TIMESTAMP",
"updated_at": "REDACTED_TIMESTAMP"
}
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Ah yes, this makes sense. When we complete the sign-in from an API request the piggybacked response contains an empty sign-in for the client, which gets propagated to client.signIn. However, we specifically do not propagate this to the signal, which is what the hooks are based on (and what this proxy is being consumed through). I think this should be fine then! We might consider just always calling the signal's value though, but we can do that in the future.


return {
errors: defaultSignInErrors(),
fetchStatus: 'idle' as const,
signIn: {
status: 'needs_identifier' as const,
get status() {
return gateProperty(target, 'status', 'needs_identifier');
},
Comment on lines +143 to +145

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this makes sense to me!

availableStrategies: [],
get isTransferable() {
return gateProperty(target, 'isTransferable', false);
Expand DownExpand Up@@ -255,7 +257,7 @@ export class StateProxy implements State {
private buildSignUpProxy() {
const gateProperty = this.gateProperty.bind(this);
const gateMethod = this.gateMethod.bind(this);
const target = () => this.client.signUp.__internal_future;
const target = () => this.state.signUpSignal().signUp ?? this.client.signUp.__internal_future;

return {
errors: defaultSignUpErrors(),
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
5 changes: 5 additions & 0 deletions .changeset/warm-tickets-finish.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/react': patch
---

Ensure ticket-based sign-in and sign-up flows started before Clerk finishes loading can be finalized successfully.
167 changes: 167 additions & 0 deletions packages/react/src/__tests__/stateProxy.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
import type { SignInFutureResource, SignUpFutureResource } from '@clerk/shared/types';
import { describe, expect, it, vi } from 'vitest';

import { StateProxy } from '../stateProxy';

describe('StateProxy', () => {
it('preserves a completed sign-in across chained calls when the client clears its sign-in attempt', async () => {
const emptySignIn = {
status: 'needs_identifier',
createdSessionId: null as string | null,
ticket: vi.fn(() => Promise.resolve({ error: null })),
finalize: vi.fn(() => Promise.reject(new Error('Cannot finalize sign-in without a created session.'))),
};
const completedSignIn = {
status: 'needs_identifier',
createdSessionId: null as string | null,
ticket: vi.fn(() => {
client.signIn = { __internal_future: emptySignIn };
completedSignIn.status = 'complete';
completedSignIn.createdSessionId = 'sess_123';
return Promise.resolve({ error: null });
}),
finalize: vi.fn(() => Promise.resolve({ error: null })),
};
const client = {
signIn: { __internal_future: completedSignIn },
};
const state = {
signInSignal: () => ({ signIn: completedSignIn }),
};
const loadedCallbacks: Array<() => void> = [];
const isomorphicClerk = {
loaded: false,
client,
__internal_state: state,
addOnLoaded: vi.fn((callback: () => void) => loadedCallbacks.push(callback)),
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

const ticketPromise = signIn.ticket({ ticket: 'ticket_123' });
expect(isomorphicClerk.addOnLoaded).toHaveBeenCalledOnce();
expect(completedSignIn.ticket).not.toHaveBeenCalled();

isomorphicClerk.loaded = true;
loadedCallbacks.forEach(callback => callback());
await ticketPromise;

await expect(signIn.finalize()).resolves.toEqual({ error: null });
Comment thread
coderabbitai[bot] marked this conversation as resolved.
expect(signIn.status).toBe('complete');
expect(signIn.createdSessionId).toBe('sess_123');
expect(completedSignIn.finalize).toHaveBeenCalledOnce();
expect(emptySignIn.finalize).not.toHaveBeenCalled();
});

it('preserves a completed sign-up across chained calls when the client clears its sign-up attempt', async () => {
const emptySignUp = {
status: 'missing_requirements',
createdSessionId: null as string | null,
ticket: vi.fn(() => Promise.resolve({ error: null })),
finalize: vi.fn(() =>
Promise.resolve({ error: new Error('Cannot finalize sign-up without a created session.') }),
),
};
const completedSignUp = {
status: 'missing_requirements',
createdSessionId: null as string | null,
ticket: vi.fn(() => {
client.signUp = { __internal_future: emptySignUp };
completedSignUp.status = 'complete';
completedSignUp.createdSessionId = 'sess_123';
return Promise.resolve({ error: null });
}),
finalize: vi.fn(() => Promise.resolve({ error: null })),
};
const client: {
signUp: { __internal_future: typeof completedSignUp | typeof emptySignUp };
} = {
signUp: { __internal_future: completedSignUp },
};
const state = {
signUpSignal: () => ({ signUp: completedSignUp }),
};
const loadedCallbacks: Array<() => void> = [];
const isomorphicClerk = {
loaded: false,
client,
__internal_state: state,
addOnLoaded: vi.fn((callback: () => void) => loadedCallbacks.push(callback)),
};
const signUp = new StateProxy(isomorphicClerk as any).signUpSignal().signUp as SignUpFutureResource;

const ticketPromise = signUp.ticket({ ticket: 'ticket_123' });
expect(isomorphicClerk.addOnLoaded).toHaveBeenCalledOnce();
expect(completedSignUp.ticket).not.toHaveBeenCalled();

isomorphicClerk.loaded = true;
loadedCallbacks.forEach(callback => callback());
await ticketPromise;

await expect(signUp.finalize()).resolves.toEqual({ error: null });
expect(signUp.status).toBe('complete');
expect(signUp.createdSessionId).toBe('sess_123');
expect(completedSignUp.finalize).toHaveBeenCalledOnce();
expect(emptySignUp.finalize).not.toHaveBeenCalled();
});

it('falls back to the client sign-in when the state signal is empty', async () => {
const clientSignIn = {
status: 'needs_first_factor',
create: vi.fn(() => Promise.resolve({ error: null })),
};
const isomorphicClerk = {
loaded: true,
client: { signIn: { __internal_future: clientSignIn } },
__internal_state: { signInSignal: () => ({ signIn: null }) },
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

await expect(signIn.create({ identifier: 'test@example.com' })).resolves.toEqual({ error: null });
expect(signIn.status).toBe('needs_first_factor');
expect(clientSignIn.create).toHaveBeenCalledOnce();
});

it('uses a newer sign-in from the state signal instead of the client attempt', async () => {
const clientSignIn = {
finalize: vi.fn(() => Promise.reject(new Error('Finalized the stale client sign-in.'))),
};
const currentSignIn = {
finalize: vi.fn(() => Promise.resolve({ error: null })),
};
const isomorphicClerk = {
loaded: true,
client: { signIn: { __internal_future: clientSignIn } },
__internal_state: { signInSignal: () => ({ signIn: currentSignIn }) },
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

await expect(signIn.finalize()).resolves.toEqual({ error: null });
expect(currentSignIn.finalize).toHaveBeenCalledOnce();
expect(clientSignIn.finalize).not.toHaveBeenCalled();
});

it('falls back to the fresh client sign-in after the retained state attempt is cleared', async () => {
const clientSignIn = {
status: 'needs_identifier',
};
let stateSignIn: { status: string; finalize: ReturnType<typeof vi.fn> } | null;
const completedSignIn = {
status: 'complete',
finalize: vi.fn(() => {
stateSignIn = null;
return Promise.resolve({ error: null });
}),
};
stateSignIn = completedSignIn;
const isomorphicClerk = {
loaded: true,
client: { signIn: { __internal_future: clientSignIn } },
__internal_state: { signInSignal: () => ({ signIn: stateSignIn }) },
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

expect(signIn.status).toBe('complete');
await expect(signIn.finalize()).resolves.toEqual({ error: null });
expect(signIn.status).toBe('needs_identifier');
});
});
8 changes: 5 additions & 3 deletions packages/react/src/stateProxy.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -134,13 +134,15 @@ export class StateProxy implements State {

private buildSignInProxy() {
const gateProperty = this.gateProperty.bind(this);
const target = () => this.client.signIn.__internal_future;
const target = () => this.state.signInSignal().signIn ?? this.client.signIn.__internal_future;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

in what case would signInSignal().signIn have a different value than the Clerk client? I don't think that's supposed to happen.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

typically they match, but after a ticket completes, the client can replace signIn with an empty attempt while the state signal keeps the completed attempt until finalize() or reset(). the proxy was calling finalize() on the new empty client attempt instead of the retained one

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

{
"response": {
"object": "sign_in_attempt",
"id": "sia_REDACTED",
"status": "complete",
"supported_identifiers": [
"email_address"
],
"supported_first_factors": null,
"supported_second_factors": null,
"first_factor_verification": {
"object": "verification_ticket",
"status": "verified",
"strategy": "ticket",
"attempts": null,
"expire_at": null
},
"second_factor_verification": null,
"identifier": "REDACTED",
"user_data": null,
"created_session_id": "sess_REDACTED",
"abandon_at": "REDACTED_TIMESTAMP",
"locale": "en-US"
},
"client": {
"object": "client",
"id": "client_REDACTED",
"sessions": [
{
"object": "session",
"id": "sess_REDACTED",
"status": "active",
"expire_at": "REDACTED_TIMESTAMP",
"abandon_at": "REDACTED_TIMESTAMP",
"last_active_at": "REDACTED_TIMESTAMP",
"last_active_organization_id": null,
"actor": null,
"user": "REDACTED_USER_OBJECT",
"public_user_data": "REDACTED_PUBLIC_USER_DATA",
"factor_verification_age": [
0,
-1
],
"created_at": "REDACTED_TIMESTAMP",
"updated_at": "REDACTED_TIMESTAMP",
"last_active_token": {
"object": "token",
"jwt": "REDACTED_JWT"
}
}
],
"sign_in": null,
"sign_up": null,
"last_active_session_id": "sess_REDACTED",
"last_authentication_strategy": "ticket",
"cookie_expires_at": null,
"captcha_bypass": false,
"created_at": "REDACTED_TIMESTAMP",
"updated_at": "REDACTED_TIMESTAMP"
}
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Ah yes, this makes sense. When we complete the sign-in from an API request the piggybacked response contains an empty sign-in for the client, which gets propagated to client.signIn. However, we specifically do not propagate this to the signal, which is what the hooks are based on (and what this proxy is being consumed through). I think this should be fine then! We might consider just always calling the signal's value though, but we can do that in the future.


return {
errors: defaultSignInErrors(),
fetchStatus: 'idle' as const,
signIn: {
status: 'needs_identifier' as const,
get status() {
return gateProperty(target, 'status', 'needs_identifier');
},
Comment on lines +143 to +145

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this makes sense to me!

availableStrategies: [],
get isTransferable() {
return gateProperty(target, 'isTransferable', false);
Expand DownExpand Up@@ -255,7 +257,7 @@ export class StateProxy implements State {
private buildSignUpProxy() {
const gateProperty = this.gateProperty.bind(this);
const gateMethod = this.gateMethod.bind(this);
const target = () => this.client.signUp.__internal_future;
const target = () => this.state.signUpSignal().signUp ?? this.client.signUp.__internal_future;

return {
errors: defaultSignUpErrors(),
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
5 changes: 5 additions & 0 deletions .changeset/warm-tickets-finish.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/react': patch
---

Ensure ticket-based sign-in and sign-up flows started before Clerk finishes loading can be finalized successfully.
167 changes: 167 additions & 0 deletions packages/react/src/__tests__/stateProxy.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
import type { SignInFutureResource, SignUpFutureResource } from '@clerk/shared/types';
import { describe, expect, it, vi } from 'vitest';

import { StateProxy } from '../stateProxy';

describe('StateProxy', () => {
it('preserves a completed sign-in across chained calls when the client clears its sign-in attempt', async () => {
const emptySignIn = {
status: 'needs_identifier',
createdSessionId: null as string | null,
ticket: vi.fn(() => Promise.resolve({ error: null })),
finalize: vi.fn(() => Promise.reject(new Error('Cannot finalize sign-in without a created session.'))),
};
const completedSignIn = {
status: 'needs_identifier',
createdSessionId: null as string | null,
ticket: vi.fn(() => {
client.signIn = { __internal_future: emptySignIn };
completedSignIn.status = 'complete';
completedSignIn.createdSessionId = 'sess_123';
return Promise.resolve({ error: null });
}),
finalize: vi.fn(() => Promise.resolve({ error: null })),
};
const client = {
signIn: { __internal_future: completedSignIn },
};
const state = {
signInSignal: () => ({ signIn: completedSignIn }),
};
const loadedCallbacks: Array<() => void> = [];
const isomorphicClerk = {
loaded: false,
client,
__internal_state: state,
addOnLoaded: vi.fn((callback: () => void) => loadedCallbacks.push(callback)),
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

const ticketPromise = signIn.ticket({ ticket: 'ticket_123' });
expect(isomorphicClerk.addOnLoaded).toHaveBeenCalledOnce();
expect(completedSignIn.ticket).not.toHaveBeenCalled();

isomorphicClerk.loaded = true;
loadedCallbacks.forEach(callback => callback());
await ticketPromise;

await expect(signIn.finalize()).resolves.toEqual({ error: null });
Comment thread
coderabbitai[bot] marked this conversation as resolved.
expect(signIn.status).toBe('complete');
expect(signIn.createdSessionId).toBe('sess_123');
expect(completedSignIn.finalize).toHaveBeenCalledOnce();
expect(emptySignIn.finalize).not.toHaveBeenCalled();
});

it('preserves a completed sign-up across chained calls when the client clears its sign-up attempt', async () => {
const emptySignUp = {
status: 'missing_requirements',
createdSessionId: null as string | null,
ticket: vi.fn(() => Promise.resolve({ error: null })),
finalize: vi.fn(() =>
Promise.resolve({ error: new Error('Cannot finalize sign-up without a created session.') }),
),
};
const completedSignUp = {
status: 'missing_requirements',
createdSessionId: null as string | null,
ticket: vi.fn(() => {
client.signUp = { __internal_future: emptySignUp };
completedSignUp.status = 'complete';
completedSignUp.createdSessionId = 'sess_123';
return Promise.resolve({ error: null });
}),
finalize: vi.fn(() => Promise.resolve({ error: null })),
};
const client: {
signUp: { __internal_future: typeof completedSignUp | typeof emptySignUp };
} = {
signUp: { __internal_future: completedSignUp },
};
const state = {
signUpSignal: () => ({ signUp: completedSignUp }),
};
const loadedCallbacks: Array<() => void> = [];
const isomorphicClerk = {
loaded: false,
client,
__internal_state: state,
addOnLoaded: vi.fn((callback: () => void) => loadedCallbacks.push(callback)),
};
const signUp = new StateProxy(isomorphicClerk as any).signUpSignal().signUp as SignUpFutureResource;

const ticketPromise = signUp.ticket({ ticket: 'ticket_123' });
expect(isomorphicClerk.addOnLoaded).toHaveBeenCalledOnce();
expect(completedSignUp.ticket).not.toHaveBeenCalled();

isomorphicClerk.loaded = true;
loadedCallbacks.forEach(callback => callback());
await ticketPromise;

await expect(signUp.finalize()).resolves.toEqual({ error: null });
expect(signUp.status).toBe('complete');
expect(signUp.createdSessionId).toBe('sess_123');
expect(completedSignUp.finalize).toHaveBeenCalledOnce();
expect(emptySignUp.finalize).not.toHaveBeenCalled();
});

it('falls back to the client sign-in when the state signal is empty', async () => {
const clientSignIn = {
status: 'needs_first_factor',
create: vi.fn(() => Promise.resolve({ error: null })),
};
const isomorphicClerk = {
loaded: true,
client: { signIn: { __internal_future: clientSignIn } },
__internal_state: { signInSignal: () => ({ signIn: null }) },
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

await expect(signIn.create({ identifier: 'test@example.com' })).resolves.toEqual({ error: null });
expect(signIn.status).toBe('needs_first_factor');
expect(clientSignIn.create).toHaveBeenCalledOnce();
});

it('uses a newer sign-in from the state signal instead of the client attempt', async () => {
const clientSignIn = {
finalize: vi.fn(() => Promise.reject(new Error('Finalized the stale client sign-in.'))),
};
const currentSignIn = {
finalize: vi.fn(() => Promise.resolve({ error: null })),
};
const isomorphicClerk = {
loaded: true,
client: { signIn: { __internal_future: clientSignIn } },
__internal_state: { signInSignal: () => ({ signIn: currentSignIn }) },
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

await expect(signIn.finalize()).resolves.toEqual({ error: null });
expect(currentSignIn.finalize).toHaveBeenCalledOnce();
expect(clientSignIn.finalize).not.toHaveBeenCalled();
});

it('falls back to the fresh client sign-in after the retained state attempt is cleared', async () => {
const clientSignIn = {
status: 'needs_identifier',
};
let stateSignIn: { status: string; finalize: ReturnType<typeof vi.fn> } | null;
const completedSignIn = {
status: 'complete',
finalize: vi.fn(() => {
stateSignIn = null;
return Promise.resolve({ error: null });
}),
};
stateSignIn = completedSignIn;
const isomorphicClerk = {
loaded: true,
client: { signIn: { __internal_future: clientSignIn } },
__internal_state: { signInSignal: () => ({ signIn: stateSignIn }) },
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

expect(signIn.status).toBe('complete');
await expect(signIn.finalize()).resolves.toEqual({ error: null });
expect(signIn.status).toBe('needs_identifier');
});
});
8 changes: 5 additions & 3 deletions packages/react/src/stateProxy.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -134,13 +134,15 @@ export class StateProxy implements State {

private buildSignInProxy() {
const gateProperty = this.gateProperty.bind(this);
const target = () => this.client.signIn.__internal_future;
const target = () => this.state.signInSignal().signIn ?? this.client.signIn.__internal_future;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

in what case would signInSignal().signIn have a different value than the Clerk client? I don't think that's supposed to happen.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

typically they match, but after a ticket completes, the client can replace signIn with an empty attempt while the state signal keeps the completed attempt until finalize() or reset(). the proxy was calling finalize() on the new empty client attempt instead of the retained one

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

{
"response": {
"object": "sign_in_attempt",
"id": "sia_REDACTED",
"status": "complete",
"supported_identifiers": [
"email_address"
],
"supported_first_factors": null,
"supported_second_factors": null,
"first_factor_verification": {
"object": "verification_ticket",
"status": "verified",
"strategy": "ticket",
"attempts": null,
"expire_at": null
},
"second_factor_verification": null,
"identifier": "REDACTED",
"user_data": null,
"created_session_id": "sess_REDACTED",
"abandon_at": "REDACTED_TIMESTAMP",
"locale": "en-US"
},
"client": {
"object": "client",
"id": "client_REDACTED",
"sessions": [
{
"object": "session",
"id": "sess_REDACTED",
"status": "active",
"expire_at": "REDACTED_TIMESTAMP",
"abandon_at": "REDACTED_TIMESTAMP",
"last_active_at": "REDACTED_TIMESTAMP",
"last_active_organization_id": null,
"actor": null,
"user": "REDACTED_USER_OBJECT",
"public_user_data": "REDACTED_PUBLIC_USER_DATA",
"factor_verification_age": [
0,
-1
],
"created_at": "REDACTED_TIMESTAMP",
"updated_at": "REDACTED_TIMESTAMP",
"last_active_token": {
"object": "token",
"jwt": "REDACTED_JWT"
}
}
],
"sign_in": null,
"sign_up": null,
"last_active_session_id": "sess_REDACTED",
"last_authentication_strategy": "ticket",
"cookie_expires_at": null,
"captcha_bypass": false,
"created_at": "REDACTED_TIMESTAMP",
"updated_at": "REDACTED_TIMESTAMP"
}
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Ah yes, this makes sense. When we complete the sign-in from an API request the piggybacked response contains an empty sign-in for the client, which gets propagated to client.signIn. However, we specifically do not propagate this to the signal, which is what the hooks are based on (and what this proxy is being consumed through). I think this should be fine then! We might consider just always calling the signal's value though, but we can do that in the future.


return {
errors: defaultSignInErrors(),
fetchStatus: 'idle' as const,
signIn: {
status: 'needs_identifier' as const,
get status() {
return gateProperty(target, 'status', 'needs_identifier');
},
Comment on lines +143 to +145

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this makes sense to me!

availableStrategies: [],
get isTransferable() {
return gateProperty(target, 'isTransferable', false);
Expand DownExpand Up@@ -255,7 +257,7 @@ export class StateProxy implements State {
private buildSignUpProxy() {
const gateProperty = this.gateProperty.bind(this);
const gateMethod = this.gateMethod.bind(this);
const target = () => this.client.signUp.__internal_future;
const target = () => this.state.signUpSignal().signUp ?? this.client.signUp.__internal_future;

return {
errors: defaultSignUpErrors(),
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
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
5 changes: 5 additions & 0 deletions .changeset/warm-tickets-finish.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/react': patch
---

Ensure ticket-based sign-in and sign-up flows started before Clerk finishes loading can be finalized successfully.
167 changes: 167 additions & 0 deletions packages/react/src/__tests__/stateProxy.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
import type { SignInFutureResource, SignUpFutureResource } from '@clerk/shared/types';
import { describe, expect, it, vi } from 'vitest';

import { StateProxy } from '../stateProxy';

describe('StateProxy', () => {
it('preserves a completed sign-in across chained calls when the client clears its sign-in attempt', async () => {
const emptySignIn = {
status: 'needs_identifier',
createdSessionId: null as string | null,
ticket: vi.fn(() => Promise.resolve({ error: null })),
finalize: vi.fn(() => Promise.reject(new Error('Cannot finalize sign-in without a created session.'))),
};
const completedSignIn = {
status: 'needs_identifier',
createdSessionId: null as string | null,
ticket: vi.fn(() => {
client.signIn = { __internal_future: emptySignIn };
completedSignIn.status = 'complete';
completedSignIn.createdSessionId = 'sess_123';
return Promise.resolve({ error: null });
}),
finalize: vi.fn(() => Promise.resolve({ error: null })),
};
const client = {
signIn: { __internal_future: completedSignIn },
};
const state = {
signInSignal: () => ({ signIn: completedSignIn }),
};
const loadedCallbacks: Array<() => void> = [];
const isomorphicClerk = {
loaded: false,
client,
__internal_state: state,
addOnLoaded: vi.fn((callback: () => void) => loadedCallbacks.push(callback)),
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

const ticketPromise = signIn.ticket({ ticket: 'ticket_123' });
expect(isomorphicClerk.addOnLoaded).toHaveBeenCalledOnce();
expect(completedSignIn.ticket).not.toHaveBeenCalled();

isomorphicClerk.loaded = true;
loadedCallbacks.forEach(callback => callback());
await ticketPromise;

await expect(signIn.finalize()).resolves.toEqual({ error: null });
Comment thread
coderabbitai[bot] marked this conversation as resolved.
expect(signIn.status).toBe('complete');
expect(signIn.createdSessionId).toBe('sess_123');
expect(completedSignIn.finalize).toHaveBeenCalledOnce();
expect(emptySignIn.finalize).not.toHaveBeenCalled();
});

it('preserves a completed sign-up across chained calls when the client clears its sign-up attempt', async () => {
const emptySignUp = {
status: 'missing_requirements',
createdSessionId: null as string | null,
ticket: vi.fn(() => Promise.resolve({ error: null })),
finalize: vi.fn(() =>
Promise.resolve({ error: new Error('Cannot finalize sign-up without a created session.') }),
),
};
const completedSignUp = {
status: 'missing_requirements',
createdSessionId: null as string | null,
ticket: vi.fn(() => {
client.signUp = { __internal_future: emptySignUp };
completedSignUp.status = 'complete';
completedSignUp.createdSessionId = 'sess_123';
return Promise.resolve({ error: null });
}),
finalize: vi.fn(() => Promise.resolve({ error: null })),
};
const client: {
signUp: { __internal_future: typeof completedSignUp | typeof emptySignUp };
} = {
signUp: { __internal_future: completedSignUp },
};
const state = {
signUpSignal: () => ({ signUp: completedSignUp }),
};
const loadedCallbacks: Array<() => void> = [];
const isomorphicClerk = {
loaded: false,
client,
__internal_state: state,
addOnLoaded: vi.fn((callback: () => void) => loadedCallbacks.push(callback)),
};
const signUp = new StateProxy(isomorphicClerk as any).signUpSignal().signUp as SignUpFutureResource;

const ticketPromise = signUp.ticket({ ticket: 'ticket_123' });
expect(isomorphicClerk.addOnLoaded).toHaveBeenCalledOnce();
expect(completedSignUp.ticket).not.toHaveBeenCalled();

isomorphicClerk.loaded = true;
loadedCallbacks.forEach(callback => callback());
await ticketPromise;

await expect(signUp.finalize()).resolves.toEqual({ error: null });
expect(signUp.status).toBe('complete');
expect(signUp.createdSessionId).toBe('sess_123');
expect(completedSignUp.finalize).toHaveBeenCalledOnce();
expect(emptySignUp.finalize).not.toHaveBeenCalled();
});

it('falls back to the client sign-in when the state signal is empty', async () => {
const clientSignIn = {
status: 'needs_first_factor',
create: vi.fn(() => Promise.resolve({ error: null })),
};
const isomorphicClerk = {
loaded: true,
client: { signIn: { __internal_future: clientSignIn } },
__internal_state: { signInSignal: () => ({ signIn: null }) },
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

await expect(signIn.create({ identifier: 'test@example.com' })).resolves.toEqual({ error: null });
expect(signIn.status).toBe('needs_first_factor');
expect(clientSignIn.create).toHaveBeenCalledOnce();
});

it('uses a newer sign-in from the state signal instead of the client attempt', async () => {
const clientSignIn = {
finalize: vi.fn(() => Promise.reject(new Error('Finalized the stale client sign-in.'))),
};
const currentSignIn = {
finalize: vi.fn(() => Promise.resolve({ error: null })),
};
const isomorphicClerk = {
loaded: true,
client: { signIn: { __internal_future: clientSignIn } },
__internal_state: { signInSignal: () => ({ signIn: currentSignIn }) },
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

await expect(signIn.finalize()).resolves.toEqual({ error: null });
expect(currentSignIn.finalize).toHaveBeenCalledOnce();
expect(clientSignIn.finalize).not.toHaveBeenCalled();
});

it('falls back to the fresh client sign-in after the retained state attempt is cleared', async () => {
const clientSignIn = {
status: 'needs_identifier',
};
let stateSignIn: { status: string; finalize: ReturnType<typeof vi.fn> } | null;
const completedSignIn = {
status: 'complete',
finalize: vi.fn(() => {
stateSignIn = null;
return Promise.resolve({ error: null });
}),
};
stateSignIn = completedSignIn;
const isomorphicClerk = {
loaded: true,
client: { signIn: { __internal_future: clientSignIn } },
__internal_state: { signInSignal: () => ({ signIn: stateSignIn }) },
};
const signIn = new StateProxy(isomorphicClerk as any).signInSignal().signIn as SignInFutureResource;

expect(signIn.status).toBe('complete');
await expect(signIn.finalize()).resolves.toEqual({ error: null });
expect(signIn.status).toBe('needs_identifier');
});
});
8 changes: 5 additions & 3 deletions packages/react/src/stateProxy.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -134,13 +134,15 @@ export class StateProxy implements State {

private buildSignInProxy() {
const gateProperty = this.gateProperty.bind(this);
const target = () => this.client.signIn.__internal_future;
const target = () => this.state.signInSignal().signIn ?? this.client.signIn.__internal_future;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

in what case would signInSignal().signIn have a different value than the Clerk client? I don't think that's supposed to happen.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

typically they match, but after a ticket completes, the client can replace signIn with an empty attempt while the state signal keeps the completed attempt until finalize() or reset(). the proxy was calling finalize() on the new empty client attempt instead of the retained one

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

{
"response": {
"object": "sign_in_attempt",
"id": "sia_REDACTED",
"status": "complete",
"supported_identifiers": [
"email_address"
],
"supported_first_factors": null,
"supported_second_factors": null,
"first_factor_verification": {
"object": "verification_ticket",
"status": "verified",
"strategy": "ticket",
"attempts": null,
"expire_at": null
},
"second_factor_verification": null,
"identifier": "REDACTED",
"user_data": null,
"created_session_id": "sess_REDACTED",
"abandon_at": "REDACTED_TIMESTAMP",
"locale": "en-US"
},
"client": {
"object": "client",
"id": "client_REDACTED",
"sessions": [
{
"object": "session",
"id": "sess_REDACTED",
"status": "active",
"expire_at": "REDACTED_TIMESTAMP",
"abandon_at": "REDACTED_TIMESTAMP",
"last_active_at": "REDACTED_TIMESTAMP",
"last_active_organization_id": null,
"actor": null,
"user": "REDACTED_USER_OBJECT",
"public_user_data": "REDACTED_PUBLIC_USER_DATA",
"factor_verification_age": [
0,
-1
],
"created_at": "REDACTED_TIMESTAMP",
"updated_at": "REDACTED_TIMESTAMP",
"last_active_token": {
"object": "token",
"jwt": "REDACTED_JWT"
}
}
],
"sign_in": null,
"sign_up": null,
"last_active_session_id": "sess_REDACTED",
"last_authentication_strategy": "ticket",
"cookie_expires_at": null,
"captcha_bypass": false,
"created_at": "REDACTED_TIMESTAMP",
"updated_at": "REDACTED_TIMESTAMP"
}
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Ah yes, this makes sense. When we complete the sign-in from an API request the piggybacked response contains an empty sign-in for the client, which gets propagated to client.signIn. However, we specifically do not propagate this to the signal, which is what the hooks are based on (and what this proxy is being consumed through). I think this should be fine then! We might consider just always calling the signal's value though, but we can do that in the future.


return {
errors: defaultSignInErrors(),
fetchStatus: 'idle' as const,
signIn: {
status: 'needs_identifier' as const,
get status() {
return gateProperty(target, 'status', 'needs_identifier');
},
Comment on lines +143 to +145

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this makes sense to me!

availableStrategies: [],
get isTransferable() {
return gateProperty(target, 'isTransferable', false);
Expand DownExpand Up@@ -255,7 +257,7 @@ export class StateProxy implements State {
private buildSignUpProxy() {
const gateProperty = this.gateProperty.bind(this);
const gateMethod = this.gateMethod.bind(this);
const target = () => this.client.signUp.__internal_future;
const target = () => this.state.signUpSignal().signUp ?? this.client.signUp.__internal_future;

return {
errors: defaultSignUpErrors(),
Expand Down
Loading