Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
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
7 changes: 7 additions & 0 deletions .changeset/dull-cups-accept.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch
'@clerk/clerk-react': patch
'@clerk/types': patch
---

[Experimental] Signals
8 changes: 4 additions & 4 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "620KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "74KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "115.08KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55.2KB" },
{ "path": "./dist/clerk.js", "maxSize": "621KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "75KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "117KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "57KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "113KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
Expand Down
1 change: 1 addition & 0 deletions packages/clerk-js/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,6 +75,7 @@
"@swc/helpers": "^0.5.17",
"@zxcvbn-ts/core": "3.0.4",
"@zxcvbn-ts/language-common": "3.0.4",
"alien-signals": "2.0.6",
"browser-tabs-lock": "1.3.0",
"copy-to-clipboard": "3.3.3",
"core-js": "3.41.0",
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ import {
Waitlist,
} from './resources/internal';
import { navigateToTask } from './sessionTasks';
import { State } from './state';
import { warnings } from './warnings';

type SetActiveHook = (intent?: 'sign-out') => void | Promise<void>;
Expand DownExpand Up@@ -211,6 +212,7 @@ export class Clerk implements ClerkInterface {
public user: UserResource | null | undefined;
public __internal_country?: string | null;
public telemetry: TelemetryCollector | undefined;
public readonly __internal_state: State = new State();

protected internal_last_error: ClerkAPIError | null = null;
// converted to protected environment to support `updateEnvironment` type assertion
Expand Down
8 changes: 8 additions & 0 deletions packages/clerk-js/src/core/events.ts
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,28 @@
import { createEventBus } from '@clerk/shared/eventBus';
import type { TokenResource } from '@clerk/types';

import type { BaseResource } from './resources/Base';

export const events = {
TokenUpdate: 'token:update',
UserSignOut: 'user:signOut',
EnvironmentUpdate: 'environment:update',
SessionTokenResolved: 'session:tokenResolved',
ResourceUpdate: 'resource:update',
ResourceError: 'resource:error',
} as const;

type TokenUpdatePayload = { token: TokenResource | null };
export type ResourceUpdatePayload = { resource: BaseResource };
export type ResourceErrorPayload = { resource: BaseResource; error: unknown };

type InternalEvents = {
[events.TokenUpdate]: TokenUpdatePayload;
[events.UserSignOut]: null;
[events.EnvironmentUpdate]: null;
[events.SessionTokenResolved]: null;
[events.ResourceUpdate]: ResourceUpdatePayload;
[events.ResourceError]: ResourceErrorPayload;
};

export const eventBus = createEventBus<InternalEvents>();
149 changes: 149 additions & 0 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ import type {
EmailCodeConfig,
EmailLinkConfig,
EnterpriseSSOConfig,
OAuthStrategy,
PassKeyConfig,
PasskeyFactor,
PhoneCodeConfig,
Expand All@@ -27,6 +28,7 @@ import type {
SamlConfig,
SignInCreateParams,
SignInFirstFactor,
SignInFutureResource,
SignInIdentifier,
SignInJSON,
SignInJSONSnapshot,
Expand DownExpand Up@@ -66,6 +68,7 @@ import {
clerkVerifyPasskeyCalledBeforeCreate,
clerkVerifyWeb3WalletCalledBeforeCreate,
} from '../errors';
import { eventBus } from '../events';
import { BaseResource, UserData, Verification } from './internal';

export class SignIn extends BaseResource implements SignInResource {
Expand All@@ -82,6 +85,21 @@ export class SignIn extends BaseResource implements SignInResource {
createdSessionId: string | null = null;
userData: UserData = new UserData(null);

/**
* @experimental This experimental API is subject to change.
*
* An instance of `SignInFuture`, which has a different API than `SignIn`, intended to be used in custom flows.
*/
__internal_future: SignInFuture | null = new SignInFuture(this);

/**
* @internal Only used for internal purposes, and is not intended to be used directly.
*
* This property is used to provide access to underlying Client methods to `SignInFuture`, which wraps an instance
* of `SignIn`.
*/
__internal_basePost = this._basePost.bind(this);

constructor(data: SignInJSON | SignInJSONSnapshot | null = null) {
super();
this.fromJSON(data);
Expand DownExpand Up@@ -451,6 +469,8 @@ export class SignIn extends BaseResource implements SignInResource {
this.createdSessionId = data.created_session_id;
this.userData = new UserData(data.user_data);
}

eventBus.emit('resource:update', { resource: this });
return this;
}

Expand All@@ -470,3 +490,132 @@ export class SignIn extends BaseResource implements SignInResource {
};
}
}

class SignInFuture implements SignInFutureResource {

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.

We can add JSDocs now or later to the methods here, but we should do it eventually! Saves us time later too 😄

emailCode = {
sendCode: this.sendEmailCode.bind(this),
verifyCode: this.verifyEmailCode.bind(this),
};

constructor(readonly resource: SignIn) {}

get status() {
return this.resource.status;
}

async create(params: {
identifier?: string;
strategy?: OAuthStrategy | 'saml' | 'enterprise_sso';
redirectUrl?: string;
actionCompleteRedirectUrl?: string;
}): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
await this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: params,
});

return { error: null };
} catch (err) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}
}

async password({ identifier, password }: { identifier: string; password: string }): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
await this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: { identifier, password },
});
} catch (err) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}

async sendEmailCode({ email }: { email: string }): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
if (!this.resource.id) {
await this.create({ identifier: email });
}

const emailCodeFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_code');

if (!emailCodeFactor) {
throw new Error('Email code factor not found');
}

const { emailAddressId } = emailCodeFactor;
await this.resource.__internal_basePost({
body: { emailAddressId, strategy: 'email_code' },
action: 'prepare_first_factor',
});
} catch (err: unknown) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}

async verifyEmailCode({ code }: { code: string }): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
await this.resource.__internal_basePost({
body: { code, strategy: 'email_code' },
action: 'attempt_first_factor',
});
} catch (err: unknown) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}

async sso({
flow = 'auto',
strategy,
redirectUrl,
redirectUrlComplete,
}: {
flow?: 'auto' | 'modal';
strategy: OAuthStrategy | 'saml' | 'enterprise_sso';
redirectUrl: string;
redirectUrlComplete: string;
}): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
if (flow !== 'auto') {
throw new Error('modal flow is not supported yet');
}

const redirectUrlWithAuthToken = SignIn.clerk.buildUrlWithAuth(redirectUrl);

if (!this.resource.id) {
await this.create({
strategy,
redirectUrl: redirectUrlWithAuthToken,
actionCompleteRedirectUrl: redirectUrlComplete,
});
}

const { status, externalVerificationRedirectURL } = this.resource.firstFactorVerification;

if (status === 'unverified' && externalVerificationRedirectURL) {
windowNavigate(externalVerificationRedirectURL);
}
} catch (err: unknown) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}
}
17 changes: 17 additions & 0 deletions packages/clerk-js/src/core/signals.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import { computed, signal } from 'alien-signals';

import type { SignIn } from './resources/SignIn';

export const signInSignal = signal<{ resource: SignIn | null }>({ resource: null });
export const signInErrorSignal = signal<{ errors: unknown }>({ errors: null });

export const signInComputedSignal = computed(() => {
const signIn = signInSignal().resource;
const errors = signInErrorSignal().errors;

if (!signIn) {
return { errors: null, signIn: null };
}

return { errors, signIn: signIn.__internal_future };
});
33 changes: 33 additions & 0 deletions packages/clerk-js/src/core/state.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import type { State as StateInterface } from '@clerk/types';
import { computed, effect } from 'alien-signals';

import { eventBus } from './events';
import type { BaseResource } from './resources/Base';
import { SignIn } from './resources/SignIn';
import { signInComputedSignal, signInErrorSignal, signInSignal } from './signals';

export class State implements StateInterface {

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.

JSDoc would be good here 👀 what's it for? Maybe it belongs on the State type instead.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I put it on the __internal_state type for Clerk, which I'm okay with for the time being since that's where other JSDoc comments for properties are. I'll add more general doc comments to this file in a later PR.

signInResourceSignal = signInSignal;
signInErrorSignal = signInErrorSignal;
signInSignal = signInComputedSignal;

__internal_effect = effect;
__internal_computed = computed;

constructor() {
eventBus.on('resource:update', this.onResourceUpdated);
eventBus.on('resource:error', this.onResourceError);
}

private onResourceError = (payload: { resource: BaseResource; error: unknown }) => {
if (payload.resource instanceof SignIn) {
this.signInErrorSignal({ errors: payload.error });
}
};

private onResourceUpdated = (payload: { resource: BaseResource }) => {
if (payload.resource instanceof SignIn) {
this.signInResourceSignal({ resource: payload.resource });
}
};
}
1 change: 1 addition & 0 deletions packages/react/src/experimental.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
export { CheckoutButton } from './components/CheckoutButton';
export { PlanDetailsButton } from './components/PlanDetailsButton';
export { SubscriptionDetailsButton } from './components/SubscriptionDetailsButton';
export { useSignInSignal } from './hooks/useClerkSignal';

export type {
__experimental_CheckoutButtonProps as CheckoutButtonProps,
Expand Down
52 changes: 52 additions & 0 deletions packages/react/src/hooks/useClerkSignal.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import type { SignInFutureResource } from '@clerk/types';
import { useCallback, useSyncExternalStore } from 'react';

import { useIsomorphicClerkContext } from '../contexts/IsomorphicClerkContext';
import { useAssertWrappedByClerkProvider } from './useAssertWrappedByClerkProvider';

function useClerkSignal(signal: 'signIn'): { errors: unknown; signIn: SignInFutureResource | null } | null {
useAssertWrappedByClerkProvider('useSignInSignal');

const clerk = useIsomorphicClerkContext();

const subscribe = useCallback(
(callback: () => void) => {
if (!clerk.loaded || !clerk.__internal_state) {
return () => {};
}

return clerk.__internal_state.__internal_effect(() => {
switch (signal) {
case 'signIn':
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- we know that the state is defined
clerk.__internal_state!.signInSignal();
break;
default:
throw new Error(`Unknown signal: ${signal}`);
}
callback();
});
},
[clerk, clerk.loaded, clerk.__internal_state],
);
const getSnapshot = useCallback(() => {
if (!clerk.__internal_state) {
return null;
}

switch (signal) {
case 'signIn':
return clerk.__internal_state.signInSignal();
default:
throw new Error(`Unknown signal: ${signal}`);
}
}, [clerk.__internal_state]);

const value = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);

return value;
}

export function useSignInSignal() {
return useClerkSignal('signIn');
}
5 changes: 5 additions & 0 deletions packages/react/src/isomorphicClerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@ import type {
SignUpProps,
SignUpRedirectOptions,
SignUpResource,
State,
TaskChooseOrganizationProps,
UnsubscribeCallback,
UserButtonProps,
Expand DownExpand Up@@ -714,6 +715,10 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
return this.clerkjs?.billing;
}

get __internal_state(): State | undefined {
return this.clerkjs?.__internal_state;
}

get apiKeys(): APIKeysNamespace | undefined {
return this.clerkjs?.apiKeys;
}
Expand Down
Loading
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
Show all changes
21 commits
Select commit Hold shift + click to select a range
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
7 changes: 7 additions & 0 deletions .changeset/dull-cups-accept.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch
'@clerk/clerk-react': patch
'@clerk/types': patch
---

