Merged
7 changes: 7 additions & 0 deletions .changeset/free-rockets-flow.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': minor
'@clerk/clerk-react': minor
'@clerk/types': minor
---

[Experimental] Signal email link support
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"files": [
{ "path": "./dist/clerk.js", "maxSize": "819KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "79KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "120.2KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "121KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "120KB" },
Expand Down
96 changes: 96 additions & 0 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { inBrowser } from '@clerk/shared/browser';
import { ClerkWebAuthnError } from '@clerk/shared/error';
import { Poller } from '@clerk/shared/poller';
import { deepCamelToSnake, deepSnakeToCamel } from '@clerk/shared/underscore';
Expand DownExpand Up@@ -31,6 +32,7 @@ import type {
SignInFutureCreateParams,
SignInFutureEmailCodeSendParams,
SignInFutureEmailCodeVerifyParams,
SignInFutureEmailLinkSendParams,
SignInFutureFinalizeParams,
SignInFutureMFAPhoneCodeVerifyParams,
SignInFuturePasswordParams,
Expand DownExpand Up@@ -61,6 +63,7 @@ import {
generateSignatureWithMetamask,
generateSignatureWithOKXWallet,
getBaseIdentifier,
getClerkQueryParam,
getCoinbaseWalletIdentifier,
getMetamaskIdentifier,
getOKXWalletIdentifier,
Expand DownExpand Up@@ -140,6 +143,14 @@ export class SignIn extends BaseResource implements SignInResource {
*/
__internal_basePost = this._basePost.bind(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_baseGet = this._baseGet.bind(this);

constructor(data: SignInJSON | SignInJSONSnapshot | null = null) {
super();
this.fromJSON(data);
Expand DownExpand Up@@ -539,6 +550,34 @@ class SignInFuture implements SignInFutureResource {
verifyCode: this.verifyEmailCode.bind(this),
};

emailLink = {
sendLink: this.sendEmailLink.bind(this),
waitForVerification: this.waitForEmailLinkVerification.bind(this),
get verification() {
if (!inBrowser()) {
return null;
}

const status = getClerkQueryParam('__clerk_status') as 'verified' | 'expired' | 'failed' | 'client_mismatch';
const createdSessionId = getClerkQueryParam('__clerk_created_session');

if (!status || !createdSessionId) {
return null;
}

const verifiedFromTheSameClient =
status === 'verified' &&
typeof SignIn.clerk.client !== 'undefined' &&
SignIn.clerk.client.sessions.some(s => s.id === createdSessionId);

return {
status,
createdSessionId,
verifiedFromTheSameClient,
};
},
};

resetPasswordEmailCode = {
sendCode: this.sendResetPasswordEmailCode.bind(this),
verifyCode: this.verifyResetPasswordEmailCode.bind(this),
Expand DownExpand Up@@ -583,6 +622,10 @@ class SignInFuture implements SignInFutureResource {
return undefined;
}

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

async sendResetPasswordEmailCode(): Promise<{ error: unknown }> {
return runAsyncResourceTask(this.resource, async () => {
if (!this.resource.id) {
Expand DownExpand Up@@ -680,6 +723,56 @@ class SignInFuture implements SignInFutureResource {
});
}

async sendEmailLink(params: SignInFutureEmailLinkSendParams): Promise<{ error: unknown }> {
const { email, verificationUrl } = params;
return runAsyncResourceTask(this.resource, async () => {
if (!this.resource.id) {
await this.create({ identifier: email });
}

const emailLinkFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_link');

if (!emailLinkFactor) {
throw new Error('Email link factor not found');
}

const { emailAddressId } = emailLinkFactor;

let absoluteVerificationUrl = verificationUrl;
try {
new URL(verificationUrl);
} catch {
absoluteVerificationUrl = window.location.origin + verificationUrl;
}

await this.resource.__internal_basePost({
body: { emailAddressId, redirectUrl: absoluteVerificationUrl, strategy: 'email_link' },
action: 'prepare_first_factor',
});
});
}

async waitForEmailLinkVerification(): Promise<{ error: unknown }> {
return runAsyncResourceTask(this.resource, async () => {
const { run, stop } = Poller();
await new Promise((resolve, reject) => {
void run(async () => {
try {
const res = await this.resource.__internal_baseGet();
const status = res.firstFactorVerification.status;
if (status === 'verified' || status === 'expired') {
stop();
resolve(res);
}
} catch (err) {
stop();
reject(err);
}
});
});
});
}

async sendPhoneCode(params: SignInFuturePhoneCodeSendParams): Promise<{ error: unknown }> {
const { phoneNumber, channel = 'sms' } = params;
return runAsyncResourceTask(this.resource, async () => {
Expand DownExpand Up@@ -787,6 +880,9 @@ class SignInFuture implements SignInFutureResource {
throw new Error('Cannot finalize sign-in without a created session.');
}

// Reload the client to prevent an issue where the created session is not picked up.
await SignIn.clerk.client?.reload();

await SignIn.clerk.setActive({ session: this.resource.createdSessionId, navigate });
});
}
Expand Down
51 changes: 51 additions & 0 deletions packages/react/src/stateProxy.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ export class StateProxy implements State {
}

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

return {
Expand All@@ -44,13 +45,40 @@ export class StateProxy implements State {
status: 'needs_identifier' as const,
availableStrategies: [],
isTransferable: false,
get firstFactorVerification() {
return gateProperty(target, 'firstFactorVerification', {
status: null,
error: null,
expireAt: null,
externalVerificationRedirectURL: null,
nonce: null,
attempts: null,
message: null,
strategy: null,
verifiedAtClient: null,
verifiedFromTheSameClient: () => false,
__internal_toSnapshot: () => {
throw new Error('__internal_toSnapshot called before Clerk is loaded');
},
pathRoot: '',
reload: () => {
throw new Error('__internal_toSnapshot called before Clerk is loaded');
},
});
},

create: this.gateMethod(target, 'create'),
password: this.gateMethod(target, 'password'),
sso: this.gateMethod(target, 'sso'),
finalize: this.gateMethod(target, 'finalize'),

emailCode: this.wrapMethods(() => target().emailCode, ['sendCode', 'verifyCode'] as const),
emailLink: this.wrapStruct(

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.

Do we need wrapStruct because of the getter (verification) that was introduced?

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.

yeah, emailLink has both methods and properties. We might be able to just use wrapStruct in place of wrapMethods to be consistent though. Not sure if it's worth refactoring since this entire construct might be going away (hopefully [please])

() => target().emailLink,
['sendLink', 'waitForVerification'] as const,
['verification'] as const,
{ verification: null },
),
resetPasswordEmailCode: this.wrapMethods(() => target().resetPasswordEmailCode, [
'sendCode',
'verifyCode',
Expand DownExpand Up@@ -148,4 +176,27 @@ export class StateProxy implements State {
): Pick<T, K[number]> {
return Object.fromEntries(keys.map(k => [k, this.gateMethod(getTarget, k)])) as Pick<T, K[number]>;
}

private wrapStruct<T extends object, M extends readonly (keyof T)[], G extends readonly (keyof T)[]>(
getTarget: () => T,
methods: M,
getters: G,
fallbacks: Pick<T, G[number]>,
): Pick<T, M[number] | G[number]> & {
[K in M[number]]: T[K] extends (...args: any[]) => any ? T[K] : never;
} & {
[K in G[number]]: T[K] extends (...args: any[]) => any ? never : T[K];
} {
const out: any = {};
for (const m of methods) {
out[m] = this.gateMethod(getTarget, m as any);
}
for (const g of getters) {
Object.defineProperty(out, g, {
get: () => this.gateProperty(getTarget, g as any, (fallbacks as any)[g]),
enumerable: true,
});
}
return out;
}
}
43 changes: 43 additions & 0 deletions packages/types/src/signInFuture.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { SetActiveNavigate } from './clerk';
import type { PhoneCodeChannel } from './phoneCodeChannel';
import type { SignInFirstFactor, SignInStatus } from './signInCommon';
import type { OAuthStrategy } from './strategies';
import type { VerificationResource } from './verification';

export interface SignInFutureCreateParams {
identifier?: string;
Expand DownExpand Up@@ -41,6 +42,11 @@ export interface SignInFutureEmailCodeSendParams {
email: string;
}

export interface SignInFutureEmailLinkSendParams {
email: string;
verificationUrl: string;
}

export interface SignInFutureEmailCodeVerifyParams {
code: string;
}
Expand DownExpand Up@@ -111,6 +117,8 @@ export interface SignInFutureResource {

readonly existingSession?: { sessionId: string };

readonly firstFactorVerification: VerificationResource;

/**
* Used to supply an identifier for the sign-in attempt. Calling this method will populate data on the sign-in
* attempt, such as `signIn.resource.supportedFirstFactors`.
Expand All@@ -137,6 +145,41 @@ export interface SignInFutureResource {
verifyCode: (params: SignInFutureEmailCodeVerifyParams) => Promise<{ error: unknown }>;
};

/**
*
*/
emailLink: {
/**
* Used to send an email link to sign-in
*/
sendLink: (params: SignInFutureEmailLinkSendParams) => Promise<{ error: unknown }>;

/**
* Will wait for verification to complete or expire
*/
waitForVerification: () => Promise<{ error: unknown }>;

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.

The DX guide original stated .verifyLink but I do think waitForVerification is better 👍🏻


/**
* The verification status
*/
verification: {
/**
* The verification status
*/
status: 'verified' | 'expired' | 'failed' | 'client_mismatch';

/**
* The created session ID
*/
createdSessionId: string;

/**
* Whether the verification was from the same client
*/
verifiedFromTheSameClient: boolean;
} | null;
};

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

[Experimental] Signal email link support
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"files": [
{ "path": "./dist/clerk.js", "maxSize": "819KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "79KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "120.2KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "121KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "120KB" },
Expand Down
96 changes: 96 additions & 0 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { inBrowser } from '@clerk/shared/browser';
import { ClerkWebAuthnError } from '@clerk/shared/error';
import { Poller } from '@clerk/shared/poller';
import { deepCamelToSnake, deepSnakeToCamel } from '@clerk/shared/underscore';
Expand DownExpand Up@@ -31,6 +32,7 @@ import type {
SignInFutureCreateParams,
SignInFutureEmailCodeSendParams,
SignInFutureEmailCodeVerifyParams,
SignInFutureEmailLinkSendParams,
SignInFutureFinalizeParams,
SignInFutureMFAPhoneCodeVerifyParams,
SignInFuturePasswordParams,
Expand DownExpand Up@@ -61,6 +63,7 @@ import {
generateSignatureWithMetamask,
generateSignatureWithOKXWallet,
getBaseIdentifier,
getClerkQueryParam,
getCoinbaseWalletIdentifier,
getMetamaskIdentifier,
getOKXWalletIdentifier,
Expand DownExpand Up@@ -140,6 +143,14 @@ export class SignIn extends BaseResource implements SignInResource {
*/
__internal_basePost = this._basePost.bind(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_baseGet = this._baseGet.bind(this);

constructor(data: SignInJSON | SignInJSONSnapshot | null = null) {
super();
this.fromJSON(data);
Expand DownExpand Up@@ -539,6 +550,34 @@ class SignInFuture implements SignInFutureResource {
verifyCode: this.verifyEmailCode.bind(this),
};

emailLink = {
sendLink: this.sendEmailLink.bind(this),
waitForVerification: this.waitForEmailLinkVerification.bind(this),
get verification() {
if (!inBrowser()) {
return null;
}

const status = getClerkQueryParam('__clerk_status') as 'verified' | 'expired' | 'failed' | 'client_mismatch';
const createdSessionId = getClerkQueryParam('__clerk_created_session');

if (!status || !createdSessionId) {
return null;
}

const verifiedFromTheSameClient =
status === 'verified' &&
typeof SignIn.clerk.client !== 'undefined' &&
SignIn.clerk.client.sessions.some(s => s.id === createdSessionId);

return {
status,
createdSessionId,
verifiedFromTheSameClient,
};
},
};

resetPasswordEmailCode = {
sendCode: this.sendResetPasswordEmailCode.bind(this),
verifyCode: this.verifyResetPasswordEmailCode.bind(this),
Expand DownExpand Up@@ -583,6 +622,10 @@ class SignInFuture implements SignInFutureResource {
return undefined;
}

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

async sendResetPasswordEmailCode(): Promise<{ error: unknown }> {
return runAsyncResourceTask(this.resource, async () => {
if (!this.resource.id) {
Expand DownExpand Up@@ -680,6 +723,56 @@ class SignInFuture implements SignInFutureResource {
});
}

async sendEmailLink(params: SignInFutureEmailLinkSendParams): Promise<{ error: unknown }> {
const { email, verificationUrl } = params;
return runAsyncResourceTask(this.resource, async () => {
if (!this.resource.id) {
await this.create({ identifier: email });
}

const emailLinkFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_link');

if (!emailLinkFactor) {
throw new Error('Email link factor not found');
}

const { emailAddressId } = emailLinkFactor;

let absoluteVerificationUrl = verificationUrl;
try {
new URL(verificationUrl);
} catch {
absoluteVerificationUrl = window.location.origin + verificationUrl;
}

await this.resource.__internal_basePost({
body: { emailAddressId, redirectUrl: absoluteVerificationUrl, strategy: 'email_link' },
action: 'prepare_first_factor',
});
});
}

async waitForEmailLinkVerification(): Promise<{ error: unknown }> {
return runAsyncResourceTask(this.resource, async () => {
const { run, stop } = Poller();
await new Promise((resolve, reject) => {
void run(async () => {
try {
const res = await this.resource.__internal_baseGet();
const status = res.firstFactorVerification.status;
if (status === 'verified' || status === 'expired') {
stop();
resolve(res);
}
} catch (err) {
stop();
reject(err);
}
});
});
});
}

async sendPhoneCode(params: SignInFuturePhoneCodeSendParams): Promise<{ error: unknown }> {
const { phoneNumber, channel = 'sms' } = params;
return runAsyncResourceTask(this.resource, async () => {
Expand DownExpand Up@@ -787,6 +880,9 @@ class SignInFuture implements SignInFutureResource {
throw new Error('Cannot finalize sign-in without a created session.');
}

// Reload the client to prevent an issue where the created session is not picked up.
await SignIn.clerk.client?.reload();

await SignIn.clerk.setActive({ session: this.resource.createdSessionId, navigate });
});
}
Expand Down
51 changes: 51 additions & 0 deletions packages/react/src/stateProxy.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ export class StateProxy implements State {
}

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

return {
Expand All@@ -44,13 +45,40 @@ export class StateProxy implements State {
status: 'needs_identifier' as const,
availableStrategies: [],
isTransferable: false,
get firstFactorVerification() {
return gateProperty(target, 'firstFactorVerification', {
status: null,
error: null,
expireAt: null,
externalVerificationRedirectURL: null,
nonce: null,
attempts: null,
message: null,
strategy: null,
verifiedAtClient: null,
verifiedFromTheSameClient: () => false,
__internal_toSnapshot: () => {
throw new Error('__internal_toSnapshot called before Clerk is loaded');
},
pathRoot: '',
reload: () => {
throw new Error('__internal_toSnapshot called before Clerk is loaded');
},
});
},

create: this.gateMethod(target, 'create'),
password: this.gateMethod(target, 'password'),
sso: this.gateMethod(target, 'sso'),
finalize: this.gateMethod(target, 'finalize'),

emailCode: this.wrapMethods(() => target().emailCode, ['sendCode', 'verifyCode'] as const),
emailLink: this.wrapStruct(

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.

Do we need wrapStruct because of the getter (verification) that was introduced?

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.

yeah, emailLink has both methods and properties. We might be able to just use wrapStruct in place of wrapMethods to be consistent though. Not sure if it's worth refactoring since this entire construct might be going away (hopefully [please])

() => target().emailLink,
['sendLink', 'waitForVerification'] as const,
['verification'] as const,
{ verification: null },
),
resetPasswordEmailCode: this.wrapMethods(() => target().resetPasswordEmailCode, [
'sendCode',
'verifyCode',
Expand DownExpand Up@@ -148,4 +176,27 @@ export class StateProxy implements State {
): Pick<T, K[number]> {
return Object.fromEntries(keys.map(k => [k, this.gateMethod(getTarget, k)])) as Pick<T, K[number]>;
}

private wrapStruct<T extends object, M extends readonly (keyof T)[], G extends readonly (keyof T)[]>(
getTarget: () => T,
methods: M,
getters: G,
fallbacks: Pick<T, G[number]>,
): Pick<T, M[number] | G[number]> & {
[K in M[number]]: T[K] extends (...args: any[]) => any ? T[K] : never;
} & {
[K in G[number]]: T[K] extends (...args: any[]) => any ? never : T[K];
} {
const out: any = {};
for (const m of methods) {
out[m] = this.gateMethod(getTarget, m as any);
}
for (const g of getters) {
Object.defineProperty(out, g, {
get: () => this.gateProperty(getTarget, g as any, (fallbacks as any)[g]),
enumerable: true,
});
}
return out;
}
}
43 changes: 43 additions & 0 deletions packages/types/src/signInFuture.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { SetActiveNavigate } from './clerk';
import type { PhoneCodeChannel } from './phoneCodeChannel';
import type { SignInFirstFactor, SignInStatus } from './signInCommon';
import type { OAuthStrategy } from './strategies';
import type { VerificationResource } from './verification';

export interface SignInFutureCreateParams {
identifier?: string;
Expand DownExpand Up@@ -41,6 +42,11 @@ export interface SignInFutureEmailCodeSendParams {
email: string;
}

export interface SignInFutureEmailLinkSendParams {
email: string;
verificationUrl: string;
}

export interface SignInFutureEmailCodeVerifyParams {
code: string;
}
Expand DownExpand Up@@ -111,6 +117,8 @@ export interface SignInFutureResource {

readonly existingSession?: { sessionId: string };

readonly firstFactorVerification: VerificationResource;

/**
* Used to supply an identifier for the sign-in attempt. Calling this method will populate data on the sign-in
* attempt, such as `signIn.resource.supportedFirstFactors`.
Expand All@@ -137,6 +145,41 @@ export interface SignInFutureResource {
verifyCode: (params: SignInFutureEmailCodeVerifyParams) => Promise<{ error: unknown }>;
};

/**
*
*/
emailLink: {
/**
* Used to send an email link to sign-in
*/
sendLink: (params: SignInFutureEmailLinkSendParams) => Promise<{ error: unknown }>;

/**
* Will wait for verification to complete or expire
*/
waitForVerification: () => Promise<{ error: unknown }>;

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.

The DX guide original stated .verifyLink but I do think waitForVerification is better 👍🏻


/**
* The verification status
*/
verification: {
/**
* The verification status
*/
status: 'verified' | 'expired' | 'failed' | 'client_mismatch';

/**
* The created session ID
*/
createdSessionId: string;

/**
* Whether the verification was from the same client
*/
verifiedFromTheSameClient: boolean;
} | null;
};

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

[Experimental] Signal email link support
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"files": [
{ "path": "./dist/clerk.js", "maxSize": "819KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "79KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "120.2KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "121KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "120KB" },
Expand Down
96 changes: 96 additions & 0 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { inBrowser } from '@clerk/shared/browser';
import { ClerkWebAuthnError } from '@clerk/shared/error';
import { Poller } from '@clerk/shared/poller';
import { deepCamelToSnake, deepSnakeToCamel } from '@clerk/shared/underscore';
Expand DownExpand Up@@ -31,6 +32,7 @@ import type {
SignInFutureCreateParams,
SignInFutureEmailCodeSendParams,
SignInFutureEmailCodeVerifyParams,
SignInFutureEmailLinkSendParams,
SignInFutureFinalizeParams,
SignInFutureMFAPhoneCodeVerifyParams,
SignInFuturePasswordParams,
Expand DownExpand Up@@ -61,6 +63,7 @@ import {
generateSignatureWithMetamask,
generateSignatureWithOKXWallet,
getBaseIdentifier,
getClerkQueryParam,
getCoinbaseWalletIdentifier,
getMetamaskIdentifier,
getOKXWalletIdentifier,
Expand DownExpand Up@@ -140,6 +143,14 @@ export class SignIn extends BaseResource implements SignInResource {
*/
__internal_basePost = this._basePost.bind(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_baseGet = this._baseGet.bind(this);

constructor(data: SignInJSON | SignInJSONSnapshot | null = null) {
super();
this.fromJSON(data);
Expand DownExpand Up@@ -539,6 +550,34 @@ class SignInFuture implements SignInFutureResource {
verifyCode: this.verifyEmailCode.bind(this),
};

emailLink = {
sendLink: this.sendEmailLink.bind(this),
waitForVerification: this.waitForEmailLinkVerification.bind(this),
get verification() {
if (!inBrowser()) {
return null;
}

const status = getClerkQueryParam('__clerk_status') as 'verified' | 'expired' | 'failed' | 'client_mismatch';
const createdSessionId = getClerkQueryParam('__clerk_created_session');

if (!status || !createdSessionId) {
return null;
}

const verifiedFromTheSameClient =
status === 'verified' &&
typeof SignIn.clerk.client !== 'undefined' &&
SignIn.clerk.client.sessions.some(s => s.id === createdSessionId);

return {
status,
createdSessionId,
verifiedFromTheSameClient,
};
},
};

resetPasswordEmailCode = {
sendCode: this.sendResetPasswordEmailCode.bind(this),
verifyCode: this.verifyResetPasswordEmailCode.bind(this),
Expand DownExpand Up@@ -583,6 +622,10 @@ class SignInFuture implements SignInFutureResource {
return undefined;
}

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

async sendResetPasswordEmailCode(): Promise<{ error: unknown }> {
return runAsyncResourceTask(this.resource, async () => {
if (!this.resource.id) {
Expand DownExpand Up@@ -680,6 +723,56 @@ class SignInFuture implements SignInFutureResource {
});
}

async sendEmailLink(params: SignInFutureEmailLinkSendParams): Promise<{ error: unknown }> {
const { email, verificationUrl } = params;
return runAsyncResourceTask(this.resource, async () => {
if (!this.resource.id) {
await this.create({ identifier: email });
}

const emailLinkFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_link');

if (!emailLinkFactor) {
throw new Error('Email link factor not found');
}

const { emailAddressId } = emailLinkFactor;

let absoluteVerificationUrl = verificationUrl;
try {
new URL(verificationUrl);
} catch {
absoluteVerificationUrl = window.location.origin + verificationUrl;
}

await this.resource.__internal_basePost({
body: { emailAddressId, redirectUrl: absoluteVerificationUrl, strategy: 'email_link' },
action: 'prepare_first_factor',
});
});
}

async waitForEmailLinkVerification(): Promise<{ error: unknown }> {
return runAsyncResourceTask(this.resource, async () => {
const { run, stop } = Poller();
await new Promise((resolve, reject) => {
void run(async () => {
try {
const res = await this.resource.__internal_baseGet();
const status = res.firstFactorVerification.status;
if (status === 'verified' || status === 'expired') {
stop();
resolve(res);
}
} catch (err) {
stop();
reject(err);
}
});
});
});
}

async sendPhoneCode(params: SignInFuturePhoneCodeSendParams): Promise<{ error: unknown }> {
const { phoneNumber, channel = 'sms' } = params;
return runAsyncResourceTask(this.resource, async () => {
Expand DownExpand Up@@ -787,6 +880,9 @@ class SignInFuture implements SignInFutureResource {
throw new Error('Cannot finalize sign-in without a created session.');
}

// Reload the client to prevent an issue where the created session is not picked up.
await SignIn.clerk.client?.reload();

await SignIn.clerk.setActive({ session: this.resource.createdSessionId, navigate });
});
}
Expand Down
51 changes: 51 additions & 0 deletions packages/react/src/stateProxy.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ export class StateProxy implements State {
}

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

return {
Expand All@@ -44,13 +45,40 @@ export class StateProxy implements State {
status: 'needs_identifier' as const,
availableStrategies: [],
isTransferable: false,
get firstFactorVerification() {
return gateProperty(target, 'firstFactorVerification', {
status: null,
error: null,
expireAt: null,
externalVerificationRedirectURL: null,
nonce: null,
attempts: null,
message: null,
strategy: null,
verifiedAtClient: null,
verifiedFromTheSameClient: () => false,
__internal_toSnapshot: () => {
throw new Error('__internal_toSnapshot called before Clerk is loaded');
},
pathRoot: '',
reload: () => {
throw new Error('__internal_toSnapshot called before Clerk is loaded');
},
});
},

create: this.gateMethod(target, 'create'),
password: this.gateMethod(target, 'password'),
sso: this.gateMethod(target, 'sso'),
finalize: this.gateMethod(target, 'finalize'),

emailCode: this.wrapMethods(() => target().emailCode, ['sendCode', 'verifyCode'] as const),
emailLink: this.wrapStruct(

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.

Do we need wrapStruct because of the getter (verification) that was introduced?

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.

yeah, emailLink has both methods and properties. We might be able to just use wrapStruct in place of wrapMethods to be consistent though. Not sure if it's worth refactoring since this entire construct might be going away (hopefully [please])

() => target().emailLink,
['sendLink', 'waitForVerification'] as const,
['verification'] as const,
{ verification: null },
),
resetPasswordEmailCode: this.wrapMethods(() => target().resetPasswordEmailCode, [
'sendCode',
'verifyCode',
Expand DownExpand Up@@ -148,4 +176,27 @@ export class StateProxy implements State {
): Pick<T, K[number]> {
return Object.fromEntries(keys.map(k => [k, this.gateMethod(getTarget, k)])) as Pick<T, K[number]>;
}

private wrapStruct<T extends object, M extends readonly (keyof T)[], G extends readonly (keyof T)[]>(
getTarget: () => T,
methods: M,
getters: G,
fallbacks: Pick<T, G[number]>,
): Pick<T, M[number] | G[number]> & {
[K in M[number]]: T[K] extends (...args: any[]) => any ? T[K] : never;
} & {
[K in G[number]]: T[K] extends (...args: any[]) => any ? never : T[K];
} {
const out: any = {};
for (const m of methods) {
out[m] = this.gateMethod(getTarget, m as any);
}
for (const g of getters) {
Object.defineProperty(out, g, {
get: () => this.gateProperty(getTarget, g as any, (fallbacks as any)[g]),
enumerable: true,
});
}
return out;
}
}
43 changes: 43 additions & 0 deletions packages/types/src/signInFuture.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { SetActiveNavigate } from './clerk';
import type { PhoneCodeChannel } from './phoneCodeChannel';
import type { SignInFirstFactor, SignInStatus } from './signInCommon';
import type { OAuthStrategy } from './strategies';
import type { VerificationResource } from './verification';

export interface SignInFutureCreateParams {
identifier?: string;
Expand DownExpand Up@@ -41,6 +42,11 @@ export interface SignInFutureEmailCodeSendParams {
email: string;
}

export interface SignInFutureEmailLinkSendParams {
email: string;
verificationUrl: string;
}

export interface SignInFutureEmailCodeVerifyParams {
code: string;
}
Expand DownExpand Up@@ -111,6 +117,8 @@ export interface SignInFutureResource {

readonly existingSession?: { sessionId: string };

readonly firstFactorVerification: VerificationResource;

/**
* Used to supply an identifier for the sign-in attempt. Calling this method will populate data on the sign-in
* attempt, such as `signIn.resource.supportedFirstFactors`.
Expand All@@ -137,6 +145,41 @@ export interface SignInFutureResource {
verifyCode: (params: SignInFutureEmailCodeVerifyParams) => Promise<{ error: unknown }>;
};

/**
*
*/
emailLink: {
/**
* Used to send an email link to sign-in
*/
sendLink: (params: SignInFutureEmailLinkSendParams) => Promise<{ error: unknown }>;

/**
* Will wait for verification to complete or expire
*/
waitForVerification: () => Promise<{ error: unknown }>;

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.

The DX guide original stated .verifyLink but I do think waitForVerification is better 👍🏻


/**
* The verification status
*/
verification: {
/**
* The verification status
*/
status: 'verified' | 'expired' | 'failed' | 'client_mismatch';

/**
* The created session ID
*/
createdSessionId: string;

/**
* Whether the verification was from the same client
*/
verifiedFromTheSameClient: boolean;
} | null;
};

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

[Experimental] Signal email link support
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"files": [
{ "path": "./dist/clerk.js", "maxSize": "819KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "79KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "120.2KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "121KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "120KB" },
Expand Down
96 changes: 96 additions & 0 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { inBrowser } from '@clerk/shared/browser';
import { ClerkWebAuthnError } from '@clerk/shared/error';
import { Poller } from '@clerk/shared/poller';
import { deepCamelToSnake, deepSnakeToCamel } from '@clerk/shared/underscore';
Expand DownExpand Up@@ -31,6 +32,7 @@ import type {
SignInFutureCreateParams,
SignInFutureEmailCodeSendParams,
SignInFutureEmailCodeVerifyParams,
SignInFutureEmailLinkSendParams,
SignInFutureFinalizeParams,
SignInFutureMFAPhoneCodeVerifyParams,
SignInFuturePasswordParams,
Expand DownExpand Up@@ -61,6 +63,7 @@ import {
generateSignatureWithMetamask,
generateSignatureWithOKXWallet,
getBaseIdentifier,
getClerkQueryParam,
getCoinbaseWalletIdentifier,
getMetamaskIdentifier,
getOKXWalletIdentifier,
Expand DownExpand Up@@ -140,6 +143,14 @@ export class SignIn extends BaseResource implements SignInResource {
*/
__internal_basePost = this._basePost.bind(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_baseGet = this._baseGet.bind(this);

constructor(data: SignInJSON | SignInJSONSnapshot | null = null) {
super();
this.fromJSON(data);
Expand DownExpand Up@@ -539,6 +550,34 @@ class SignInFuture implements SignInFutureResource {
verifyCode: this.verifyEmailCode.bind(this),
};

emailLink = {
sendLink: this.sendEmailLink.bind(this),
waitForVerification: this.waitForEmailLinkVerification.bind(this),
get verification() {
if (!inBrowser()) {
return null;
}

const status = getClerkQueryParam('__clerk_status') as 'verified' | 'expired' | 'failed' | 'client_mismatch';
const createdSessionId = getClerkQueryParam('__clerk_created_session');

if (!status || !createdSessionId) {
return null;
}

const verifiedFromTheSameClient =
status === 'verified' &&
typeof SignIn.clerk.client !== 'undefined' &&
SignIn.clerk.client.sessions.some(s => s.id === createdSessionId);

return {
status,
createdSessionId,
verifiedFromTheSameClient,
};
},
};

resetPasswordEmailCode = {
sendCode: this.sendResetPasswordEmailCode.bind(this),
verifyCode: this.verifyResetPasswordEmailCode.bind(this),
Expand DownExpand Up@@ -583,6 +622,10 @@ class SignInFuture implements SignInFutureResource {
return undefined;
}

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

async sendResetPasswordEmailCode(): Promise<{ error: unknown }> {
return runAsyncResourceTask(this.resource, async () => {
if (!this.resource.id) {
Expand DownExpand Up@@ -680,6 +723,56 @@ class SignInFuture implements SignInFutureResource {
});
}

async sendEmailLink(params: SignInFutureEmailLinkSendParams): Promise<{ error: unknown }> {
const { email, verificationUrl } = params;
return runAsyncResourceTask(this.resource, async () => {
if (!this.resource.id) {
await this.create({ identifier: email });
}

const emailLinkFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_link');

if (!emailLinkFactor) {
throw new Error('Email link factor not found');
}

const { emailAddressId } = emailLinkFactor;

let absoluteVerificationUrl = verificationUrl;
try {
new URL(verificationUrl);
} catch {
absoluteVerificationUrl = window.location.origin + verificationUrl;
}

await this.resource.__internal_basePost({
body: { emailAddressId, redirectUrl: absoluteVerificationUrl, strategy: 'email_link' },
action: 'prepare_first_factor',
});
});
}

async waitForEmailLinkVerification(): Promise<{ error: unknown }> {
return runAsyncResourceTask(this.resource, async () => {
const { run, stop } = Poller();
await new Promise((resolve, reject) => {
void run(async () => {
try {
const res = await this.resource.__internal_baseGet();
const status = res.firstFactorVerification.status;
if (status === 'verified' || status === 'expired') {
stop();
resolve(res);
}
} catch (err) {
stop();
reject(err);
}
});
});
});
}

async sendPhoneCode(params: SignInFuturePhoneCodeSendParams): Promise<{ error: unknown }> {
const { phoneNumber, channel = 'sms' } = params;
return runAsyncResourceTask(this.resource, async () => {
Expand DownExpand Up@@ -787,6 +880,9 @@ class SignInFuture implements SignInFutureResource {
throw new Error('Cannot finalize sign-in without a created session.');
}

// Reload the client to prevent an issue where the created session is not picked up.
await SignIn.clerk.client?.reload();

await SignIn.clerk.setActive({ session: this.resource.createdSessionId, navigate });
});
}
Expand Down
51 changes: 51 additions & 0 deletions packages/react/src/stateProxy.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ export class StateProxy implements State {
}

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

return {
Expand All@@ -44,13 +45,40 @@ export class StateProxy implements State {
status: 'needs_identifier' as const,
availableStrategies: [],
isTransferable: false,
get firstFactorVerification() {
return gateProperty(target, 'firstFactorVerification', {
status: null,
error: null,
expireAt: null,
externalVerificationRedirectURL: null,
nonce: null,
attempts: null,
message: null,
strategy: null,
verifiedAtClient: null,
verifiedFromTheSameClient: () => false,
__internal_toSnapshot: () => {
throw new Error('__internal_toSnapshot called before Clerk is loaded');
},
pathRoot: '',
reload: () => {
throw new Error('__internal_toSnapshot called before Clerk is loaded');
},
});
},

create: this.gateMethod(target, 'create'),
password: this.gateMethod(target, 'password'),
sso: this.gateMethod(target, 'sso'),
finalize: this.gateMethod(target, 'finalize'),

emailCode: this.wrapMethods(() => target().emailCode, ['sendCode', 'verifyCode'] as const),
emailLink: this.wrapStruct(

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.

Do we need wrapStruct because of the getter (verification) that was introduced?

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.

yeah, emailLink has both methods and properties. We might be able to just use wrapStruct in place of wrapMethods to be consistent though. Not sure if it's worth refactoring since this entire construct might be going away (hopefully [please])

() => target().emailLink,
['sendLink', 'waitForVerification'] as const,
['verification'] as const,
{ verification: null },
),
resetPasswordEmailCode: this.wrapMethods(() => target().resetPasswordEmailCode, [
'sendCode',
'verifyCode',
Expand DownExpand Up@@ -148,4 +176,27 @@ export class StateProxy implements State {
): Pick<T, K[number]> {
return Object.fromEntries(keys.map(k => [k, this.gateMethod(getTarget, k)])) as Pick<T, K[number]>;
}

private wrapStruct<T extends object, M extends readonly (keyof T)[], G extends readonly (keyof T)[]>(
getTarget: () => T,
methods: M,
getters: G,
fallbacks: Pick<T, G[number]>,
): Pick<T, M[number] | G[number]> & {
[K in M[number]]: T[K] extends (...args: any[]) => any ? T[K] : never;
} & {
[K in G[number]]: T[K] extends (...args: any[]) => any ? never : T[K];
} {
const out: any = {};
for (const m of methods) {
out[m] = this.gateMethod(getTarget, m as any);
}
for (const g of getters) {
Object.defineProperty(out, g, {
get: () => this.gateProperty(getTarget, g as any, (fallbacks as any)[g]),
enumerable: true,
});
}
return out;
}
}
43 changes: 43 additions & 0 deletions packages/types/src/signInFuture.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { SetActiveNavigate } from './clerk';
import type { PhoneCodeChannel } from './phoneCodeChannel';
import type { SignInFirstFactor, SignInStatus } from './signInCommon';
import type { OAuthStrategy } from './strategies';
import type { VerificationResource } from './verification';

export interface SignInFutureCreateParams {
identifier?: string;
Expand DownExpand Up@@ -41,6 +42,11 @@ export interface SignInFutureEmailCodeSendParams {
email: string;
}

export interface SignInFutureEmailLinkSendParams {
email: string;
verificationUrl: string;
}

export interface SignInFutureEmailCodeVerifyParams {
code: string;
}
Expand DownExpand Up@@ -111,6 +117,8 @@ export interface SignInFutureResource {

readonly existingSession?: { sessionId: string };

readonly firstFactorVerification: VerificationResource;

/**
* Used to supply an identifier for the sign-in attempt. Calling this method will populate data on the sign-in
* attempt, such as `signIn.resource.supportedFirstFactors`.
Expand All@@ -137,6 +145,41 @@ export interface SignInFutureResource {
verifyCode: (params: SignInFutureEmailCodeVerifyParams) => Promise<{ error: unknown }>;
};

/**
*
*/
emailLink: {
/**
* Used to send an email link to sign-in
*/
sendLink: (params: SignInFutureEmailLinkSendParams) => Promise<{ error: unknown }>;

/**
* Will wait for verification to complete or expire
*/
waitForVerification: () => Promise<{ error: unknown }>;

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.

The DX guide original stated .verifyLink but I do think waitForVerification is better 👍🏻


/**
* The verification status
*/
verification: {
/**
* The verification status
*/
status: 'verified' | 'expired' | 'failed' | 'client_mismatch';

/**
* The created session ID
*/
createdSessionId: string;

/**
* Whether the verification was from the same client
*/
verifiedFromTheSameClient: boolean;
} | null;
};

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

[Experimental] Signal email link support
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"files": [
{ "path": "./dist/clerk.js", "maxSize": "819KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "79KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "120.2KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "121KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "120KB" },
Expand Down
96 changes: 96 additions & 0 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { inBrowser } from '@clerk/shared/browser';
import { ClerkWebAuthnError } from '@clerk/shared/error';
import { Poller } from '@clerk/shared/poller';
import { deepCamelToSnake, deepSnakeToCamel } from '@clerk/shared/underscore';
Expand DownExpand Up@@ -31,6 +32,7 @@ import type {
SignInFutureCreateParams,
SignInFutureEmailCodeSendParams,
SignInFutureEmailCodeVerifyParams,
SignInFutureEmailLinkSendParams,
SignInFutureFinalizeParams,
SignInFutureMFAPhoneCodeVerifyParams,
SignInFuturePasswordParams,
Expand DownExpand Up@@ -61,6 +63,7 @@ import {
generateSignatureWithMetamask,
generateSignatureWithOKXWallet,
getBaseIdentifier,
getClerkQueryParam,
getCoinbaseWalletIdentifier,
getMetamaskIdentifier,
getOKXWalletIdentifier,
Expand DownExpand Up@@ -140,6 +143,14 @@ export class SignIn extends BaseResource implements SignInResource {
*/
__internal_basePost = this._basePost.bind(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_baseGet = this._baseGet.bind(this);

constructor(data: SignInJSON | SignInJSONSnapshot | null = null) {
super();
this.fromJSON(data);
Expand DownExpand Up@@ -539,6 +550,34 @@ class SignInFuture implements SignInFutureResource {
verifyCode: this.verifyEmailCode.bind(this),
};

emailLink = {
sendLink: this.sendEmailLink.bind(this),
waitForVerification: this.waitForEmailLinkVerification.bind(this),
get verification() {
if (!inBrowser()) {
return null;
}

const status = getClerkQueryParam('__clerk_status') as 'verified' | 'expired' | 'failed' | 'client_mismatch';
const createdSessionId = getClerkQueryParam('__clerk_created_session');

if (!status || !createdSessionId) {
return null;
}

const verifiedFromTheSameClient =
status === 'verified' &&
typeof SignIn.clerk.client !== 'undefined' &&
SignIn.clerk.client.sessions.some(s => s.id === createdSessionId);

return {
status,
createdSessionId,
verifiedFromTheSameClient,
};
},
};

resetPasswordEmailCode = {
sendCode: this.sendResetPasswordEmailCode.bind(this),
verifyCode: this.verifyResetPasswordEmailCode.bind(this),
Expand DownExpand Up@@ -583,6 +622,10 @@ class SignInFuture implements SignInFutureResource {
return undefined;
}

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

async sendResetPasswordEmailCode(): Promise<{ error: unknown }> {
return runAsyncResourceTask(this.resource, async () => {
if (!this.resource.id) {
Expand DownExpand Up@@ -680,6 +723,56 @@ class SignInFuture implements SignInFutureResource {
});
}

async sendEmailLink(params: SignInFutureEmailLinkSendParams): Promise<{ error: unknown }> {
const { email, verificationUrl } = params;
return runAsyncResourceTask(this.resource, async () => {
if (!this.resource.id) {
await this.create({ identifier: email });
}

const emailLinkFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_link');

if (!emailLinkFactor) {
throw new Error('Email link factor not found');
}

const { emailAddressId } = emailLinkFactor;

let absoluteVerificationUrl = verificationUrl;
try {
new URL(verificationUrl);
} catch {
absoluteVerificationUrl = window.location.origin + verificationUrl;
}

await this.resource.__internal_basePost({
body: { emailAddressId, redirectUrl: absoluteVerificationUrl, strategy: 'email_link' },
action: 'prepare_first_factor',
});
});
}

async waitForEmailLinkVerification(): Promise<{ error: unknown }> {
return runAsyncResourceTask(this.resource, async () => {
const { run, stop } = Poller();
await new Promise((resolve, reject) => {
void run(async () => {
try {
const res = await this.resource.__internal_baseGet();
const status = res.firstFactorVerification.status;
if (status === 'verified' || status === 'expired') {
stop();
resolve(res);
}
} catch (err) {
stop();
reject(err);
}
});
});
});
}

async sendPhoneCode(params: SignInFuturePhoneCodeSendParams): Promise<{ error: unknown }> {
const { phoneNumber, channel = 'sms' } = params;
return runAsyncResourceTask(this.resource, async () => {
Expand DownExpand Up@@ -787,6 +880,9 @@ class SignInFuture implements SignInFutureResource {
throw new Error('Cannot finalize sign-in without a created session.');
}

// Reload the client to prevent an issue where the created session is not picked up.
await SignIn.clerk.client?.reload();

await SignIn.clerk.setActive({ session: this.resource.createdSessionId, navigate });
});
}
Expand Down
51 changes: 51 additions & 0 deletions packages/react/src/stateProxy.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ export class StateProxy implements State {
}

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

return {
Expand All@@ -44,13 +45,40 @@ export class StateProxy implements State {
status: 'needs_identifier' as const,
availableStrategies: [],
isTransferable: false,
get firstFactorVerification() {
return gateProperty(target, 'firstFactorVerification', {
status: null,
error: null,
expireAt: null,
externalVerificationRedirectURL: null,
nonce: null,
attempts: null,
message: null,
strategy: null,
verifiedAtClient: null,
verifiedFromTheSameClient: () => false,
__internal_toSnapshot: () => {
throw new Error('__internal_toSnapshot called before Clerk is loaded');
},
pathRoot: '',
reload: () => {
throw new Error('__internal_toSnapshot called before Clerk is loaded');
},
});
},

create: this.gateMethod(target, 'create'),
password: this.gateMethod(target, 'password'),
sso: this.gateMethod(target, 'sso'),
finalize: this.gateMethod(target, 'finalize'),

emailCode: this.wrapMethods(() => target().emailCode, ['sendCode', 'verifyCode'] as const),
emailLink: this.wrapStruct(

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.

Do we need wrapStruct because of the getter (verification) that was introduced?

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.

yeah, emailLink has both methods and properties. We might be able to just use wrapStruct in place of wrapMethods to be consistent though. Not sure if it's worth refactoring since this entire construct might be going away (hopefully [please])

() => target().emailLink,
['sendLink', 'waitForVerification'] as const,
['verification'] as const,
{ verification: null },
),
resetPasswordEmailCode: this.wrapMethods(() => target().resetPasswordEmailCode, [
'sendCode',
'verifyCode',
Expand DownExpand Up@@ -148,4 +176,27 @@ export class StateProxy implements State {
): Pick<T, K[number]> {
return Object.fromEntries(keys.map(k => [k, this.gateMethod(getTarget, k)])) as Pick<T, K[number]>;
}

private wrapStruct<T extends object, M extends readonly (keyof T)[], G extends readonly (keyof T)[]>(
getTarget: () => T,
methods: M,
getters: G,
fallbacks: Pick<T, G[number]>,
): Pick<T, M[number] | G[number]> & {
[K in M[number]]: T[K] extends (...args: any[]) => any ? T[K] : never;
} & {
[K in G[number]]: T[K] extends (...args: any[]) => any ? never : T[K];
} {
const out: any = {};
for (const m of methods) {
out[m] = this.gateMethod(getTarget, m as any);
}
for (const g of getters) {
Object.defineProperty(out, g, {
get: () => this.gateProperty(getTarget, g as any, (fallbacks as any)[g]),
enumerable: true,
});
}
return out;
}
}
43 changes: 43 additions & 0 deletions packages/types/src/signInFuture.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { SetActiveNavigate } from './clerk';
import type { PhoneCodeChannel } from './phoneCodeChannel';
import type { SignInFirstFactor, SignInStatus } from './signInCommon';
import type { OAuthStrategy } from './strategies';
import type { VerificationResource } from './verification';

export interface SignInFutureCreateParams {
identifier?: string;
Expand DownExpand Up@@ -41,6 +42,11 @@ export interface SignInFutureEmailCodeSendParams {
email: string;
}

export interface SignInFutureEmailLinkSendParams {
email: string;
verificationUrl: string;
}

export interface SignInFutureEmailCodeVerifyParams {
code: string;
}
Expand DownExpand Up@@ -111,6 +117,8 @@ export interface SignInFutureResource {

readonly existingSession?: { sessionId: string };

readonly firstFactorVerification: VerificationResource;

/**
* Used to supply an identifier for the sign-in attempt. Calling this method will populate data on the sign-in
* attempt, such as `signIn.resource.supportedFirstFactors`.
Expand All@@ -137,6 +145,41 @@ export interface SignInFutureResource {
verifyCode: (params: SignInFutureEmailCodeVerifyParams) => Promise<{ error: unknown }>;
};

/**
*
*/
emailLink: {
/**
* Used to send an email link to sign-in
*/
sendLink: (params: SignInFutureEmailLinkSendParams) => Promise<{ error: unknown }>;

/**
* Will wait for verification to complete or expire
*/
waitForVerification: () => Promise<{ error: unknown }>;

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.

The DX guide original stated .verifyLink but I do think waitForVerification is better 👍🏻


/**
* The verification status
*/
verification: {
/**
* The verification status
*/
status: 'verified' | 'expired' | 'failed' | 'client_mismatch';

/**
* The created session ID
*/
createdSessionId: string;

/**
* Whether the verification was from the same client
*/
verifiedFromTheSameClient: boolean;
} | null;
};

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

[Experimental] Signal email link support
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"files": [
{ "path": "./dist/clerk.js", "maxSize": "819KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "79KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "120.2KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "121KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "120KB" },
Expand Down
96 changes: 96 additions & 0 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { inBrowser } from '@clerk/shared/browser';
import { ClerkWebAuthnError } from '@clerk/shared/error';
import { Poller } from '@clerk/shared/poller';
import { deepCamelToSnake, deepSnakeToCamel } from '@clerk/shared/underscore';
Expand DownExpand Up@@ -31,6 +32,7 @@ import type {
SignInFutureCreateParams,
SignInFutureEmailCodeSendParams,
SignInFutureEmailCodeVerifyParams,
SignInFutureEmailLinkSendParams,
SignInFutureFinalizeParams,
SignInFutureMFAPhoneCodeVerifyParams,
SignInFuturePasswordParams,
Expand DownExpand Up@@ -61,6 +63,7 @@ import {
generateSignatureWithMetamask,
generateSignatureWithOKXWallet,
getBaseIdentifier,
getClerkQueryParam,
getCoinbaseWalletIdentifier,
getMetamaskIdentifier,
getOKXWalletIdentifier,
Expand DownExpand Up@@ -140,6 +143,14 @@ export class SignIn extends BaseResource implements SignInResource {
*/
__internal_basePost = this._basePost.bind(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_baseGet = this._baseGet.bind(this);

constructor(data: SignInJSON | SignInJSONSnapshot | null = null) {
super();
this.fromJSON(data);
Expand DownExpand Up@@ -539,6 +550,34 @@ class SignInFuture implements SignInFutureResource {
verifyCode: this.verifyEmailCode.bind(this),
};

emailLink = {
sendLink: this.sendEmailLink.bind(this),
waitForVerification: this.waitForEmailLinkVerification.bind(this),
get verification() {
if (!inBrowser()) {
return null;
}

const status = getClerkQueryParam('__clerk_status') as 'verified' | 'expired' | 'failed' | 'client_mismatch';
const createdSessionId = getClerkQueryParam('__clerk_created_session');

if (!status || !createdSessionId) {
return null;
}

const verifiedFromTheSameClient =
status === 'verified' &&
typeof SignIn.clerk.client !== 'undefined' &&
SignIn.clerk.client.sessions.some(s => s.id === createdSessionId);

return {
status,
createdSessionId,
verifiedFromTheSameClient,
};
},
};

resetPasswordEmailCode = {
sendCode: this.sendResetPasswordEmailCode.bind(this),
verifyCode: this.verifyResetPasswordEmailCode.bind(this),
Expand DownExpand Up@@ -583,6 +622,10 @@ class SignInFuture implements SignInFutureResource {
return undefined;
}

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

async sendResetPasswordEmailCode(): Promise<{ error: unknown }> {
return runAsyncResourceTask(this.resource, async () => {
if (!this.resource.id) {
Expand DownExpand Up@@ -680,6 +723,56 @@ class SignInFuture implements SignInFutureResource {
});
}

async sendEmailLink(params: SignInFutureEmailLinkSendParams): Promise<{ error: unknown }> {
const { email, verificationUrl } = params;
return runAsyncResourceTask(this.resource, async () => {
if (!this.resource.id) {
await this.create({ identifier: email });
}

const emailLinkFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_link');

if (!emailLinkFactor) {
throw new Error('Email link factor not found');
}

const { emailAddressId } = emailLinkFactor;

let absoluteVerificationUrl = verificationUrl;
try {
new URL(verificationUrl);
} catch {
absoluteVerificationUrl = window.location.origin + verificationUrl;
}

await this.resource.__internal_basePost({
body: { emailAddressId, redirectUrl: absoluteVerificationUrl, strategy: 'email_link' },
action: 'prepare_first_factor',
});
});
}

async waitForEmailLinkVerification(): Promise<{ error: unknown }> {
return runAsyncResourceTask(this.resource, async () => {
const { run, stop } = Poller();
await new Promise((resolve, reject) => {
void run(async () => {
try {
const res = await this.resource.__internal_baseGet();
const status = res.firstFactorVerification.status;
if (status === 'verified' || status === 'expired') {
stop();
resolve(res);
}
} catch (err) {
stop();
reject(err);
}
});
});
});
}

async sendPhoneCode(params: SignInFuturePhoneCodeSendParams): Promise<{ error: unknown }> {
const { phoneNumber, channel = 'sms' } = params;
return runAsyncResourceTask(this.resource, async () => {
Expand DownExpand Up@@ -787,6 +880,9 @@ class SignInFuture implements SignInFutureResource {
throw new Error('Cannot finalize sign-in without a created session.');
}

// Reload the client to prevent an issue where the created session is not picked up.
await SignIn.clerk.client?.reload();

await SignIn.clerk.setActive({ session: this.resource.createdSessionId, navigate });
});
}
Expand Down
51 changes: 51 additions & 0 deletions packages/react/src/stateProxy.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ export class StateProxy implements State {
}

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

return {
Expand All@@ -44,13 +45,40 @@ export class StateProxy implements State {
status: 'needs_identifier' as const,
availableStrategies: [],
isTransferable: false,
get firstFactorVerification() {
return gateProperty(target, 'firstFactorVerification', {
status: null,
error: null,
expireAt: null,
externalVerificationRedirectURL: null,
nonce: null,
attempts: null,
message: null,
strategy: null,
verifiedAtClient: null,
verifiedFromTheSameClient: () => false,
__internal_toSnapshot: () => {
throw new Error('__internal_toSnapshot called before Clerk is loaded');
},
pathRoot: '',
reload: () => {
throw new Error('__internal_toSnapshot called before Clerk is loaded');
},
});
},

create: this.gateMethod(target, 'create'),
password: this.gateMethod(target, 'password'),
sso: this.gateMethod(target, 'sso'),
finalize: this.gateMethod(target, 'finalize'),

emailCode: this.wrapMethods(() => target().emailCode, ['sendCode', 'verifyCode'] as const),
emailLink: this.wrapStruct(

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.

Do we need wrapStruct because of the getter (verification) that was introduced?

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.

yeah, emailLink has both methods and properties. We might be able to just use wrapStruct in place of wrapMethods to be consistent though. Not sure if it's worth refactoring since this entire construct might be going away (hopefully [please])

() => target().emailLink,
['sendLink', 'waitForVerification'] as const,
['verification'] as const,
{ verification: null },
),
resetPasswordEmailCode: this.wrapMethods(() => target().resetPasswordEmailCode, [
'sendCode',
'verifyCode',
Expand DownExpand Up@@ -148,4 +176,27 @@ export class StateProxy implements State {
): Pick<T, K[number]> {
return Object.fromEntries(keys.map(k => [k, this.gateMethod(getTarget, k)])) as Pick<T, K[number]>;
}

private wrapStruct<T extends object, M extends readonly (keyof T)[], G extends readonly (keyof T)[]>(
getTarget: () => T,
methods: M,
getters: G,
fallbacks: Pick<T, G[number]>,
): Pick<T, M[number] | G[number]> & {
[K in M[number]]: T[K] extends (...args: any[]) => any ? T[K] : never;
} & {
[K in G[number]]: T[K] extends (...args: any[]) => any ? never : T[K];
} {
const out: any = {};
for (const m of methods) {
out[m] = this.gateMethod(getTarget, m as any);
}
for (const g of getters) {
Object.defineProperty(out, g, {
get: () => this.gateProperty(getTarget, g as any, (fallbacks as any)[g]),
enumerable: true,
});
}
return out;
}
}
43 changes: 43 additions & 0 deletions packages/types/src/signInFuture.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { SetActiveNavigate } from './clerk';
import type { PhoneCodeChannel } from './phoneCodeChannel';
import type { SignInFirstFactor, SignInStatus } from './signInCommon';
import type { OAuthStrategy } from './strategies';
import type { VerificationResource } from './verification';

export interface SignInFutureCreateParams {
identifier?: string;
Expand DownExpand Up@@ -41,6 +42,11 @@ export interface SignInFutureEmailCodeSendParams {
email: string;
}

export interface SignInFutureEmailLinkSendParams {
email: string;
verificationUrl: string;
}

export interface SignInFutureEmailCodeVerifyParams {
code: string;
}
Expand DownExpand Up@@ -111,6 +117,8 @@ export interface SignInFutureResource {

readonly existingSession?: { sessionId: string };

readonly firstFactorVerification: VerificationResource;

/**
* Used to supply an identifier for the sign-in attempt. Calling this method will populate data on the sign-in
* attempt, such as `signIn.resource.supportedFirstFactors`.
Expand All@@ -137,6 +145,41 @@ export interface SignInFutureResource {
verifyCode: (params: SignInFutureEmailCodeVerifyParams) => Promise<{ error: unknown }>;
};

/**
*
*/
emailLink: {
/**
* Used to send an email link to sign-in
*/
sendLink: (params: SignInFutureEmailLinkSendParams) => Promise<{ error: unknown }>;

/**
* Will wait for verification to complete or expire
*/
waitForVerification: () => Promise<{ error: unknown }>;

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.

The DX guide original stated .verifyLink but I do think waitForVerification is better 👍🏻


/**
* The verification status
*/
verification: {
/**
* The verification status
*/
status: 'verified' | 'expired' | 'failed' | 'client_mismatch';

/**
* The created session ID
*/
createdSessionId: string;

/**
* Whether the verification was from the same client
*/
verifiedFromTheSameClient: boolean;
} | null;
};

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

[Experimental] Signal email link support
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"files": [
{ "path": "./dist/clerk.js", "maxSize": "819KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "79KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "120.2KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "121KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "120KB" },
Expand Down
96 changes: 96 additions & 0 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { inBrowser } from '@clerk/shared/browser';
import { ClerkWebAuthnError } from '@clerk/shared/error';
import { Poller } from '@clerk/shared/poller';
import { deepCamelToSnake, deepSnakeToCamel } from '@clerk/shared/underscore';
Expand DownExpand Up@@ -31,6 +32,7 @@ import type {
SignInFutureCreateParams,
SignInFutureEmailCodeSendParams,
SignInFutureEmailCodeVerifyParams,
SignInFutureEmailLinkSendParams,
SignInFutureFinalizeParams,
SignInFutureMFAPhoneCodeVerifyParams,
SignInFuturePasswordParams,
Expand DownExpand Up@@ -61,6 +63,7 @@ import {
generateSignatureWithMetamask,
generateSignatureWithOKXWallet,
getBaseIdentifier,
getClerkQueryParam,
getCoinbaseWalletIdentifier,
getMetamaskIdentifier,
getOKXWalletIdentifier,
Expand DownExpand Up@@ -140,6 +143,14 @@ export class SignIn extends BaseResource implements SignInResource {
*/
__internal_basePost = this._basePost.bind(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_baseGet = this._baseGet.bind(this);

constructor(data: SignInJSON | SignInJSONSnapshot | null = null) {
super();
this.fromJSON(data);
Expand DownExpand Up@@ -539,6 +550,34 @@ class SignInFuture implements SignInFutureResource {
verifyCode: this.verifyEmailCode.bind(this),
};

emailLink = {
sendLink: this.sendEmailLink.bind(this),
waitForVerification: this.waitForEmailLinkVerification.bind(this),
get verification() {
if (!inBrowser()) {
return null;
}

const status = getClerkQueryParam('__clerk_status') as 'verified' | 'expired' | 'failed' | 'client_mismatch';
const createdSessionId = getClerkQueryParam('__clerk_created_session');

if (!status || !createdSessionId) {
return null;
}

const verifiedFromTheSameClient =
status === 'verified' &&
typeof SignIn.clerk.client !== 'undefined' &&
SignIn.clerk.client.sessions.some(s => s.id === createdSessionId);

return {
status,
createdSessionId,
verifiedFromTheSameClient,
};
},
};

resetPasswordEmailCode = {
sendCode: this.sendResetPasswordEmailCode.bind(this),
verifyCode: this.verifyResetPasswordEmailCode.bind(this),
Expand DownExpand Up@@ -583,6 +622,10 @@ class SignInFuture implements SignInFutureResource {
return undefined;
}

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

async sendResetPasswordEmailCode(): Promise<{ error: unknown }> {
return runAsyncResourceTask(this.resource, async () => {
if (!this.resource.id) {
Expand DownExpand Up@@ -680,6 +723,56 @@ class SignInFuture implements SignInFutureResource {
});
}

async sendEmailLink(params: SignInFutureEmailLinkSendParams): Promise<{ error: unknown }> {
const { email, verificationUrl } = params;
return runAsyncResourceTask(this.resource, async () => {
if (!this.resource.id) {
await this.create({ identifier: email });
}

const emailLinkFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_link');

if (!emailLinkFactor) {
throw new Error('Email link factor not found');
}

const { emailAddressId } = emailLinkFactor;

let absoluteVerificationUrl = verificationUrl;
try {
new URL(verificationUrl);
} catch {
absoluteVerificationUrl = window.location.origin + verificationUrl;
}

await this.resource.__internal_basePost({
body: { emailAddressId, redirectUrl: absoluteVerificationUrl, strategy: 'email_link' },
action: 'prepare_first_factor',
});
});
}

async waitForEmailLinkVerification(): Promise<{ error: unknown }> {
return runAsyncResourceTask(this.resource, async () => {
const { run, stop } = Poller();
await new Promise((resolve, reject) => {
void run(async () => {
try {
const res = await this.resource.__internal_baseGet();
const status = res.firstFactorVerification.status;
if (status === 'verified' || status === 'expired') {
stop();
resolve(res);
}
} catch (err) {
stop();
reject(err);
}
});
});
});
}

async sendPhoneCode(params: SignInFuturePhoneCodeSendParams): Promise<{ error: unknown }> {
const { phoneNumber, channel = 'sms' } = params;
return runAsyncResourceTask(this.resource, async () => {
Expand DownExpand Up@@ -787,6 +880,9 @@ class SignInFuture implements SignInFutureResource {
throw new Error('Cannot finalize sign-in without a created session.');
}

// Reload the client to prevent an issue where the created session is not picked up.
await SignIn.clerk.client?.reload();

await SignIn.clerk.setActive({ session: this.resource.createdSessionId, navigate });
});
}
Expand Down
51 changes: 51 additions & 0 deletions packages/react/src/stateProxy.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ export class StateProxy implements State {
}

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

return {
Expand All@@ -44,13 +45,40 @@ export class StateProxy implements State {
status: 'needs_identifier' as const,
availableStrategies: [],
isTransferable: false,
get firstFactorVerification() {
return gateProperty(target, 'firstFactorVerification', {
status: null,
error: null,
expireAt: null,
externalVerificationRedirectURL: null,
nonce: null,
attempts: null,
message: null,
strategy: null,
verifiedAtClient: null,
verifiedFromTheSameClient: () => false,
__internal_toSnapshot: () => {
throw new Error('__internal_toSnapshot called before Clerk is loaded');
},
pathRoot: '',
reload: () => {
throw new Error('__internal_toSnapshot called before Clerk is loaded');
},
});
},

create: this.gateMethod(target, 'create'),
password: this.gateMethod(target, 'password'),
sso: this.gateMethod(target, 'sso'),
finalize: this.gateMethod(target, 'finalize'),

emailCode: this.wrapMethods(() => target().emailCode, ['sendCode', 'verifyCode'] as const),
emailLink: this.wrapStruct(

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.

Do we need wrapStruct because of the getter (verification) that was introduced?

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.

yeah, emailLink has both methods and properties. We might be able to just use wrapStruct in place of wrapMethods to be consistent though. Not sure if it's worth refactoring since this entire construct might be going away (hopefully [please])

() => target().emailLink,
['sendLink', 'waitForVerification'] as const,
['verification'] as const,
{ verification: null },
),
resetPasswordEmailCode: this.wrapMethods(() => target().resetPasswordEmailCode, [
'sendCode',
'verifyCode',
Expand DownExpand Up@@ -148,4 +176,27 @@ export class StateProxy implements State {
): Pick<T, K[number]> {
return Object.fromEntries(keys.map(k => [k, this.gateMethod(getTarget, k)])) as Pick<T, K[number]>;
}

private wrapStruct<T extends object, M extends readonly (keyof T)[], G extends readonly (keyof T)[]>(
getTarget: () => T,
methods: M,
getters: G,
fallbacks: Pick<T, G[number]>,
): Pick<T, M[number] | G[number]> & {
[K in M[number]]: T[K] extends (...args: any[]) => any ? T[K] : never;
} & {
[K in G[number]]: T[K] extends (...args: any[]) => any ? never : T[K];
} {
const out: any = {};
for (const m of methods) {
out[m] = this.gateMethod(getTarget, m as any);
}
for (const g of getters) {
Object.defineProperty(out, g, {
get: () => this.gateProperty(getTarget, g as any, (fallbacks as any)[g]),
enumerable: true,
});
}
return out;
}
}
43 changes: 43 additions & 0 deletions packages/types/src/signInFuture.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { SetActiveNavigate } from './clerk';
import type { PhoneCodeChannel } from './phoneCodeChannel';
import type { SignInFirstFactor, SignInStatus } from './signInCommon';
import type { OAuthStrategy } from './strategies';
import type { VerificationResource } from './verification';

export interface SignInFutureCreateParams {
identifier?: string;
Expand DownExpand Up@@ -41,6 +42,11 @@ export interface SignInFutureEmailCodeSendParams {
email: string;
}

export interface SignInFutureEmailLinkSendParams {
email: string;
verificationUrl: string;
}

export interface SignInFutureEmailCodeVerifyParams {
code: string;
}
Expand DownExpand Up@@ -111,6 +117,8 @@ export interface SignInFutureResource {

readonly existingSession?: { sessionId: string };

readonly firstFactorVerification: VerificationResource;

/**
* Used to supply an identifier for the sign-in attempt. Calling this method will populate data on the sign-in
* attempt, such as `signIn.resource.supportedFirstFactors`.
Expand All@@ -137,6 +145,41 @@ export interface SignInFutureResource {
verifyCode: (params: SignInFutureEmailCodeVerifyParams) => Promise<{ error: unknown }>;
};

/**
*
*/
emailLink: {
/**
* Used to send an email link to sign-in
*/
sendLink: (params: SignInFutureEmailLinkSendParams) => Promise<{ error: unknown }>;

/**
* Will wait for verification to complete or expire
*/
waitForVerification: () => Promise<{ error: unknown }>;

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.

The DX guide original stated .verifyLink but I do think waitForVerification is better 👍🏻


/**
* The verification status
*/
verification: {
/**
* The verification status
*/
status: 'verified' | 'expired' | 'failed' | 'client_mismatch';

/**
* The created session ID
*/
createdSessionId: string;

/**
* Whether the verification was from the same client
*/
verifiedFromTheSameClient: boolean;
} | null;
};

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

[Experimental] Signal email link support
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@
"files": [
{ "path": "./dist/clerk.js", "maxSize": "819KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "79KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "120.2KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "121KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "120KB" },
Expand Down
96 changes: 96 additions & 0 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import { inBrowser } from '@clerk/shared/browser';
import { ClerkWebAuthnError } from '@clerk/shared/error';
import { Poller } from '@clerk/shared/poller';
import { deepCamelToSnake, deepSnakeToCamel } from '@clerk/shared/underscore';
Expand DownExpand Up@@ -31,6 +32,7 @@ import type {
SignInFutureCreateParams,
SignInFutureEmailCodeSendParams,
SignInFutureEmailCodeVerifyParams,
SignInFutureEmailLinkSendParams,
SignInFutureFinalizeParams,
SignInFutureMFAPhoneCodeVerifyParams,
SignInFuturePasswordParams,
Expand DownExpand Up@@ -61,6 +63,7 @@ import {
generateSignatureWithMetamask,
generateSignatureWithOKXWallet,
getBaseIdentifier,
getClerkQueryParam,
getCoinbaseWalletIdentifier,
getMetamaskIdentifier,
getOKXWalletIdentifier,
Expand DownExpand Up@@ -140,6 +143,14 @@ export class SignIn extends BaseResource implements SignInResource {
*/
__internal_basePost = this._basePost.bind(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_baseGet = this._baseGet.bind(this);

constructor(data: SignInJSON | SignInJSONSnapshot | null = null) {
super();
this.fromJSON(data);
Expand DownExpand Up@@ -539,6 +550,34 @@ class SignInFuture implements SignInFutureResource {
verifyCode: this.verifyEmailCode.bind(this),
};

emailLink = {
sendLink: this.sendEmailLink.bind(this),
waitForVerification: this.waitForEmailLinkVerification.bind(this),
get verification() {
if (!inBrowser()) {
return null;
}

const status = getClerkQueryParam('__clerk_status') as 'verified' | 'expired' | 'failed' | 'client_mismatch';
const createdSessionId = getClerkQueryParam('__clerk_created_session');

if (!status || !createdSessionId) {
return null;
}

const verifiedFromTheSameClient =
status === 'verified' &&
typeof SignIn.clerk.client !== 'undefined' &&
SignIn.clerk.client.sessions.some(s => s.id === createdSessionId);

return {
status,
createdSessionId,
verifiedFromTheSameClient,
};
},
};

resetPasswordEmailCode = {
sendCode: this.sendResetPasswordEmailCode.bind(this),
verifyCode: this.verifyResetPasswordEmailCode.bind(this),
Expand DownExpand Up@@ -583,6 +622,10 @@ class SignInFuture implements SignInFutureResource {
return undefined;
}

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

async sendResetPasswordEmailCode(): Promise<{ error: unknown }> {
return runAsyncResourceTask(this.resource, async () => {
if (!this.resource.id) {
Expand DownExpand Up@@ -680,6 +723,56 @@ class SignInFuture implements SignInFutureResource {
});
}

async sendEmailLink(params: SignInFutureEmailLinkSendParams): Promise<{ error: unknown }> {
const { email, verificationUrl } = params;
return runAsyncResourceTask(this.resource, async () => {
if (!this.resource.id) {
await this.create({ identifier: email });
}

const emailLinkFactor = this.resource.supportedFirstFactors?.find(f => f.strategy === 'email_link');

if (!emailLinkFactor) {
throw new Error('Email link factor not found');
}

const { emailAddressId } = emailLinkFactor;

let absoluteVerificationUrl = verificationUrl;
try {
new URL(verificationUrl);
} catch {
absoluteVerificationUrl = window.location.origin + verificationUrl;
}

await this.resource.__internal_basePost({
body: { emailAddressId, redirectUrl: absoluteVerificationUrl, strategy: 'email_link' },
action: 'prepare_first_factor',
});
});
}

async waitForEmailLinkVerification(): Promise<{ error: unknown }> {
return runAsyncResourceTask(this.resource, async () => {
const { run, stop } = Poller();
await new Promise((resolve, reject) => {
void run(async () => {
try {
const res = await this.resource.__internal_baseGet();
const status = res.firstFactorVerification.status;
if (status === 'verified' || status === 'expired') {
stop();
resolve(res);
}
} catch (err) {
stop();
reject(err);
}
});
});
});
}

async sendPhoneCode(params: SignInFuturePhoneCodeSendParams): Promise<{ error: unknown }> {
const { phoneNumber, channel = 'sms' } = params;
return runAsyncResourceTask(this.resource, async () => {
Expand DownExpand Up@@ -787,6 +880,9 @@ class SignInFuture implements SignInFutureResource {
throw new Error('Cannot finalize sign-in without a created session.');
}

// Reload the client to prevent an issue where the created session is not picked up.
await SignIn.clerk.client?.reload();

await SignIn.clerk.setActive({ session: this.resource.createdSessionId, navigate });
});
}
Expand Down
51 changes: 51 additions & 0 deletions packages/react/src/stateProxy.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@ export class StateProxy implements State {
}

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

return {
Expand All@@ -44,13 +45,40 @@ export class StateProxy implements State {
status: 'needs_identifier' as const,
availableStrategies: [],
isTransferable: false,
get firstFactorVerification() {
return gateProperty(target, 'firstFactorVerification', {
status: null,
error: null,
expireAt: null,
externalVerificationRedirectURL: null,
nonce: null,
attempts: null,
message: null,
strategy: null,
verifiedAtClient: null,
verifiedFromTheSameClient: () => false,
__internal_toSnapshot: () => {
throw new Error('__internal_toSnapshot called before Clerk is loaded');
},
pathRoot: '',
reload: () => {
throw new Error('__internal_toSnapshot called before Clerk is loaded');
},
});
},

create: this.gateMethod(target, 'create'),
password: this.gateMethod(target, 'password'),
sso: this.gateMethod(target, 'sso'),
finalize: this.gateMethod(target, 'finalize'),

emailCode: this.wrapMethods(() => target().emailCode, ['sendCode', 'verifyCode'] as const),
emailLink: this.wrapStruct(

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.

Do we need wrapStruct because of the getter (verification) that was introduced?

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.

yeah, emailLink has both methods and properties. We might be able to just use wrapStruct in place of wrapMethods to be consistent though. Not sure if it's worth refactoring since this entire construct might be going away (hopefully [please])

() => target().emailLink,
['sendLink', 'waitForVerification'] as const,
['verification'] as const,
{ verification: null },
),
resetPasswordEmailCode: this.wrapMethods(() => target().resetPasswordEmailCode, [
'sendCode',
'verifyCode',
Expand DownExpand Up@@ -148,4 +176,27 @@ export class StateProxy implements State {
): Pick<T, K[number]> {
return Object.fromEntries(keys.map(k => [k, this.gateMethod(getTarget, k)])) as Pick<T, K[number]>;
}

private wrapStruct<T extends object, M extends readonly (keyof T)[], G extends readonly (keyof T)[]>(
getTarget: () => T,
methods: M,
getters: G,
fallbacks: Pick<T, G[number]>,
): Pick<T, M[number] | G[number]> & {
[K in M[number]]: T[K] extends (...args: any[]) => any ? T[K] : never;
} & {
[K in G[number]]: T[K] extends (...args: any[]) => any ? never : T[K];
} {
const out: any = {};
for (const m of methods) {
out[m] = this.gateMethod(getTarget, m as any);
}
for (const g of getters) {
Object.defineProperty(out, g, {
get: () => this.gateProperty(getTarget, g as any, (fallbacks as any)[g]),
enumerable: true,
});
}
return out;
}
}
43 changes: 43 additions & 0 deletions packages/types/src/signInFuture.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { SetActiveNavigate } from './clerk';
import type { PhoneCodeChannel } from './phoneCodeChannel';
import type { SignInFirstFactor, SignInStatus } from './signInCommon';
import type { OAuthStrategy } from './strategies';
import type { VerificationResource } from './verification';

export interface SignInFutureCreateParams {
identifier?: string;
Expand DownExpand Up@@ -41,6 +42,11 @@ export interface SignInFutureEmailCodeSendParams {
email: string;
}

export interface SignInFutureEmailLinkSendParams {
email: string;
verificationUrl: string;
}

export interface SignInFutureEmailCodeVerifyParams {
code: string;
}
Expand DownExpand Up@@ -111,6 +117,8 @@ export interface SignInFutureResource {

readonly existingSession?: { sessionId: string };

readonly firstFactorVerification: VerificationResource;

/**
* Used to supply an identifier for the sign-in attempt. Calling this method will populate data on the sign-in
* attempt, such as `signIn.resource.supportedFirstFactors`.
Expand All@@ -137,6 +145,41 @@ export interface SignInFutureResource {
verifyCode: (params: SignInFutureEmailCodeVerifyParams) => Promise<{ error: unknown }>;
};

/**
*
*/
emailLink: {
/**
* Used to send an email link to sign-in
*/
sendLink: (params: SignInFutureEmailLinkSendParams) => Promise<{ error: unknown }>;

/**
* Will wait for verification to complete or expire
*/
waitForVerification: () => Promise<{ error: unknown }>;

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.

The DX guide original stated .verifyLink but I do think waitForVerification is better 👍🏻


/**
* The verification status
*/
verification: {
/**
* The verification status
*/
status: 'verified' | 'expired' | 'failed' | 'client_mismatch';

/**
* The created session ID
*/
createdSessionId: string;

/**
* Whether the verification was from the same client
*/
verifiedFromTheSameClient: boolean;
} | null;
};

/**
*
*/
Expand Down
Loading