[Experimental] Signals
8 changes: 4 additions & 4 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "620KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "74KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "115.08KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55.2KB" },
{ "path": "./dist/clerk.js", "maxSize": "621KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "75KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "117KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "57KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "113KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
Expand Down
1 change: 1 addition & 0 deletions packages/clerk-js/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,6 +75,7 @@
"@swc/helpers": "^0.5.17",
"@zxcvbn-ts/core": "3.0.4",
"@zxcvbn-ts/language-common": "3.0.4",
"alien-signals": "2.0.6",
"browser-tabs-lock": "1.3.0",
"copy-to-clipboard": "3.3.3",
"core-js": "3.41.0",
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ import {
Waitlist,
} from './resources/internal';
import { navigateToTask } from './sessionTasks';
import { State } from './state';
import { warnings } from './warnings';

type SetActiveHook = (intent?: 'sign-out') => void | Promise<void>;
Expand DownExpand Up@@ -211,6 +212,7 @@ export class Clerk implements ClerkInterface {
public user: UserResource | null | undefined;
public __internal_country?: string | null;
public telemetry: TelemetryCollector | undefined;
public readonly __internal_state: State = new State();

protected internal_last_error: ClerkAPIError | null = null;
// converted to protected environment to support `updateEnvironment` type assertion
Expand Down
8 changes: 8 additions & 0 deletions packages/clerk-js/src/core/events.ts
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,28 @@
import { createEventBus } from '@clerk/shared/eventBus';
import type { TokenResource } from '@clerk/types';

import type { BaseResource } from './resources/Base';

export const events = {
TokenUpdate: 'token:update',
UserSignOut: 'user:signOut',
EnvironmentUpdate: 'environment:update',
SessionTokenResolved: 'session:tokenResolved',
ResourceUpdate: 'resource:update',
ResourceError: 'resource:error',
} as const;

type TokenUpdatePayload = { token: TokenResource | null };
export type ResourceUpdatePayload = { resource: BaseResource };
export type ResourceErrorPayload = { resource: BaseResource; error: unknown };

type InternalEvents = {
[events.TokenUpdate]: TokenUpdatePayload;
[events.UserSignOut]: null;
[events.EnvironmentUpdate]: null;
[events.SessionTokenResolved]: null;
[events.ResourceUpdate]: ResourceUpdatePayload;
[events.ResourceError]: ResourceErrorPayload;
};

export const eventBus = createEventBus<InternalEvents>();
149 changes: 149 additions & 0 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ import type {
EmailCodeConfig,
EmailLinkConfig,
EnterpriseSSOConfig,
OAuthStrategy,
PassKeyConfig,
PasskeyFactor,
PhoneCodeConfig,
Expand All@@ -27,6 +28,7 @@ import type {
SamlConfig,
SignInCreateParams,
SignInFirstFactor,
SignInFutureResource,
SignInIdentifier,
SignInJSON,
SignInJSONSnapshot,
Expand DownExpand Up@@ -66,6 +68,7 @@ import {
clerkVerifyPasskeyCalledBeforeCreate,
clerkVerifyWeb3WalletCalledBeforeCreate,
} from '../errors';
import { eventBus } from '../events';
import { BaseResource, UserData, Verification } from './internal';

export class SignIn extends BaseResource implements SignInResource {
Expand All@@ -82,6 +85,21 @@ export class SignIn extends BaseResource implements SignInResource {
createdSessionId: string | null = null;
userData: UserData = new UserData(null);

/**
* @experimental This experimental API is subject to change.
*
* An instance of `SignInFuture`, which has a different API than `SignIn`, intended to be used in custom flows.
*/
__internal_future: SignInFuture | null = new SignInFuture(this);

/**
* @internal Only used for internal purposes, and is not intended to be used directly.
*
* This property is used to provide access to underlying Client methods to `SignInFuture`, which wraps an instance
* of `SignIn`.
*/
__internal_basePost = this._basePost.bind(this);

constructor(data: SignInJSON | SignInJSONSnapshot | null = null) {
super();
this.fromJSON(data);
Expand DownExpand Up@@ -451,6 +469,8 @@ export class SignIn extends BaseResource implements SignInResource {
this.createdSessionId = data.created_session_id;
this.userData = new UserData(data.user_data);
}

eventBus.emit('resource:update', { resource: this });
return this;
}

Expand All@@ -470,3 +490,132 @@ export class SignIn extends BaseResource implements SignInResource {
};
}
}

class SignInFuture implements SignInFutureResource {

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.

We can add JSDocs now or later to the methods here, but we should do it eventually! Saves us time later too 😄

emailCode = {
sendCode: this.sendEmailCode.bind(this),
verifyCode: this.verifyEmailCode.bind(this),
};

constructor(readonly resource: SignIn) {}

get status() {
return this.resource.status;
}

async create(params: {
identifier?: string;
strategy?: OAuthStrategy | 'saml' | 'enterprise_sso';
redirectUrl?: string;
actionCompleteRedirectUrl?: string;
}): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
await this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: params,
});

return { error: null };
} catch (err) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}
}

async password({ identifier, password }: { identifier: string; password: string }): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
await this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: { identifier, password },
});
} catch (err) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}

async sendEmailCode({ email }: { email: string }): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
if (!this.resource.id) {
await this.create({ identifier: email });
}

const emailCodeFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_code');

if (!emailCodeFactor) {
throw new Error('Email code factor not found');
}

const { emailAddressId } = emailCodeFactor;
await this.resource.__internal_basePost({
body: { emailAddressId, strategy: 'email_code' },
action: 'prepare_first_factor',
});
} catch (err: unknown) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}

async verifyEmailCode({ code }: { code: string }): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
await this.resource.__internal_basePost({
body: { code, strategy: 'email_code' },
action: 'attempt_first_factor',
});
} catch (err: unknown) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}

async sso({
flow = 'auto',
strategy,
redirectUrl,
redirectUrlComplete,
}: {
flow?: 'auto' | 'modal';
strategy: OAuthStrategy | 'saml' | 'enterprise_sso';
redirectUrl: string;
redirectUrlComplete: string;
}): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
if (flow !== 'auto') {
throw new Error('modal flow is not supported yet');
}

const redirectUrlWithAuthToken = SignIn.clerk.buildUrlWithAuth(redirectUrl);

if (!this.resource.id) {
await this.create({
strategy,
redirectUrl: redirectUrlWithAuthToken,
actionCompleteRedirectUrl: redirectUrlComplete,
});
}

const { status, externalVerificationRedirectURL } = this.resource.firstFactorVerification;

if (status === 'unverified' && externalVerificationRedirectURL) {
windowNavigate(externalVerificationRedirectURL);
}
} catch (err: unknown) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}
}
17 changes: 17 additions & 0 deletions packages/clerk-js/src/core/signals.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import { computed, signal } from 'alien-signals';

import type { SignIn } from './resources/SignIn';

export const signInSignal = signal<{ resource: SignIn | null }>({ resource: null });
export const signInErrorSignal = signal<{ errors: unknown }>({ errors: null });

export const signInComputedSignal = computed(() => {
const signIn = signInSignal().resource;
const errors = signInErrorSignal().errors;

if (!signIn) {
return { errors: null, signIn: null };
}

return { errors, signIn: signIn.__internal_future };
});
33 changes: 33 additions & 0 deletions packages/clerk-js/src/core/state.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import type { State as StateInterface } from '@clerk/types';
import { computed, effect } from 'alien-signals';

import { eventBus } from './events';
import type { BaseResource } from './resources/Base';
import { SignIn } from './resources/SignIn';
import { signInComputedSignal, signInErrorSignal, signInSignal } from './signals';

export class State implements StateInterface {

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.

JSDoc would be good here 👀 what's it for? Maybe it belongs on the State type instead.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I put it on the __internal_state type for Clerk, which I'm okay with for the time being since that's where other JSDoc comments for properties are. I'll add more general doc comments to this file in a later PR.

signInResourceSignal = signInSignal;
signInErrorSignal = signInErrorSignal;
signInSignal = signInComputedSignal;

__internal_effect = effect;
__internal_computed = computed;

constructor() {
eventBus.on('resource:update', this.onResourceUpdated);
eventBus.on('resource:error', this.onResourceError);
}

private onResourceError = (payload: { resource: BaseResource; error: unknown }) => {
if (payload.resource instanceof SignIn) {
this.signInErrorSignal({ errors: payload.error });
}
};

private onResourceUpdated = (payload: { resource: BaseResource }) => {
if (payload.resource instanceof SignIn) {
this.signInResourceSignal({ resource: payload.resource });
}
};
}
1 change: 1 addition & 0 deletions packages/react/src/experimental.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
export { CheckoutButton } from './components/CheckoutButton';
export { PlanDetailsButton } from './components/PlanDetailsButton';
export { SubscriptionDetailsButton } from './components/SubscriptionDetailsButton';
export { useSignInSignal } from './hooks/useClerkSignal';

export type {
__experimental_CheckoutButtonProps as CheckoutButtonProps,
Expand Down
52 changes: 52 additions & 0 deletions packages/react/src/hooks/useClerkSignal.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import type { SignInFutureResource } from '@clerk/types';
import { useCallback, useSyncExternalStore } from 'react';

import { useIsomorphicClerkContext } from '../contexts/IsomorphicClerkContext';
import { useAssertWrappedByClerkProvider } from './useAssertWrappedByClerkProvider';

function useClerkSignal(signal: 'signIn'): { errors: unknown; signIn: SignInFutureResource | null } | null {
useAssertWrappedByClerkProvider('useSignInSignal');

const clerk = useIsomorphicClerkContext();

const subscribe = useCallback(
(callback: () => void) => {
if (!clerk.loaded || !clerk.__internal_state) {
return () => {};
}

return clerk.__internal_state.__internal_effect(() => {
switch (signal) {
case 'signIn':
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- we know that the state is defined
clerk.__internal_state!.signInSignal();
break;
default:
throw new Error(`Unknown signal: ${signal}`);
}
callback();
});
},
[clerk, clerk.loaded, clerk.__internal_state],
);
const getSnapshot = useCallback(() => {
if (!clerk.__internal_state) {
return null;
}

switch (signal) {
case 'signIn':
return clerk.__internal_state.signInSignal();
default:
throw new Error(`Unknown signal: ${signal}`);
}
}, [clerk.__internal_state]);

const value = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);

return value;
}

export function useSignInSignal() {
return useClerkSignal('signIn');
}
5 changes: 5 additions & 0 deletions packages/react/src/isomorphicClerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@ import type {
SignUpProps,
SignUpRedirectOptions,
SignUpResource,
State,
TaskChooseOrganizationProps,
UnsubscribeCallback,
UserButtonProps,
Expand DownExpand Up@@ -714,6 +715,10 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
return this.clerkjs?.billing;
}

get __internal_state(): State | undefined {
return this.clerkjs?.__internal_state;
}

get apiKeys(): APIKeysNamespace | undefined {
return this.clerkjs?.apiKeys;
}
Expand Down
Loading
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
Show all changes
21 commits
Select commit Hold shift + click to select a range
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
7 changes: 7 additions & 0 deletions .changeset/dull-cups-accept.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch
'@clerk/clerk-react': patch
'@clerk/types': patch
---

[Experimental] Signals
8 changes: 4 additions & 4 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "620KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "74KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "115.08KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55.2KB" },
{ "path": "./dist/clerk.js", "maxSize": "621KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "75KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "117KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "57KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "113KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
Expand Down
1 change: 1 addition & 0 deletions packages/clerk-js/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,6 +75,7 @@
"@swc/helpers": "^0.5.17",
"@zxcvbn-ts/core": "3.0.4",
"@zxcvbn-ts/language-common": "3.0.4",
"alien-signals": "2.0.6",
"browser-tabs-lock": "1.3.0",
"copy-to-clipboard": "3.3.3",
"core-js": "3.41.0",
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ import {
Waitlist,
} from './resources/internal';
import { navigateToTask } from './sessionTasks';
import { State } from './state';
import { warnings } from './warnings';

type SetActiveHook = (intent?: 'sign-out') => void | Promise<void>;
Expand DownExpand Up@@ -211,6 +212,7 @@ export class Clerk implements ClerkInterface {
public user: UserResource | null | undefined;
public __internal_country?: string | null;
public telemetry: TelemetryCollector | undefined;
public readonly __internal_state: State = new State();

protected internal_last_error: ClerkAPIError | null = null;
// converted to protected environment to support `updateEnvironment` type assertion
Expand Down
8 changes: 8 additions & 0 deletions packages/clerk-js/src/core/events.ts
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,28 @@
import { createEventBus } from '@clerk/shared/eventBus';
import type { TokenResource } from '@clerk/types';

import type { BaseResource } from './resources/Base';

export const events = {
TokenUpdate: 'token:update',
UserSignOut: 'user:signOut',
EnvironmentUpdate: 'environment:update',
SessionTokenResolved: 'session:tokenResolved',
ResourceUpdate: 'resource:update',
ResourceError: 'resource:error',
} as const;

type TokenUpdatePayload = { token: TokenResource | null };
export type ResourceUpdatePayload = { resource: BaseResource };
export type ResourceErrorPayload = { resource: BaseResource; error: unknown };

type InternalEvents = {
[events.TokenUpdate]: TokenUpdatePayload;
[events.UserSignOut]: null;
[events.EnvironmentUpdate]: null;
[events.SessionTokenResolved]: null;
[events.ResourceUpdate]: ResourceUpdatePayload;
[events.ResourceError]: ResourceErrorPayload;
};

export const eventBus = createEventBus<InternalEvents>();
149 changes: 149 additions & 0 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ import type {
EmailCodeConfig,
EmailLinkConfig,
EnterpriseSSOConfig,
OAuthStrategy,
PassKeyConfig,
PasskeyFactor,
PhoneCodeConfig,
Expand All@@ -27,6 +28,7 @@ import type {
SamlConfig,
SignInCreateParams,
SignInFirstFactor,
SignInFutureResource,
SignInIdentifier,
SignInJSON,
SignInJSONSnapshot,
Expand DownExpand Up@@ -66,6 +68,7 @@ import {
clerkVerifyPasskeyCalledBeforeCreate,
clerkVerifyWeb3WalletCalledBeforeCreate,
} from '../errors';
import { eventBus } from '../events';
import { BaseResource, UserData, Verification } from './internal';

export class SignIn extends BaseResource implements SignInResource {
Expand All@@ -82,6 +85,21 @@ export class SignIn extends BaseResource implements SignInResource {
createdSessionId: string | null = null;
userData: UserData = new UserData(null);

/**
* @experimental This experimental API is subject to change.
*
* An instance of `SignInFuture`, which has a different API than `SignIn`, intended to be used in custom flows.
*/
__internal_future: SignInFuture | null = new SignInFuture(this);

/**
* @internal Only used for internal purposes, and is not intended to be used directly.
*
* This property is used to provide access to underlying Client methods to `SignInFuture`, which wraps an instance
* of `SignIn`.
*/
__internal_basePost = this._basePost.bind(this);

constructor(data: SignInJSON | SignInJSONSnapshot | null = null) {
super();
this.fromJSON(data);
Expand DownExpand Up@@ -451,6 +469,8 @@ export class SignIn extends BaseResource implements SignInResource {
this.createdSessionId = data.created_session_id;
this.userData = new UserData(data.user_data);
}

eventBus.emit('resource:update', { resource: this });
return this;
}

Expand All@@ -470,3 +490,132 @@ export class SignIn extends BaseResource implements SignInResource {
};
}
}

class SignInFuture implements SignInFutureResource {

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.

We can add JSDocs now or later to the methods here, but we should do it eventually! Saves us time later too 😄

emailCode = {
sendCode: this.sendEmailCode.bind(this),
verifyCode: this.verifyEmailCode.bind(this),
};

constructor(readonly resource: SignIn) {}

get status() {
return this.resource.status;
}

async create(params: {
identifier?: string;
strategy?: OAuthStrategy | 'saml' | 'enterprise_sso';
redirectUrl?: string;
actionCompleteRedirectUrl?: string;
}): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
await this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: params,
});

return { error: null };
} catch (err) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}
}

async password({ identifier, password }: { identifier: string; password: string }): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
await this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: { identifier, password },
});
} catch (err) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}

async sendEmailCode({ email }: { email: string }): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
if (!this.resource.id) {
await this.create({ identifier: email });
}

const emailCodeFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_code');

if (!emailCodeFactor) {
throw new Error('Email code factor not found');
}

const { emailAddressId } = emailCodeFactor;
await this.resource.__internal_basePost({
body: { emailAddressId, strategy: 'email_code' },
action: 'prepare_first_factor',
});
} catch (err: unknown) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}

async verifyEmailCode({ code }: { code: string }): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
await this.resource.__internal_basePost({
body: { code, strategy: 'email_code' },
action: 'attempt_first_factor',
});
} catch (err: unknown) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}

async sso({
flow = 'auto',
strategy,
redirectUrl,
redirectUrlComplete,
}: {
flow?: 'auto' | 'modal';
strategy: OAuthStrategy | 'saml' | 'enterprise_sso';
redirectUrl: string;
redirectUrlComplete: string;
}): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
if (flow !== 'auto') {
throw new Error('modal flow is not supported yet');
}

const redirectUrlWithAuthToken = SignIn.clerk.buildUrlWithAuth(redirectUrl);

if (!this.resource.id) {
await this.create({
strategy,
redirectUrl: redirectUrlWithAuthToken,
actionCompleteRedirectUrl: redirectUrlComplete,
});
}

const { status, externalVerificationRedirectURL } = this.resource.firstFactorVerification;

if (status === 'unverified' && externalVerificationRedirectURL) {
windowNavigate(externalVerificationRedirectURL);
}
} catch (err: unknown) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}
}
17 changes: 17 additions & 0 deletions packages/clerk-js/src/core/signals.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import { computed, signal } from 'alien-signals';

import type { SignIn } from './resources/SignIn';

export const signInSignal = signal<{ resource: SignIn | null }>({ resource: null });
export const signInErrorSignal = signal<{ errors: unknown }>({ errors: null });

export const signInComputedSignal = computed(() => {
const signIn = signInSignal().resource;
const errors = signInErrorSignal().errors;

if (!signIn) {
return { errors: null, signIn: null };
}

return { errors, signIn: signIn.__internal_future };
});
33 changes: 33 additions & 0 deletions packages/clerk-js/src/core/state.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import type { State as StateInterface } from '@clerk/types';
import { computed, effect } from 'alien-signals';

import { eventBus } from './events';
import type { BaseResource } from './resources/Base';
import { SignIn } from './resources/SignIn';
import { signInComputedSignal, signInErrorSignal, signInSignal } from './signals';

export class State implements StateInterface {

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.

JSDoc would be good here 👀 what's it for? Maybe it belongs on the State type instead.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I put it on the __internal_state type for Clerk, which I'm okay with for the time being since that's where other JSDoc comments for properties are. I'll add more general doc comments to this file in a later PR.

signInResourceSignal = signInSignal;
signInErrorSignal = signInErrorSignal;
signInSignal = signInComputedSignal;

__internal_effect = effect;
__internal_computed = computed;

constructor() {
eventBus.on('resource:update', this.onResourceUpdated);
eventBus.on('resource:error', this.onResourceError);
}

private onResourceError = (payload: { resource: BaseResource; error: unknown }) => {
if (payload.resource instanceof SignIn) {
this.signInErrorSignal({ errors: payload.error });
}
};

private onResourceUpdated = (payload: { resource: BaseResource }) => {
if (payload.resource instanceof SignIn) {
this.signInResourceSignal({ resource: payload.resource });
}
};
}
1 change: 1 addition & 0 deletions packages/react/src/experimental.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
export { CheckoutButton } from './components/CheckoutButton';
export { PlanDetailsButton } from './components/PlanDetailsButton';
export { SubscriptionDetailsButton } from './components/SubscriptionDetailsButton';
export { useSignInSignal } from './hooks/useClerkSignal';

export type {
__experimental_CheckoutButtonProps as CheckoutButtonProps,
Expand Down
52 changes: 52 additions & 0 deletions packages/react/src/hooks/useClerkSignal.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import type { SignInFutureResource } from '@clerk/types';
import { useCallback, useSyncExternalStore } from 'react';

import { useIsomorphicClerkContext } from '../contexts/IsomorphicClerkContext';
import { useAssertWrappedByClerkProvider } from './useAssertWrappedByClerkProvider';

function useClerkSignal(signal: 'signIn'): { errors: unknown; signIn: SignInFutureResource | null } | null {
useAssertWrappedByClerkProvider('useSignInSignal');

const clerk = useIsomorphicClerkContext();

const subscribe = useCallback(
(callback: () => void) => {
if (!clerk.loaded || !clerk.__internal_state) {
return () => {};
}

return clerk.__internal_state.__internal_effect(() => {
switch (signal) {
case 'signIn':
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- we know that the state is defined
clerk.__internal_state!.signInSignal();
break;
default:
throw new Error(`Unknown signal: ${signal}`);
}
callback();
});
},
[clerk, clerk.loaded, clerk.__internal_state],
);
const getSnapshot = useCallback(() => {
if (!clerk.__internal_state) {
return null;
}

switch (signal) {
case 'signIn':
return clerk.__internal_state.signInSignal();
default:
throw new Error(`Unknown signal: ${signal}`);
}
}, [clerk.__internal_state]);

const value = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);

return value;
}

export function useSignInSignal() {
return useClerkSignal('signIn');
}
5 changes: 5 additions & 0 deletions packages/react/src/isomorphicClerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@ import type {
SignUpProps,
SignUpRedirectOptions,
SignUpResource,
State,
TaskChooseOrganizationProps,
UnsubscribeCallback,
UserButtonProps,
Expand DownExpand Up@@ -714,6 +715,10 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
return this.clerkjs?.billing;
}

get __internal_state(): State | undefined {
return this.clerkjs?.__internal_state;
}

get apiKeys(): APIKeysNamespace | undefined {
return this.clerkjs?.apiKeys;
}
Expand Down
Loading
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
Show all changes
21 commits
Select commit Hold shift + click to select a range
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
7 changes: 7 additions & 0 deletions .changeset/dull-cups-accept.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch
'@clerk/clerk-react': patch
'@clerk/types': patch
---

[Experimental] Signals
8 changes: 4 additions & 4 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "620KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "74KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "115.08KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55.2KB" },
{ "path": "./dist/clerk.js", "maxSize": "621KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "75KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "117KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "57KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "113KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
Expand Down
1 change: 1 addition & 0 deletions packages/clerk-js/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,6 +75,7 @@
"@swc/helpers": "^0.5.17",
"@zxcvbn-ts/core": "3.0.4",
"@zxcvbn-ts/language-common": "3.0.4",
"alien-signals": "2.0.6",
"browser-tabs-lock": "1.3.0",
"copy-to-clipboard": "3.3.3",
"core-js": "3.41.0",
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ import {
Waitlist,
} from './resources/internal';
import { navigateToTask } from './sessionTasks';
import { State } from './state';
import { warnings } from './warnings';

type SetActiveHook = (intent?: 'sign-out') => void | Promise<void>;
Expand DownExpand Up@@ -211,6 +212,7 @@ export class Clerk implements ClerkInterface {
public user: UserResource | null | undefined;
public __internal_country?: string | null;
public telemetry: TelemetryCollector | undefined;
public readonly __internal_state: State = new State();

protected internal_last_error: ClerkAPIError | null = null;
// converted to protected environment to support `updateEnvironment` type assertion
Expand Down
8 changes: 8 additions & 0 deletions packages/clerk-js/src/core/events.ts
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,28 @@
import { createEventBus } from '@clerk/shared/eventBus';
import type { TokenResource } from '@clerk/types';

import type { BaseResource } from './resources/Base';

export const events = {
TokenUpdate: 'token:update',
UserSignOut: 'user:signOut',
EnvironmentUpdate: 'environment:update',
SessionTokenResolved: 'session:tokenResolved',
ResourceUpdate: 'resource:update',
ResourceError: 'resource:error',
} as const;

type TokenUpdatePayload = { token: TokenResource | null };
export type ResourceUpdatePayload = { resource: BaseResource };
export type ResourceErrorPayload = { resource: BaseResource; error: unknown };

type InternalEvents = {
[events.TokenUpdate]: TokenUpdatePayload;
[events.UserSignOut]: null;
[events.EnvironmentUpdate]: null;
[events.SessionTokenResolved]: null;
[events.ResourceUpdate]: ResourceUpdatePayload;
[events.ResourceError]: ResourceErrorPayload;
};

export const eventBus = createEventBus<InternalEvents>();
149 changes: 149 additions & 0 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ import type {
EmailCodeConfig,
EmailLinkConfig,
EnterpriseSSOConfig,
OAuthStrategy,
PassKeyConfig,
PasskeyFactor,
PhoneCodeConfig,
Expand All@@ -27,6 +28,7 @@ import type {
SamlConfig,
SignInCreateParams,
SignInFirstFactor,
SignInFutureResource,
SignInIdentifier,
SignInJSON,
SignInJSONSnapshot,
Expand DownExpand Up@@ -66,6 +68,7 @@ import {
clerkVerifyPasskeyCalledBeforeCreate,
clerkVerifyWeb3WalletCalledBeforeCreate,
} from '../errors';
import { eventBus } from '../events';
import { BaseResource, UserData, Verification } from './internal';

export class SignIn extends BaseResource implements SignInResource {
Expand All@@ -82,6 +85,21 @@ export class SignIn extends BaseResource implements SignInResource {
createdSessionId: string | null = null;
userData: UserData = new UserData(null);

/**
* @experimental This experimental API is subject to change.
*
* An instance of `SignInFuture`, which has a different API than `SignIn`, intended to be used in custom flows.
*/
__internal_future: SignInFuture | null = new SignInFuture(this);

/**
* @internal Only used for internal purposes, and is not intended to be used directly.
*
* This property is used to provide access to underlying Client methods to `SignInFuture`, which wraps an instance
* of `SignIn`.
*/
__internal_basePost = this._basePost.bind(this);

constructor(data: SignInJSON | SignInJSONSnapshot | null = null) {
super();
this.fromJSON(data);
Expand DownExpand Up@@ -451,6 +469,8 @@ export class SignIn extends BaseResource implements SignInResource {
this.createdSessionId = data.created_session_id;
this.userData = new UserData(data.user_data);
}

eventBus.emit('resource:update', { resource: this });
return this;
}

Expand All@@ -470,3 +490,132 @@ export class SignIn extends BaseResource implements SignInResource {
};
}
}

class SignInFuture implements SignInFutureResource {

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.

We can add JSDocs now or later to the methods here, but we should do it eventually! Saves us time later too 😄

emailCode = {
sendCode: this.sendEmailCode.bind(this),
verifyCode: this.verifyEmailCode.bind(this),
};

constructor(readonly resource: SignIn) {}

get status() {
return this.resource.status;
}

async create(params: {
identifier?: string;
strategy?: OAuthStrategy | 'saml' | 'enterprise_sso';
redirectUrl?: string;
actionCompleteRedirectUrl?: string;
}): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
await this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: params,
});

return { error: null };
} catch (err) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}
}

async password({ identifier, password }: { identifier: string; password: string }): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
await this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: { identifier, password },
});
} catch (err) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}

async sendEmailCode({ email }: { email: string }): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
if (!this.resource.id) {
await this.create({ identifier: email });
}

const emailCodeFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_code');

if (!emailCodeFactor) {
throw new Error('Email code factor not found');
}

const { emailAddressId } = emailCodeFactor;
await this.resource.__internal_basePost({
body: { emailAddressId, strategy: 'email_code' },
action: 'prepare_first_factor',
});
} catch (err: unknown) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}

async verifyEmailCode({ code }: { code: string }): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
await this.resource.__internal_basePost({
body: { code, strategy: 'email_code' },
action: 'attempt_first_factor',
});
} catch (err: unknown) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}

async sso({
flow = 'auto',
strategy,
redirectUrl,
redirectUrlComplete,
}: {
flow?: 'auto' | 'modal';
strategy: OAuthStrategy | 'saml' | 'enterprise_sso';
redirectUrl: string;
redirectUrlComplete: string;
}): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
if (flow !== 'auto') {
throw new Error('modal flow is not supported yet');
}

const redirectUrlWithAuthToken = SignIn.clerk.buildUrlWithAuth(redirectUrl);

if (!this.resource.id) {
await this.create({
strategy,
redirectUrl: redirectUrlWithAuthToken,
actionCompleteRedirectUrl: redirectUrlComplete,
});
}

const { status, externalVerificationRedirectURL } = this.resource.firstFactorVerification;

if (status === 'unverified' && externalVerificationRedirectURL) {
windowNavigate(externalVerificationRedirectURL);
}
} catch (err: unknown) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}
}
17 changes: 17 additions & 0 deletions packages/clerk-js/src/core/signals.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import { computed, signal } from 'alien-signals';

import type { SignIn } from './resources/SignIn';

export const signInSignal = signal<{ resource: SignIn | null }>({ resource: null });
export const signInErrorSignal = signal<{ errors: unknown }>({ errors: null });

export const signInComputedSignal = computed(() => {
const signIn = signInSignal().resource;
const errors = signInErrorSignal().errors;

if (!signIn) {
return { errors: null, signIn: null };
}

return { errors, signIn: signIn.__internal_future };
});
33 changes: 33 additions & 0 deletions packages/clerk-js/src/core/state.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import type { State as StateInterface } from '@clerk/types';
import { computed, effect } from 'alien-signals';

import { eventBus } from './events';
import type { BaseResource } from './resources/Base';
import { SignIn } from './resources/SignIn';
import { signInComputedSignal, signInErrorSignal, signInSignal } from './signals';

export class State implements StateInterface {

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.

JSDoc would be good here 👀 what's it for? Maybe it belongs on the State type instead.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I put it on the __internal_state type for Clerk, which I'm okay with for the time being since that's where other JSDoc comments for properties are. I'll add more general doc comments to this file in a later PR.

signInResourceSignal = signInSignal;
signInErrorSignal = signInErrorSignal;
signInSignal = signInComputedSignal;

__internal_effect = effect;
__internal_computed = computed;

constructor() {
eventBus.on('resource:update', this.onResourceUpdated);
eventBus.on('resource:error', this.onResourceError);
}

private onResourceError = (payload: { resource: BaseResource; error: unknown }) => {
if (payload.resource instanceof SignIn) {
this.signInErrorSignal({ errors: payload.error });
}
};

private onResourceUpdated = (payload: { resource: BaseResource }) => {
if (payload.resource instanceof SignIn) {
this.signInResourceSignal({ resource: payload.resource });
}
};
}
1 change: 1 addition & 0 deletions packages/react/src/experimental.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
export { CheckoutButton } from './components/CheckoutButton';
export { PlanDetailsButton } from './components/PlanDetailsButton';
export { SubscriptionDetailsButton } from './components/SubscriptionDetailsButton';
export { useSignInSignal } from './hooks/useClerkSignal';

export type {
__experimental_CheckoutButtonProps as CheckoutButtonProps,
Expand Down
52 changes: 52 additions & 0 deletions packages/react/src/hooks/useClerkSignal.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import type { SignInFutureResource } from '@clerk/types';
import { useCallback, useSyncExternalStore } from 'react';

import { useIsomorphicClerkContext } from '../contexts/IsomorphicClerkContext';
import { useAssertWrappedByClerkProvider } from './useAssertWrappedByClerkProvider';

function useClerkSignal(signal: 'signIn'): { errors: unknown; signIn: SignInFutureResource | null } | null {
useAssertWrappedByClerkProvider('useSignInSignal');

const clerk = useIsomorphicClerkContext();

const subscribe = useCallback(
(callback: () => void) => {
if (!clerk.loaded || !clerk.__internal_state) {
return () => {};
}

return clerk.__internal_state.__internal_effect(() => {
switch (signal) {
case 'signIn':
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- we know that the state is defined
clerk.__internal_state!.signInSignal();
break;
default:
throw new Error(`Unknown signal: ${signal}`);
}
callback();
});
},
[clerk, clerk.loaded, clerk.__internal_state],
);
const getSnapshot = useCallback(() => {
if (!clerk.__internal_state) {
return null;
}

switch (signal) {
case 'signIn':
return clerk.__internal_state.signInSignal();
default:
throw new Error(`Unknown signal: ${signal}`);
}
}, [clerk.__internal_state]);

const value = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);

return value;
}

export function useSignInSignal() {
return useClerkSignal('signIn');
}
5 changes: 5 additions & 0 deletions packages/react/src/isomorphicClerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@ import type {
SignUpProps,
SignUpRedirectOptions,
SignUpResource,
State,
TaskChooseOrganizationProps,
UnsubscribeCallback,
UserButtonProps,
Expand DownExpand Up@@ -714,6 +715,10 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
return this.clerkjs?.billing;
}

get __internal_state(): State | undefined {
return this.clerkjs?.__internal_state;
}

get apiKeys(): APIKeysNamespace | undefined {
return this.clerkjs?.apiKeys;
}
Expand Down
Loading
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
Show all changes
21 commits
Select commit Hold shift + click to select a range
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
7 changes: 7 additions & 0 deletions .changeset/dull-cups-accept.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch
'@clerk/clerk-react': patch
'@clerk/types': patch
---

[Experimental] Signals
8 changes: 4 additions & 4 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "620KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "74KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "115.08KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55.2KB" },
{ "path": "./dist/clerk.js", "maxSize": "621KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "75KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "117KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "57KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "113KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
Expand Down
1 change: 1 addition & 0 deletions packages/clerk-js/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,6 +75,7 @@
"@swc/helpers": "^0.5.17",
"@zxcvbn-ts/core": "3.0.4",
"@zxcvbn-ts/language-common": "3.0.4",
"alien-signals": "2.0.6",
"browser-tabs-lock": "1.3.0",
"copy-to-clipboard": "3.3.3",
"core-js": "3.41.0",
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ import {
Waitlist,
} from './resources/internal';
import { navigateToTask } from './sessionTasks';
import { State } from './state';
import { warnings } from './warnings';

type SetActiveHook = (intent?: 'sign-out') => void | Promise<void>;
Expand DownExpand Up@@ -211,6 +212,7 @@ export class Clerk implements ClerkInterface {
public user: UserResource | null | undefined;
public __internal_country?: string | null;
public telemetry: TelemetryCollector | undefined;
public readonly __internal_state: State = new State();

protected internal_last_error: ClerkAPIError | null = null;
// converted to protected environment to support `updateEnvironment` type assertion
Expand Down
8 changes: 8 additions & 0 deletions packages/clerk-js/src/core/events.ts
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,28 @@
import { createEventBus } from '@clerk/shared/eventBus';
import type { TokenResource } from '@clerk/types';

import type { BaseResource } from './resources/Base';

export const events = {
TokenUpdate: 'token:update',
UserSignOut: 'user:signOut',
EnvironmentUpdate: 'environment:update',
SessionTokenResolved: 'session:tokenResolved',
ResourceUpdate: 'resource:update',
ResourceError: 'resource:error',
} as const;

type TokenUpdatePayload = { token: TokenResource | null };
export type ResourceUpdatePayload = { resource: BaseResource };
export type ResourceErrorPayload = { resource: BaseResource; error: unknown };

type InternalEvents = {
[events.TokenUpdate]: TokenUpdatePayload;
[events.UserSignOut]: null;
[events.EnvironmentUpdate]: null;
[events.SessionTokenResolved]: null;
[events.ResourceUpdate]: ResourceUpdatePayload;
[events.ResourceError]: ResourceErrorPayload;
};

export const eventBus = createEventBus<InternalEvents>();
149 changes: 149 additions & 0 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ import type {
EmailCodeConfig,
EmailLinkConfig,
EnterpriseSSOConfig,
OAuthStrategy,
PassKeyConfig,
PasskeyFactor,
PhoneCodeConfig,
Expand All@@ -27,6 +28,7 @@ import type {
SamlConfig,
SignInCreateParams,
SignInFirstFactor,
SignInFutureResource,
SignInIdentifier,
SignInJSON,
SignInJSONSnapshot,
Expand DownExpand Up@@ -66,6 +68,7 @@ import {
clerkVerifyPasskeyCalledBeforeCreate,
clerkVerifyWeb3WalletCalledBeforeCreate,
} from '../errors';
import { eventBus } from '../events';
import { BaseResource, UserData, Verification } from './internal';

export class SignIn extends BaseResource implements SignInResource {
Expand All@@ -82,6 +85,21 @@ export class SignIn extends BaseResource implements SignInResource {
createdSessionId: string | null = null;
userData: UserData = new UserData(null);

/**
* @experimental This experimental API is subject to change.
*
* An instance of `SignInFuture`, which has a different API than `SignIn`, intended to be used in custom flows.
*/
__internal_future: SignInFuture | null = new SignInFuture(this);

/**
* @internal Only used for internal purposes, and is not intended to be used directly.
*
* This property is used to provide access to underlying Client methods to `SignInFuture`, which wraps an instance
* of `SignIn`.
*/
__internal_basePost = this._basePost.bind(this);

constructor(data: SignInJSON | SignInJSONSnapshot | null = null) {
super();
this.fromJSON(data);
Expand DownExpand Up@@ -451,6 +469,8 @@ export class SignIn extends BaseResource implements SignInResource {
this.createdSessionId = data.created_session_id;
this.userData = new UserData(data.user_data);
}

eventBus.emit('resource:update', { resource: this });
return this;
}

Expand All@@ -470,3 +490,132 @@ export class SignIn extends BaseResource implements SignInResource {
};
}
}

class SignInFuture implements SignInFutureResource {

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.

We can add JSDocs now or later to the methods here, but we should do it eventually! Saves us time later too 😄

emailCode = {
sendCode: this.sendEmailCode.bind(this),
verifyCode: this.verifyEmailCode.bind(this),
};

constructor(readonly resource: SignIn) {}

get status() {
return this.resource.status;
}

async create(params: {
identifier?: string;
strategy?: OAuthStrategy | 'saml' | 'enterprise_sso';
redirectUrl?: string;
actionCompleteRedirectUrl?: string;
}): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
await this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: params,
});

return { error: null };
} catch (err) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}
}

async password({ identifier, password }: { identifier: string; password: string }): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
await this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: { identifier, password },
});
} catch (err) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}

async sendEmailCode({ email }: { email: string }): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
if (!this.resource.id) {
await this.create({ identifier: email });
}

const emailCodeFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_code');

if (!emailCodeFactor) {
throw new Error('Email code factor not found');
}

const { emailAddressId } = emailCodeFactor;
await this.resource.__internal_basePost({
body: { emailAddressId, strategy: 'email_code' },
action: 'prepare_first_factor',
});
} catch (err: unknown) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}

async verifyEmailCode({ code }: { code: string }): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
await this.resource.__internal_basePost({
body: { code, strategy: 'email_code' },
action: 'attempt_first_factor',
});
} catch (err: unknown) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}

async sso({
flow = 'auto',
strategy,
redirectUrl,
redirectUrlComplete,
}: {
flow?: 'auto' | 'modal';
strategy: OAuthStrategy | 'saml' | 'enterprise_sso';
redirectUrl: string;
redirectUrlComplete: string;
}): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
if (flow !== 'auto') {
throw new Error('modal flow is not supported yet');
}

const redirectUrlWithAuthToken = SignIn.clerk.buildUrlWithAuth(redirectUrl);

if (!this.resource.id) {
await this.create({
strategy,
redirectUrl: redirectUrlWithAuthToken,
actionCompleteRedirectUrl: redirectUrlComplete,
});
}

const { status, externalVerificationRedirectURL } = this.resource.firstFactorVerification;

if (status === 'unverified' && externalVerificationRedirectURL) {
windowNavigate(externalVerificationRedirectURL);
}
} catch (err: unknown) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}
}
17 changes: 17 additions & 0 deletions packages/clerk-js/src/core/signals.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import { computed, signal } from 'alien-signals';

import type { SignIn } from './resources/SignIn';

export const signInSignal = signal<{ resource: SignIn | null }>({ resource: null });
export const signInErrorSignal = signal<{ errors: unknown }>({ errors: null });

export const signInComputedSignal = computed(() => {
const signIn = signInSignal().resource;
const errors = signInErrorSignal().errors;

if (!signIn) {
return { errors: null, signIn: null };
}

return { errors, signIn: signIn.__internal_future };
});
33 changes: 33 additions & 0 deletions packages/clerk-js/src/core/state.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import type { State as StateInterface } from '@clerk/types';
import { computed, effect } from 'alien-signals';

import { eventBus } from './events';
import type { BaseResource } from './resources/Base';
import { SignIn } from './resources/SignIn';
import { signInComputedSignal, signInErrorSignal, signInSignal } from './signals';

export class State implements StateInterface {

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.

JSDoc would be good here 👀 what's it for? Maybe it belongs on the State type instead.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I put it on the __internal_state type for Clerk, which I'm okay with for the time being since that's where other JSDoc comments for properties are. I'll add more general doc comments to this file in a later PR.

signInResourceSignal = signInSignal;
signInErrorSignal = signInErrorSignal;
signInSignal = signInComputedSignal;

__internal_effect = effect;
__internal_computed = computed;

constructor() {
eventBus.on('resource:update', this.onResourceUpdated);
eventBus.on('resource:error', this.onResourceError);
}

private onResourceError = (payload: { resource: BaseResource; error: unknown }) => {
if (payload.resource instanceof SignIn) {
this.signInErrorSignal({ errors: payload.error });
}
};

private onResourceUpdated = (payload: { resource: BaseResource }) => {
if (payload.resource instanceof SignIn) {
this.signInResourceSignal({ resource: payload.resource });
}
};
}
1 change: 1 addition & 0 deletions packages/react/src/experimental.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
export { CheckoutButton } from './components/CheckoutButton';
export { PlanDetailsButton } from './components/PlanDetailsButton';
export { SubscriptionDetailsButton } from './components/SubscriptionDetailsButton';
export { useSignInSignal } from './hooks/useClerkSignal';

export type {
__experimental_CheckoutButtonProps as CheckoutButtonProps,
Expand Down
52 changes: 52 additions & 0 deletions packages/react/src/hooks/useClerkSignal.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import type { SignInFutureResource } from '@clerk/types';
import { useCallback, useSyncExternalStore } from 'react';

import { useIsomorphicClerkContext } from '../contexts/IsomorphicClerkContext';
import { useAssertWrappedByClerkProvider } from './useAssertWrappedByClerkProvider';

function useClerkSignal(signal: 'signIn'): { errors: unknown; signIn: SignInFutureResource | null } | null {
useAssertWrappedByClerkProvider('useSignInSignal');

const clerk = useIsomorphicClerkContext();

const subscribe = useCallback(
(callback: () => void) => {
if (!clerk.loaded || !clerk.__internal_state) {
return () => {};
}

return clerk.__internal_state.__internal_effect(() => {
switch (signal) {
case 'signIn':
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- we know that the state is defined
clerk.__internal_state!.signInSignal();
break;
default:
throw new Error(`Unknown signal: ${signal}`);
}
callback();
});
},
[clerk, clerk.loaded, clerk.__internal_state],
);
const getSnapshot = useCallback(() => {
if (!clerk.__internal_state) {
return null;
}

switch (signal) {
case 'signIn':
return clerk.__internal_state.signInSignal();
default:
throw new Error(`Unknown signal: ${signal}`);
}
}, [clerk.__internal_state]);

const value = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);

return value;
}

export function useSignInSignal() {
return useClerkSignal('signIn');
}
5 changes: 5 additions & 0 deletions packages/react/src/isomorphicClerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@ import type {
SignUpProps,
SignUpRedirectOptions,
SignUpResource,
State,
TaskChooseOrganizationProps,
UnsubscribeCallback,
UserButtonProps,
Expand DownExpand Up@@ -714,6 +715,10 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
return this.clerkjs?.billing;
}

get __internal_state(): State | undefined {
return this.clerkjs?.__internal_state;
}

get apiKeys(): APIKeysNamespace | undefined {
return this.clerkjs?.apiKeys;
}
Expand Down
Loading
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
Show all changes
21 commits
Select commit Hold shift + click to select a range
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
7 changes: 7 additions & 0 deletions .changeset/dull-cups-accept.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch
'@clerk/clerk-react': patch
'@clerk/types': patch
---

[Experimental] Signals
8 changes: 4 additions & 4 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "620KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "74KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "115.08KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55.2KB" },
{ "path": "./dist/clerk.js", "maxSize": "621KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "75KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "117KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "57KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "113KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
Expand Down
1 change: 1 addition & 0 deletions packages/clerk-js/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,6 +75,7 @@
"@swc/helpers": "^0.5.17",
"@zxcvbn-ts/core": "3.0.4",
"@zxcvbn-ts/language-common": "3.0.4",
"alien-signals": "2.0.6",
"browser-tabs-lock": "1.3.0",
"copy-to-clipboard": "3.3.3",
"core-js": "3.41.0",
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ import {
Waitlist,
} from './resources/internal';
import { navigateToTask } from './sessionTasks';
import { State } from './state';
import { warnings } from './warnings';

type SetActiveHook = (intent?: 'sign-out') => void | Promise<void>;
Expand DownExpand Up@@ -211,6 +212,7 @@ export class Clerk implements ClerkInterface {
public user: UserResource | null | undefined;
public __internal_country?: string | null;
public telemetry: TelemetryCollector | undefined;
public readonly __internal_state: State = new State();

protected internal_last_error: ClerkAPIError | null = null;
// converted to protected environment to support `updateEnvironment` type assertion
Expand Down
8 changes: 8 additions & 0 deletions packages/clerk-js/src/core/events.ts
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,28 @@
import { createEventBus } from '@clerk/shared/eventBus';
import type { TokenResource } from '@clerk/types';

import type { BaseResource } from './resources/Base';

export const events = {
TokenUpdate: 'token:update',
UserSignOut: 'user:signOut',
EnvironmentUpdate: 'environment:update',
SessionTokenResolved: 'session:tokenResolved',
ResourceUpdate: 'resource:update',
ResourceError: 'resource:error',
} as const;

type TokenUpdatePayload = { token: TokenResource | null };
export type ResourceUpdatePayload = { resource: BaseResource };
export type ResourceErrorPayload = { resource: BaseResource; error: unknown };

type InternalEvents = {
[events.TokenUpdate]: TokenUpdatePayload;
[events.UserSignOut]: null;
[events.EnvironmentUpdate]: null;
[events.SessionTokenResolved]: null;
[events.ResourceUpdate]: ResourceUpdatePayload;
[events.ResourceError]: ResourceErrorPayload;
};

export const eventBus = createEventBus<InternalEvents>();
149 changes: 149 additions & 0 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ import type {
EmailCodeConfig,
EmailLinkConfig,
EnterpriseSSOConfig,
OAuthStrategy,
PassKeyConfig,
PasskeyFactor,
PhoneCodeConfig,
Expand All@@ -27,6 +28,7 @@ import type {
SamlConfig,
SignInCreateParams,
SignInFirstFactor,
SignInFutureResource,
SignInIdentifier,
SignInJSON,
SignInJSONSnapshot,
Expand DownExpand Up@@ -66,6 +68,7 @@ import {
clerkVerifyPasskeyCalledBeforeCreate,
clerkVerifyWeb3WalletCalledBeforeCreate,
} from '../errors';
import { eventBus } from '../events';
import { BaseResource, UserData, Verification } from './internal';

export class SignIn extends BaseResource implements SignInResource {
Expand All@@ -82,6 +85,21 @@ export class SignIn extends BaseResource implements SignInResource {
createdSessionId: string | null = null;
userData: UserData = new UserData(null);

/**
* @experimental This experimental API is subject to change.
*
* An instance of `SignInFuture`, which has a different API than `SignIn`, intended to be used in custom flows.
*/
__internal_future: SignInFuture | null = new SignInFuture(this);

/**
* @internal Only used for internal purposes, and is not intended to be used directly.
*
* This property is used to provide access to underlying Client methods to `SignInFuture`, which wraps an instance
* of `SignIn`.
*/
__internal_basePost = this._basePost.bind(this);

constructor(data: SignInJSON | SignInJSONSnapshot | null = null) {
super();
this.fromJSON(data);
Expand DownExpand Up@@ -451,6 +469,8 @@ export class SignIn extends BaseResource implements SignInResource {
this.createdSessionId = data.created_session_id;
this.userData = new UserData(data.user_data);
}

eventBus.emit('resource:update', { resource: this });
return this;
}

Expand All@@ -470,3 +490,132 @@ export class SignIn extends BaseResource implements SignInResource {
};
}
}

class SignInFuture implements SignInFutureResource {

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.

We can add JSDocs now or later to the methods here, but we should do it eventually! Saves us time later too 😄

emailCode = {
sendCode: this.sendEmailCode.bind(this),
verifyCode: this.verifyEmailCode.bind(this),
};

constructor(readonly resource: SignIn) {}

get status() {
return this.resource.status;
}

async create(params: {
identifier?: string;
strategy?: OAuthStrategy | 'saml' | 'enterprise_sso';
redirectUrl?: string;
actionCompleteRedirectUrl?: string;
}): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
await this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: params,
});

return { error: null };
} catch (err) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}
}

async password({ identifier, password }: { identifier: string; password: string }): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
await this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: { identifier, password },
});
} catch (err) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}

async sendEmailCode({ email }: { email: string }): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
if (!this.resource.id) {
await this.create({ identifier: email });
}

const emailCodeFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_code');

if (!emailCodeFactor) {
throw new Error('Email code factor not found');
}

const { emailAddressId } = emailCodeFactor;
await this.resource.__internal_basePost({
body: { emailAddressId, strategy: 'email_code' },
action: 'prepare_first_factor',
});
} catch (err: unknown) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}

async verifyEmailCode({ code }: { code: string }): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
await this.resource.__internal_basePost({
body: { code, strategy: 'email_code' },
action: 'attempt_first_factor',
});
} catch (err: unknown) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}

async sso({
flow = 'auto',
strategy,
redirectUrl,
redirectUrlComplete,
}: {
flow?: 'auto' | 'modal';
strategy: OAuthStrategy | 'saml' | 'enterprise_sso';
redirectUrl: string;
redirectUrlComplete: string;
}): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
if (flow !== 'auto') {
throw new Error('modal flow is not supported yet');
}

const redirectUrlWithAuthToken = SignIn.clerk.buildUrlWithAuth(redirectUrl);

if (!this.resource.id) {
await this.create({
strategy,
redirectUrl: redirectUrlWithAuthToken,
actionCompleteRedirectUrl: redirectUrlComplete,
});
}

const { status, externalVerificationRedirectURL } = this.resource.firstFactorVerification;

if (status === 'unverified' && externalVerificationRedirectURL) {
windowNavigate(externalVerificationRedirectURL);
}
} catch (err: unknown) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}
}
17 changes: 17 additions & 0 deletions packages/clerk-js/src/core/signals.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import { computed, signal } from 'alien-signals';

import type { SignIn } from './resources/SignIn';

export const signInSignal = signal<{ resource: SignIn | null }>({ resource: null });
export const signInErrorSignal = signal<{ errors: unknown }>({ errors: null });

export const signInComputedSignal = computed(() => {
const signIn = signInSignal().resource;
const errors = signInErrorSignal().errors;

if (!signIn) {
return { errors: null, signIn: null };
}

return { errors, signIn: signIn.__internal_future };
});
33 changes: 33 additions & 0 deletions packages/clerk-js/src/core/state.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import type { State as StateInterface } from '@clerk/types';
import { computed, effect } from 'alien-signals';

import { eventBus } from './events';
import type { BaseResource } from './resources/Base';
import { SignIn } from './resources/SignIn';
import { signInComputedSignal, signInErrorSignal, signInSignal } from './signals';

export class State implements StateInterface {

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.

JSDoc would be good here 👀 what's it for? Maybe it belongs on the State type instead.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I put it on the __internal_state type for Clerk, which I'm okay with for the time being since that's where other JSDoc comments for properties are. I'll add more general doc comments to this file in a later PR.

signInResourceSignal = signInSignal;
signInErrorSignal = signInErrorSignal;
signInSignal = signInComputedSignal;

__internal_effect = effect;
__internal_computed = computed;

constructor() {
eventBus.on('resource:update', this.onResourceUpdated);
eventBus.on('resource:error', this.onResourceError);
}

private onResourceError = (payload: { resource: BaseResource; error: unknown }) => {
if (payload.resource instanceof SignIn) {
this.signInErrorSignal({ errors: payload.error });
}
};

private onResourceUpdated = (payload: { resource: BaseResource }) => {
if (payload.resource instanceof SignIn) {
this.signInResourceSignal({ resource: payload.resource });
}
};
}
1 change: 1 addition & 0 deletions packages/react/src/experimental.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
export { CheckoutButton } from './components/CheckoutButton';
export { PlanDetailsButton } from './components/PlanDetailsButton';
export { SubscriptionDetailsButton } from './components/SubscriptionDetailsButton';
export { useSignInSignal } from './hooks/useClerkSignal';

export type {
__experimental_CheckoutButtonProps as CheckoutButtonProps,
Expand Down
52 changes: 52 additions & 0 deletions packages/react/src/hooks/useClerkSignal.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import type { SignInFutureResource } from '@clerk/types';
import { useCallback, useSyncExternalStore } from 'react';

import { useIsomorphicClerkContext } from '../contexts/IsomorphicClerkContext';
import { useAssertWrappedByClerkProvider } from './useAssertWrappedByClerkProvider';

function useClerkSignal(signal: 'signIn'): { errors: unknown; signIn: SignInFutureResource | null } | null {
useAssertWrappedByClerkProvider('useSignInSignal');

const clerk = useIsomorphicClerkContext();

const subscribe = useCallback(
(callback: () => void) => {
if (!clerk.loaded || !clerk.__internal_state) {
return () => {};
}

return clerk.__internal_state.__internal_effect(() => {
switch (signal) {
case 'signIn':
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- we know that the state is defined
clerk.__internal_state!.signInSignal();
break;
default:
throw new Error(`Unknown signal: ${signal}`);
}
callback();
});
},
[clerk, clerk.loaded, clerk.__internal_state],
);
const getSnapshot = useCallback(() => {
if (!clerk.__internal_state) {
return null;
}

switch (signal) {
case 'signIn':
return clerk.__internal_state.signInSignal();
default:
throw new Error(`Unknown signal: ${signal}`);
}
}, [clerk.__internal_state]);

const value = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);

return value;
}

export function useSignInSignal() {
return useClerkSignal('signIn');
}
5 changes: 5 additions & 0 deletions packages/react/src/isomorphicClerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@ import type {
SignUpProps,
SignUpRedirectOptions,
SignUpResource,
State,
TaskChooseOrganizationProps,
UnsubscribeCallback,
UserButtonProps,
Expand DownExpand Up@@ -714,6 +715,10 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
return this.clerkjs?.billing;
}

get __internal_state(): State | undefined {
return this.clerkjs?.__internal_state;
}

get apiKeys(): APIKeysNamespace | undefined {
return this.clerkjs?.apiKeys;
}
Expand Down
Loading
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
Show all changes
21 commits
Select commit Hold shift + click to select a range
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
7 changes: 7 additions & 0 deletions .changeset/dull-cups-accept.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch
'@clerk/clerk-react': patch
'@clerk/types': patch
---

[Experimental] Signals
8 changes: 4 additions & 4 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "620KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "74KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "115.08KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55.2KB" },
{ "path": "./dist/clerk.js", "maxSize": "621KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "75KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "117KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "57KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "113KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
Expand Down
1 change: 1 addition & 0 deletions packages/clerk-js/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,6 +75,7 @@
"@swc/helpers": "^0.5.17",
"@zxcvbn-ts/core": "3.0.4",
"@zxcvbn-ts/language-common": "3.0.4",
"alien-signals": "2.0.6",
"browser-tabs-lock": "1.3.0",
"copy-to-clipboard": "3.3.3",
"core-js": "3.41.0",
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ import {
Waitlist,
} from './resources/internal';
import { navigateToTask } from './sessionTasks';
import { State } from './state';
import { warnings } from './warnings';

type SetActiveHook = (intent?: 'sign-out') => void | Promise<void>;
Expand DownExpand Up@@ -211,6 +212,7 @@ export class Clerk implements ClerkInterface {
public user: UserResource | null | undefined;
public __internal_country?: string | null;
public telemetry: TelemetryCollector | undefined;
public readonly __internal_state: State = new State();

protected internal_last_error: ClerkAPIError | null = null;
// converted to protected environment to support `updateEnvironment` type assertion
Expand Down
8 changes: 8 additions & 0 deletions packages/clerk-js/src/core/events.ts
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,28 @@
import { createEventBus } from '@clerk/shared/eventBus';
import type { TokenResource } from '@clerk/types';

import type { BaseResource } from './resources/Base';

export const events = {
TokenUpdate: 'token:update',
UserSignOut: 'user:signOut',
EnvironmentUpdate: 'environment:update',
SessionTokenResolved: 'session:tokenResolved',
ResourceUpdate: 'resource:update',
ResourceError: 'resource:error',
} as const;

type TokenUpdatePayload = { token: TokenResource | null };
export type ResourceUpdatePayload = { resource: BaseResource };
export type ResourceErrorPayload = { resource: BaseResource; error: unknown };

type InternalEvents = {
[events.TokenUpdate]: TokenUpdatePayload;
[events.UserSignOut]: null;
[events.EnvironmentUpdate]: null;
[events.SessionTokenResolved]: null;
[events.ResourceUpdate]: ResourceUpdatePayload;
[events.ResourceError]: ResourceErrorPayload;
};

export const eventBus = createEventBus<InternalEvents>();
149 changes: 149 additions & 0 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ import type {
EmailCodeConfig,
EmailLinkConfig,
EnterpriseSSOConfig,
OAuthStrategy,
PassKeyConfig,
PasskeyFactor,
PhoneCodeConfig,
Expand All@@ -27,6 +28,7 @@ import type {
SamlConfig,
SignInCreateParams,
SignInFirstFactor,
SignInFutureResource,
SignInIdentifier,
SignInJSON,
SignInJSONSnapshot,
Expand DownExpand Up@@ -66,6 +68,7 @@ import {
clerkVerifyPasskeyCalledBeforeCreate,
clerkVerifyWeb3WalletCalledBeforeCreate,
} from '../errors';
import { eventBus } from '../events';
import { BaseResource, UserData, Verification } from './internal';

export class SignIn extends BaseResource implements SignInResource {
Expand All@@ -82,6 +85,21 @@ export class SignIn extends BaseResource implements SignInResource {
createdSessionId: string | null = null;
userData: UserData = new UserData(null);

/**
* @experimental This experimental API is subject to change.
*
* An instance of `SignInFuture`, which has a different API than `SignIn`, intended to be used in custom flows.
*/
__internal_future: SignInFuture | null = new SignInFuture(this);

/**
* @internal Only used for internal purposes, and is not intended to be used directly.
*
* This property is used to provide access to underlying Client methods to `SignInFuture`, which wraps an instance
* of `SignIn`.
*/
__internal_basePost = this._basePost.bind(this);

constructor(data: SignInJSON | SignInJSONSnapshot | null = null) {
super();
this.fromJSON(data);
Expand DownExpand Up@@ -451,6 +469,8 @@ export class SignIn extends BaseResource implements SignInResource {
this.createdSessionId = data.created_session_id;
this.userData = new UserData(data.user_data);
}

eventBus.emit('resource:update', { resource: this });
return this;
}

Expand All@@ -470,3 +490,132 @@ export class SignIn extends BaseResource implements SignInResource {
};
}
}

class SignInFuture implements SignInFutureResource {

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.

We can add JSDocs now or later to the methods here, but we should do it eventually! Saves us time later too 😄

emailCode = {
sendCode: this.sendEmailCode.bind(this),
verifyCode: this.verifyEmailCode.bind(this),
};

constructor(readonly resource: SignIn) {}

get status() {
return this.resource.status;
}

async create(params: {
identifier?: string;
strategy?: OAuthStrategy | 'saml' | 'enterprise_sso';
redirectUrl?: string;
actionCompleteRedirectUrl?: string;
}): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
await this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: params,
});

return { error: null };
} catch (err) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}
}

async password({ identifier, password }: { identifier: string; password: string }): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
await this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: { identifier, password },
});
} catch (err) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}

async sendEmailCode({ email }: { email: string }): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
if (!this.resource.id) {
await this.create({ identifier: email });
}

const emailCodeFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_code');

if (!emailCodeFactor) {
throw new Error('Email code factor not found');
}

const { emailAddressId } = emailCodeFactor;
await this.resource.__internal_basePost({
body: { emailAddressId, strategy: 'email_code' },
action: 'prepare_first_factor',
});
} catch (err: unknown) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}

async verifyEmailCode({ code }: { code: string }): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
await this.resource.__internal_basePost({
body: { code, strategy: 'email_code' },
action: 'attempt_first_factor',
});
} catch (err: unknown) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}

async sso({
flow = 'auto',
strategy,
redirectUrl,
redirectUrlComplete,
}: {
flow?: 'auto' | 'modal';
strategy: OAuthStrategy | 'saml' | 'enterprise_sso';
redirectUrl: string;
redirectUrlComplete: string;
}): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
if (flow !== 'auto') {
throw new Error('modal flow is not supported yet');
}

const redirectUrlWithAuthToken = SignIn.clerk.buildUrlWithAuth(redirectUrl);

if (!this.resource.id) {
await this.create({
strategy,
redirectUrl: redirectUrlWithAuthToken,
actionCompleteRedirectUrl: redirectUrlComplete,
});
}

const { status, externalVerificationRedirectURL } = this.resource.firstFactorVerification;

if (status === 'unverified' && externalVerificationRedirectURL) {
windowNavigate(externalVerificationRedirectURL);
}
} catch (err: unknown) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}
}
17 changes: 17 additions & 0 deletions packages/clerk-js/src/core/signals.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import { computed, signal } from 'alien-signals';

import type { SignIn } from './resources/SignIn';

export const signInSignal = signal<{ resource: SignIn | null }>({ resource: null });
export const signInErrorSignal = signal<{ errors: unknown }>({ errors: null });

export const signInComputedSignal = computed(() => {
const signIn = signInSignal().resource;
const errors = signInErrorSignal().errors;

if (!signIn) {
return { errors: null, signIn: null };
}

return { errors, signIn: signIn.__internal_future };
});
33 changes: 33 additions & 0 deletions packages/clerk-js/src/core/state.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import type { State as StateInterface } from '@clerk/types';
import { computed, effect } from 'alien-signals';

import { eventBus } from './events';
import type { BaseResource } from './resources/Base';
import { SignIn } from './resources/SignIn';
import { signInComputedSignal, signInErrorSignal, signInSignal } from './signals';

export class State implements StateInterface {

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.

JSDoc would be good here 👀 what's it for? Maybe it belongs on the State type instead.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I put it on the __internal_state type for Clerk, which I'm okay with for the time being since that's where other JSDoc comments for properties are. I'll add more general doc comments to this file in a later PR.

signInResourceSignal = signInSignal;
signInErrorSignal = signInErrorSignal;
signInSignal = signInComputedSignal;

__internal_effect = effect;
__internal_computed = computed;

constructor() {
eventBus.on('resource:update', this.onResourceUpdated);
eventBus.on('resource:error', this.onResourceError);
}

private onResourceError = (payload: { resource: BaseResource; error: unknown }) => {
if (payload.resource instanceof SignIn) {
this.signInErrorSignal({ errors: payload.error });
}
};

private onResourceUpdated = (payload: { resource: BaseResource }) => {
if (payload.resource instanceof SignIn) {
this.signInResourceSignal({ resource: payload.resource });
}
};
}
1 change: 1 addition & 0 deletions packages/react/src/experimental.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
export { CheckoutButton } from './components/CheckoutButton';
export { PlanDetailsButton } from './components/PlanDetailsButton';
export { SubscriptionDetailsButton } from './components/SubscriptionDetailsButton';
export { useSignInSignal } from './hooks/useClerkSignal';

export type {
__experimental_CheckoutButtonProps as CheckoutButtonProps,
Expand Down
52 changes: 52 additions & 0 deletions packages/react/src/hooks/useClerkSignal.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import type { SignInFutureResource } from '@clerk/types';
import { useCallback, useSyncExternalStore } from 'react';

import { useIsomorphicClerkContext } from '../contexts/IsomorphicClerkContext';
import { useAssertWrappedByClerkProvider } from './useAssertWrappedByClerkProvider';

function useClerkSignal(signal: 'signIn'): { errors: unknown; signIn: SignInFutureResource | null } | null {
useAssertWrappedByClerkProvider('useSignInSignal');

const clerk = useIsomorphicClerkContext();

const subscribe = useCallback(
(callback: () => void) => {
if (!clerk.loaded || !clerk.__internal_state) {
return () => {};
}

return clerk.__internal_state.__internal_effect(() => {
switch (signal) {
case 'signIn':
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- we know that the state is defined
clerk.__internal_state!.signInSignal();
break;
default:
throw new Error(`Unknown signal: ${signal}`);
}
callback();
});
},
[clerk, clerk.loaded, clerk.__internal_state],
);
const getSnapshot = useCallback(() => {
if (!clerk.__internal_state) {
return null;
}

switch (signal) {
case 'signIn':
return clerk.__internal_state.signInSignal();
default:
throw new Error(`Unknown signal: ${signal}`);
}
}, [clerk.__internal_state]);

const value = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);

return value;
}

export function useSignInSignal() {
return useClerkSignal('signIn');
}
5 changes: 5 additions & 0 deletions packages/react/src/isomorphicClerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@ import type {
SignUpProps,
SignUpRedirectOptions,
SignUpResource,
State,
TaskChooseOrganizationProps,
UnsubscribeCallback,
UserButtonProps,
Expand DownExpand Up@@ -714,6 +715,10 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
return this.clerkjs?.billing;
}

get __internal_state(): State | undefined {
return this.clerkjs?.__internal_state;
}

get apiKeys(): APIKeysNamespace | undefined {
return this.clerkjs?.apiKeys;
}
Expand Down
Loading
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
Show all changes
21 commits
Select commit Hold shift + click to select a range
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
7 changes: 7 additions & 0 deletions .changeset/dull-cups-accept.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch
'@clerk/clerk-react': patch
'@clerk/types': patch
---

[Experimental] Signals
8 changes: 4 additions & 4 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "620KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "74KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "115.08KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "55.2KB" },
{ "path": "./dist/clerk.js", "maxSize": "621KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "75KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "117KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "57KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "113KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "40.2KB" },
Expand Down
1 change: 1 addition & 0 deletions packages/clerk-js/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,6 +75,7 @@
"@swc/helpers": "^0.5.17",
"@zxcvbn-ts/core": "3.0.4",
"@zxcvbn-ts/language-common": "3.0.4",
"alien-signals": "2.0.6",
"browser-tabs-lock": "1.3.0",
"copy-to-clipboard": "3.3.3",
"core-js": "3.41.0",
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,6 +154,7 @@ import {
Waitlist,
} from './resources/internal';
import { navigateToTask } from './sessionTasks';
import { State } from './state';
import { warnings } from './warnings';

type SetActiveHook = (intent?: 'sign-out') => void | Promise<void>;
Expand DownExpand Up@@ -211,6 +212,7 @@ export class Clerk implements ClerkInterface {
public user: UserResource | null | undefined;
public __internal_country?: string | null;
public telemetry: TelemetryCollector | undefined;
public readonly __internal_state: State = new State();

protected internal_last_error: ClerkAPIError | null = null;
// converted to protected environment to support `updateEnvironment` type assertion
Expand Down
8 changes: 8 additions & 0 deletions packages/clerk-js/src/core/events.ts
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,28 @@
import { createEventBus } from '@clerk/shared/eventBus';
import type { TokenResource } from '@clerk/types';

import type { BaseResource } from './resources/Base';

export const events = {
TokenUpdate: 'token:update',
UserSignOut: 'user:signOut',
EnvironmentUpdate: 'environment:update',
SessionTokenResolved: 'session:tokenResolved',
ResourceUpdate: 'resource:update',
ResourceError: 'resource:error',
} as const;

type TokenUpdatePayload = { token: TokenResource | null };
export type ResourceUpdatePayload = { resource: BaseResource };
export type ResourceErrorPayload = { resource: BaseResource; error: unknown };

type InternalEvents = {
[events.TokenUpdate]: TokenUpdatePayload;
[events.UserSignOut]: null;
[events.EnvironmentUpdate]: null;
[events.SessionTokenResolved]: null;
[events.ResourceUpdate]: ResourceUpdatePayload;
[events.ResourceError]: ResourceErrorPayload;
};

export const eventBus = createEventBus<InternalEvents>();
149 changes: 149 additions & 0 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@ import type {
EmailCodeConfig,
EmailLinkConfig,
EnterpriseSSOConfig,
OAuthStrategy,
PassKeyConfig,
PasskeyFactor,
PhoneCodeConfig,
Expand All@@ -27,6 +28,7 @@ import type {
SamlConfig,
SignInCreateParams,
SignInFirstFactor,
SignInFutureResource,
SignInIdentifier,
SignInJSON,
SignInJSONSnapshot,
Expand DownExpand Up@@ -66,6 +68,7 @@ import {
clerkVerifyPasskeyCalledBeforeCreate,
clerkVerifyWeb3WalletCalledBeforeCreate,
} from '../errors';
import { eventBus } from '../events';
import { BaseResource, UserData, Verification } from './internal';

export class SignIn extends BaseResource implements SignInResource {
Expand All@@ -82,6 +85,21 @@ export class SignIn extends BaseResource implements SignInResource {
createdSessionId: string | null = null;
userData: UserData = new UserData(null);

/**
* @experimental This experimental API is subject to change.
*
* An instance of `SignInFuture`, which has a different API than `SignIn`, intended to be used in custom flows.
*/
__internal_future: SignInFuture | null = new SignInFuture(this);

/**
* @internal Only used for internal purposes, and is not intended to be used directly.
*
* This property is used to provide access to underlying Client methods to `SignInFuture`, which wraps an instance
* of `SignIn`.
*/
__internal_basePost = this._basePost.bind(this);

constructor(data: SignInJSON | SignInJSONSnapshot | null = null) {
super();
this.fromJSON(data);
Expand DownExpand Up@@ -451,6 +469,8 @@ export class SignIn extends BaseResource implements SignInResource {
this.createdSessionId = data.created_session_id;
this.userData = new UserData(data.user_data);
}

eventBus.emit('resource:update', { resource: this });
return this;
}

Expand All@@ -470,3 +490,132 @@ export class SignIn extends BaseResource implements SignInResource {
};
}
}

class SignInFuture implements SignInFutureResource {

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.

We can add JSDocs now or later to the methods here, but we should do it eventually! Saves us time later too 😄

emailCode = {
sendCode: this.sendEmailCode.bind(this),
verifyCode: this.verifyEmailCode.bind(this),
};

constructor(readonly resource: SignIn) {}

get status() {
return this.resource.status;
}

async create(params: {
identifier?: string;
strategy?: OAuthStrategy | 'saml' | 'enterprise_sso';
redirectUrl?: string;
actionCompleteRedirectUrl?: string;
}): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
await this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: params,
});

return { error: null };
} catch (err) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}
}

async password({ identifier, password }: { identifier: string; password: string }): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
await this.resource.__internal_basePost({
path: this.resource.pathRoot,
body: { identifier, password },
});
} catch (err) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}

async sendEmailCode({ email }: { email: string }): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
if (!this.resource.id) {
await this.create({ identifier: email });
}

const emailCodeFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_code');

if (!emailCodeFactor) {
throw new Error('Email code factor not found');
}

const { emailAddressId } = emailCodeFactor;
await this.resource.__internal_basePost({
body: { emailAddressId, strategy: 'email_code' },
action: 'prepare_first_factor',
});
} catch (err: unknown) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}

async verifyEmailCode({ code }: { code: string }): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
await this.resource.__internal_basePost({
body: { code, strategy: 'email_code' },
action: 'attempt_first_factor',
});
} catch (err: unknown) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}

async sso({
flow = 'auto',
strategy,
redirectUrl,
redirectUrlComplete,
}: {
flow?: 'auto' | 'modal';
strategy: OAuthStrategy | 'saml' | 'enterprise_sso';
redirectUrl: string;
redirectUrlComplete: string;
}): Promise<{ error: unknown }> {
eventBus.emit('resource:error', { resource: this.resource, error: null });
try {
if (flow !== 'auto') {
throw new Error('modal flow is not supported yet');
}

const redirectUrlWithAuthToken = SignIn.clerk.buildUrlWithAuth(redirectUrl);

if (!this.resource.id) {
await this.create({
strategy,
redirectUrl: redirectUrlWithAuthToken,
actionCompleteRedirectUrl: redirectUrlComplete,
});
}

const { status, externalVerificationRedirectURL } = this.resource.firstFactorVerification;

if (status === 'unverified' && externalVerificationRedirectURL) {
windowNavigate(externalVerificationRedirectURL);
}
} catch (err: unknown) {
eventBus.emit('resource:error', { resource: this.resource, error: err });
return { error: err };
}

return { error: null };
}
}
17 changes: 17 additions & 0 deletions packages/clerk-js/src/core/signals.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
import { computed, signal } from 'alien-signals';

import type { SignIn } from './resources/SignIn';

export const signInSignal = signal<{ resource: SignIn | null }>({ resource: null });
export const signInErrorSignal = signal<{ errors: unknown }>({ errors: null });

export const signInComputedSignal = computed(() => {
const signIn = signInSignal().resource;
const errors = signInErrorSignal().errors;

if (!signIn) {
return { errors: null, signIn: null };
}

return { errors, signIn: signIn.__internal_future };
});
33 changes: 33 additions & 0 deletions packages/clerk-js/src/core/state.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
import type { State as StateInterface } from '@clerk/types';
import { computed, effect } from 'alien-signals';

import { eventBus } from './events';
import type { BaseResource } from './resources/Base';
import { SignIn } from './resources/SignIn';
import { signInComputedSignal, signInErrorSignal, signInSignal } from './signals';

export class State implements StateInterface {

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.

JSDoc would be good here 👀 what's it for? Maybe it belongs on the State type instead.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

I put it on the __internal_state type for Clerk, which I'm okay with for the time being since that's where other JSDoc comments for properties are. I'll add more general doc comments to this file in a later PR.

signInResourceSignal = signInSignal;
signInErrorSignal = signInErrorSignal;
signInSignal = signInComputedSignal;

__internal_effect = effect;
__internal_computed = computed;

constructor() {
eventBus.on('resource:update', this.onResourceUpdated);
eventBus.on('resource:error', this.onResourceError);
}

private onResourceError = (payload: { resource: BaseResource; error: unknown }) => {
if (payload.resource instanceof SignIn) {
this.signInErrorSignal({ errors: payload.error });
}
};

private onResourceUpdated = (payload: { resource: BaseResource }) => {
if (payload.resource instanceof SignIn) {
this.signInResourceSignal({ resource: payload.resource });
}
};
}
1 change: 1 addition & 0 deletions packages/react/src/experimental.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
export { CheckoutButton } from './components/CheckoutButton';
export { PlanDetailsButton } from './components/PlanDetailsButton';
export { SubscriptionDetailsButton } from './components/SubscriptionDetailsButton';
export { useSignInSignal } from './hooks/useClerkSignal';

export type {
__experimental_CheckoutButtonProps as CheckoutButtonProps,
Expand Down
52 changes: 52 additions & 0 deletions packages/react/src/hooks/useClerkSignal.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
import type { SignInFutureResource } from '@clerk/types';
import { useCallback, useSyncExternalStore } from 'react';

import { useIsomorphicClerkContext } from '../contexts/IsomorphicClerkContext';
import { useAssertWrappedByClerkProvider } from './useAssertWrappedByClerkProvider';

function useClerkSignal(signal: 'signIn'): { errors: unknown; signIn: SignInFutureResource | null } | null {
useAssertWrappedByClerkProvider('useSignInSignal');

const clerk = useIsomorphicClerkContext();

const subscribe = useCallback(
(callback: () => void) => {
if (!clerk.loaded || !clerk.__internal_state) {
return () => {};
}

return clerk.__internal_state.__internal_effect(() => {
switch (signal) {
case 'signIn':
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- we know that the state is defined
clerk.__internal_state!.signInSignal();
break;
default:
throw new Error(`Unknown signal: ${signal}`);
}
callback();
});
},
[clerk, clerk.loaded, clerk.__internal_state],
);
const getSnapshot = useCallback(() => {
if (!clerk.__internal_state) {
return null;
}

switch (signal) {
case 'signIn':
return clerk.__internal_state.signInSignal();
default:
throw new Error(`Unknown signal: ${signal}`);
}
}, [clerk.__internal_state]);

const value = useSyncExternalStore(subscribe, getSnapshot, getSnapshot);

return value;
}

export function useSignInSignal() {
return useClerkSignal('signIn');
}
5 changes: 5 additions & 0 deletions packages/react/src/isomorphicClerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,7 @@ import type {
SignUpProps,
SignUpRedirectOptions,
SignUpResource,
State,
TaskChooseOrganizationProps,
UnsubscribeCallback,
UserButtonProps,
Expand DownExpand Up@@ -714,6 +715,10 @@ export class IsomorphicClerk implements IsomorphicLoadedClerk {
return this.clerkjs?.billing;
}

get __internal_state(): State | undefined {
return this.clerkjs?.__internal_state;
}

get apiKeys(): APIKeysNamespace | undefined {
return this.clerkjs?.apiKeys;
}
Expand Down
Loading
Loading