Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/afraid-apes-cough.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/shared': minor
---

Add Web3 Solana support to `<UserProfile />`
9 changes: 9 additions & 0 deletions .changeset/legal-jokes-beg.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/shared': minor
'@clerk/react': minor
'@clerk/ui': minor
---

Add support for Sign in with Solana.
Comment thread
coderabbitai[bot] marked this conversation as resolved.
4 changes: 2 additions & 2 deletions packages/clerk-js/bundle-check.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import path from 'node:path';
import { pipeline } from 'node:stream';
import zlib from 'node:zlib';

import { chromium } from 'playwright';
import { chromium } from '@playwright/test';

/**
* This script generates a CLI report detailing the gzipped size of JavaScript resources loaded by `clerk-js` for a
Expand DownExpand Up@@ -212,7 +212,7 @@ function report(url, responses) {

/**
* Loads the given `url` in `browser`, capturing all HTTP requests that occur.
* @param {import('playwright').Browser} browser
* @param {import('@playwright/test').Browser} browser
* @param {string} url
*/
async function getResponseSizes(browser, url) {
Expand Down
4 changes: 4 additions & 0 deletions packages/clerk-js/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,9 +62,13 @@
"@base-org/account": "catalog:module-manager",
"@clerk/shared": "workspace:^",
"@coinbase/wallet-sdk": "catalog:module-manager",
"@solana/wallet-adapter-base": "catalog:module-manager",
"@solana/wallet-adapter-react": "catalog:module-manager",
"@solana/wallet-standard": "catalog:module-manager",
"@stripe/stripe-js": "5.6.0",
"@swc/helpers": "^0.5.17",
"@tanstack/query-core": "5.87.4",
"@wallet-standard/core": "catalog:module-manager",
"@zxcvbn-ts/core": "catalog:module-manager",
"@zxcvbn-ts/language-common": "catalog:module-manager",
"alien-signals": "2.0.6",
Expand Down
15 changes: 14 additions & 1 deletion packages/clerk-js/rspack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,20 @@ const common = ({ mode, variant, disableRHC = false }) => {
},
defaultVendors: {
minChunks: 1,
test: /[\\/]node_modules[\\/]/,
test: module => {
if (!(module instanceof rspack.NormalModule) || !module.resource) {
return false;
}
// Exclude Solana packages and their known transitive dependencies
if (
/[\\/]node_modules[\\/](@solana|@solana-mobile|@wallet-standard|bn\.js|borsh|buffer|superstruct|bs58|jayson|rpc-websockets|qrcode)[\\/]/.test(
module.resource,
)
) {
return false;
}
return /[\\/]node_modules[\\/]/.test(module.resource);
},
name: 'vendors',
priority: -10,
},
Expand Down
26 changes: 23 additions & 3 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,6 +59,7 @@ import type {
AuthenticateWithGoogleOneTapParams,
AuthenticateWithMetamaskParams,
AuthenticateWithOKXWalletParams,
AuthenticateWithSolanaParams,
BillingNamespace,
CheckoutSignalValue,
Clerk as ClerkInterface,
Expand All@@ -74,7 +75,7 @@ import type {
EnvironmentJSON,
EnvironmentJSONSnapshot,
EnvironmentResource,
GenerateSignatureParams,
GenerateSignature,
GoogleOneTapProps,
HandleEmailLinkVerificationParams,
HandleOAuthCallbackParams,
Expand DownExpand Up@@ -2338,6 +2339,13 @@ export class Clerk implements ClerkInterface {
});
};

public authenticateWithSolana = async (props: AuthenticateWithSolanaParams): Promise<void> => {
await this.authenticateWithWeb3({
...props,
strategy: 'web3_solana_signature',
});
};

public authenticateWithWeb3 = async ({
redirectUrl,
signUpContinueUrl,
Expand All@@ -2346,6 +2354,7 @@ export class Clerk implements ClerkInterface {
strategy,
legalAccepted,
secondFactorUrl,
walletName,
}: ClerkAuthenticateWithWeb3Params): Promise<void> => {
if (!this.client || !this.environment) {
return;
Expand All@@ -2354,8 +2363,8 @@ export class Clerk implements ClerkInterface {
const { displayConfig } = this.environment;

const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider;
const identifier = await web3().getWeb3Identifier({ provider });
let generateSignature: (params: GenerateSignatureParams) => Promise<string>;
const identifier = await web3().getWeb3Identifier({ provider, walletName });
let generateSignature: GenerateSignature;
switch (provider) {
case 'metamask':
generateSignature = web3().generateSignatureWithMetamask;
Expand All@@ -2366,6 +2375,15 @@ export class Clerk implements ClerkInterface {
case 'coinbase_wallet':
generateSignature = web3().generateSignatureWithCoinbaseWallet;
break;
case 'solana':
if (!walletName) {
throw new ClerkRuntimeError('Wallet name is required for Solana authentication.', {
code: 'web3_solana_wallet_name_required',
});
}
// Solana requires walletName; bind it into the helper
generateSignature = params => web3().generateSignatureWithSolana({ ...params, walletName });
break;
default:
generateSignature = web3().generateSignatureWithOKXWallet;
break;
Expand DownExpand Up@@ -2395,6 +2413,7 @@ export class Clerk implements ClerkInterface {
identifier,
generateSignature,
strategy,
walletName,
});
} catch (err) {
if (isError(err, ERROR_CODES.FORM_IDENTIFIER_NOT_FOUND)) {
Expand All@@ -2404,6 +2423,7 @@ export class Clerk implements ClerkInterface {
unsafeMetadata,
strategy,
legalAccepted,
walletName,
});

if (
Expand Down
63 changes: 57 additions & 6 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ import type {
EmailLinkConfig,
EmailLinkFactor,
EnterpriseSSOConfig,
GenerateSignature,
PassKeyConfig,
PasskeyFactor,
PhoneCodeConfig,
Expand All@@ -32,6 +33,7 @@ import type {
ResetPasswordEmailCodeFactorConfig,
ResetPasswordParams,
ResetPasswordPhoneCodeFactorConfig,
SignInAuthenticateWithSolanaParams,
SignInCreateParams,
SignInFirstFactor,
SignInFutureBackupCodeVerifyParams,
Expand DownExpand Up@@ -202,6 +204,7 @@ export class SignIn extends BaseResource implements SignInResource {
case 'web3_base_signature':
case 'web3_coinbase_wallet_signature':
case 'web3_okx_wallet_signature':
case 'web3_solana_signature':
config = { web3WalletId: params.web3WalletId } as Web3SignatureConfig;
break;
case 'reset_password_phone_code':
Expand DownExpand Up@@ -363,13 +366,17 @@ export class SignIn extends BaseResource implements SignInResource {
};

public authenticateWithWeb3 = async (params: AuthenticateWithWeb3Params): Promise<SignInResource> => {
const { identifier, generateSignature, strategy = 'web3_metamask_signature' } = params || {};
const { identifier, generateSignature, strategy = 'web3_metamask_signature', walletName } = params || {};
const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider;

if (!(typeof generateSignature === 'function')) {
clerkMissingOptionError('generateSignature');
}

if (provider === 'solana' && !walletName) {
clerkMissingOptionError('walletName');
}

await this.create({ identifier });

const web3FirstFactor = this.supportedFirstFactors?.find(f => f.strategy === strategy) as Web3SignatureFactor;
Expand All@@ -387,7 +394,7 @@ export class SignIn extends BaseResource implements SignInResource {

let signature: string;
try {
signature = await generateSignature({ identifier, nonce: message, provider });
signature = await generateSignature({ identifier, nonce: message, walletName, provider });
} catch (err) {
// There is a chance that as a user when you try to setup and use the Coinbase Wallet with an existing
// Passkey in order to authenticate, the initial generate signature request to be rejected. For this
Expand All@@ -396,7 +403,7 @@ export class SignIn extends BaseResource implements SignInResource {
// error code 4001 means the user rejected the request
// Reference: https://docs.cdp.coinbase.com/wallet-sdk/docs/errors
if (provider === 'coinbase_wallet' && err.code === 4001) {
signature = await generateSignature({ identifier, nonce: message, provider });
signature = await generateSignature({ identifier, nonce: message, provider, walletName });
} else {
throw err;
}
Expand DownExpand Up@@ -444,6 +451,31 @@ export class SignIn extends BaseResource implements SignInResource {
});
};

/**
* Authenticates a user using a Solana Web3 wallet during sign-in.
*
* @param params - Configuration for Solana authentication
* @param params.walletName - The name of the Solana wallet to use for authentication
* @returns A promise that resolves to the updated SignIn resource
* @throws {ClerkRuntimeError} If walletName is not provided or wallet connection fails
*
* @example
* ```typescript
* await signIn.authenticateWithSolana({ walletName: 'phantom' });
* ```
*/
public authenticateWithSolana = async ({
walletName,
}: SignInAuthenticateWithSolanaParams): Promise<SignInResource> => {
const identifier = await web3().getSolanaIdentifier(walletName);
return this.authenticateWithWeb3({
identifier,
generateSignature: p => web3().generateSignatureWithSolana({ ...p, walletName: walletName }),
strategy: 'web3_solana_signature',
walletName: walletName,
});
};

public authenticateWithPasskey = async (params?: AuthenticateWithPasskeyParams): Promise<SignInResource> => {
const { flow } = params || {};

Expand DownExpand Up@@ -961,7 +993,7 @@ class SignInFuture implements SignInFutureResource {

return runAsyncResourceTask(this.#resource, async () => {
let identifier;
let generateSignature;
let generateSignature: GenerateSignature;
switch (provider) {
case 'metamask':
identifier = await web3().getMetamaskIdentifier();
Expand All@@ -979,6 +1011,16 @@ class SignInFuture implements SignInFutureResource {
identifier = await web3().getOKXWalletIdentifier();
generateSignature = web3().generateSignatureWithOKXWallet;
break;
case 'solana':
if (!params.walletName) {
throw new ClerkRuntimeError('Wallet name is required for Solana authentication.', {
code: 'web3_solana_wallet_name_required',
});
}
identifier = await web3().getSolanaIdentifier(params.walletName);
generateSignature = p =>
web3().generateSignatureWithSolana({ ...p, walletName: params.walletName as string });
break;
default:
throw new Error(`Unsupported Web3 provider: ${provider}`);
}
Expand All@@ -1004,7 +1046,12 @@ class SignInFuture implements SignInFutureResource {

let signature: string;
try {
signature = await generateSignature({ identifier, nonce: message });
signature = await generateSignature({
identifier,
nonce: message,
walletName: params?.walletName,
provider,
});
} catch (err) {
// There is a chance that as a user when you try to setup and use the Coinbase Wallet with an existing
// Passkey in order to authenticate, the initial generate signature request to be rejected. For this
Expand All@@ -1013,7 +1060,11 @@ class SignInFuture implements SignInFutureResource {
// error code 4001 means the user rejected the request
// Reference: https://docs.cdp.coinbase.com/wallet-sdk/docs/errors
if (provider === 'coinbase_wallet' && err.code === 4001) {
signature = await generateSignature({ identifier, nonce: message });
signature = await generateSignature({
identifier,
nonce: message,
provider,
});
} else {
throw err;
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
feat(clerk-js,react,localizations,shared,ui): Add Solana feature support to core 3 by kduprey · Pull Request #7450 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/afraid-apes-cough.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/shared': minor
---

Add Web3 Solana support to `<UserProfile />`
9 changes: 9 additions & 0 deletions .changeset/legal-jokes-beg.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/shared': minor
'@clerk/react': minor
'@clerk/ui': minor
---

Add support for Sign in with Solana.
Comment thread
coderabbitai[bot] marked this conversation as resolved.
4 changes: 2 additions & 2 deletions packages/clerk-js/bundle-check.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import path from 'node:path';
import { pipeline } from 'node:stream';
import zlib from 'node:zlib';

import { chromium } from 'playwright';
import { chromium } from '@playwright/test';

/**
* This script generates a CLI report detailing the gzipped size of JavaScript resources loaded by `clerk-js` for a
Expand DownExpand Up@@ -212,7 +212,7 @@ function report(url, responses) {

/**
* Loads the given `url` in `browser`, capturing all HTTP requests that occur.
* @param {import('playwright').Browser} browser
* @param {import('@playwright/test').Browser} browser
* @param {string} url
*/
async function getResponseSizes(browser, url) {
Expand Down
4 changes: 4 additions & 0 deletions packages/clerk-js/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,9 +62,13 @@
"@base-org/account": "catalog:module-manager",
"@clerk/shared": "workspace:^",
"@coinbase/wallet-sdk": "catalog:module-manager",
"@solana/wallet-adapter-base": "catalog:module-manager",
"@solana/wallet-adapter-react": "catalog:module-manager",
"@solana/wallet-standard": "catalog:module-manager",
"@stripe/stripe-js": "5.6.0",
"@swc/helpers": "^0.5.17",
"@tanstack/query-core": "5.87.4",
"@wallet-standard/core": "catalog:module-manager",
"@zxcvbn-ts/core": "catalog:module-manager",
"@zxcvbn-ts/language-common": "catalog:module-manager",
"alien-signals": "2.0.6",
Expand Down
15 changes: 14 additions & 1 deletion packages/clerk-js/rspack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,20 @@ const common = ({ mode, variant, disableRHC = false }) => {
},
defaultVendors: {
minChunks: 1,
test: /[\\/]node_modules[\\/]/,
test: module => {
if (!(module instanceof rspack.NormalModule) || !module.resource) {
return false;
}
// Exclude Solana packages and their known transitive dependencies
if (
/[\\/]node_modules[\\/](@solana|@solana-mobile|@wallet-standard|bn\.js|borsh|buffer|superstruct|bs58|jayson|rpc-websockets|qrcode)[\\/]/.test(
module.resource,
)
) {
return false;
}
return /[\\/]node_modules[\\/]/.test(module.resource);
},
name: 'vendors',
priority: -10,
},
Expand Down
26 changes: 23 additions & 3 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,6 +59,7 @@ import type {
AuthenticateWithGoogleOneTapParams,
AuthenticateWithMetamaskParams,
AuthenticateWithOKXWalletParams,
AuthenticateWithSolanaParams,
BillingNamespace,
CheckoutSignalValue,
Clerk as ClerkInterface,
Expand All@@ -74,7 +75,7 @@ import type {
EnvironmentJSON,
EnvironmentJSONSnapshot,
EnvironmentResource,
GenerateSignatureParams,
GenerateSignature,
GoogleOneTapProps,
HandleEmailLinkVerificationParams,
HandleOAuthCallbackParams,
Expand DownExpand Up@@ -2338,6 +2339,13 @@ export class Clerk implements ClerkInterface {
});
};

public authenticateWithSolana = async (props: AuthenticateWithSolanaParams): Promise<void> => {
await this.authenticateWithWeb3({
...props,
strategy: 'web3_solana_signature',
});
};

public authenticateWithWeb3 = async ({
redirectUrl,
signUpContinueUrl,
Expand All@@ -2346,6 +2354,7 @@ export class Clerk implements ClerkInterface {
strategy,
legalAccepted,
secondFactorUrl,
walletName,
}: ClerkAuthenticateWithWeb3Params): Promise<void> => {
if (!this.client || !this.environment) {
return;
Expand All@@ -2354,8 +2363,8 @@ export class Clerk implements ClerkInterface {
const { displayConfig } = this.environment;

const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider;
const identifier = await web3().getWeb3Identifier({ provider });
let generateSignature: (params: GenerateSignatureParams) => Promise<string>;
const identifier = await web3().getWeb3Identifier({ provider, walletName });
let generateSignature: GenerateSignature;
switch (provider) {
case 'metamask':
generateSignature = web3().generateSignatureWithMetamask;
Expand All@@ -2366,6 +2375,15 @@ export class Clerk implements ClerkInterface {
case 'coinbase_wallet':
generateSignature = web3().generateSignatureWithCoinbaseWallet;
break;
case 'solana':
if (!walletName) {
throw new ClerkRuntimeError('Wallet name is required for Solana authentication.', {
code: 'web3_solana_wallet_name_required',
});
}
// Solana requires walletName; bind it into the helper
generateSignature = params => web3().generateSignatureWithSolana({ ...params, walletName });
break;
default:
generateSignature = web3().generateSignatureWithOKXWallet;
break;
Expand DownExpand Up@@ -2395,6 +2413,7 @@ export class Clerk implements ClerkInterface {
identifier,
generateSignature,
strategy,
walletName,
});
} catch (err) {
if (isError(err, ERROR_CODES.FORM_IDENTIFIER_NOT_FOUND)) {
Expand All@@ -2404,6 +2423,7 @@ export class Clerk implements ClerkInterface {
unsafeMetadata,
strategy,
legalAccepted,
walletName,
});

if (
Expand Down
63 changes: 57 additions & 6 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ import type {
EmailLinkConfig,
EmailLinkFactor,
EnterpriseSSOConfig,
GenerateSignature,
PassKeyConfig,
PasskeyFactor,
PhoneCodeConfig,
Expand All@@ -32,6 +33,7 @@ import type {
ResetPasswordEmailCodeFactorConfig,
ResetPasswordParams,
ResetPasswordPhoneCodeFactorConfig,
SignInAuthenticateWithSolanaParams,
SignInCreateParams,
SignInFirstFactor,
SignInFutureBackupCodeVerifyParams,
Expand DownExpand Up@@ -202,6 +204,7 @@ export class SignIn extends BaseResource implements SignInResource {
case 'web3_base_signature':
case 'web3_coinbase_wallet_signature':
case 'web3_okx_wallet_signature':
case 'web3_solana_signature':
config = { web3WalletId: params.web3WalletId } as Web3SignatureConfig;
break;
case 'reset_password_phone_code':
Expand DownExpand Up@@ -363,13 +366,17 @@ export class SignIn extends BaseResource implements SignInResource {
};

public authenticateWithWeb3 = async (params: AuthenticateWithWeb3Params): Promise<SignInResource> => {
const { identifier, generateSignature, strategy = 'web3_metamask_signature' } = params || {};
const { identifier, generateSignature, strategy = 'web3_metamask_signature', walletName } = params || {};
const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider;

if (!(typeof generateSignature === 'function')) {
clerkMissingOptionError('generateSignature');
}

if (provider === 'solana' && !walletName) {
clerkMissingOptionError('walletName');
}

await this.create({ identifier });

const web3FirstFactor = this.supportedFirstFactors?.find(f => f.strategy === strategy) as Web3SignatureFactor;
Expand All@@ -387,7 +394,7 @@ export class SignIn extends BaseResource implements SignInResource {

let signature: string;
try {
signature = await generateSignature({ identifier, nonce: message, provider });
signature = await generateSignature({ identifier, nonce: message, walletName, provider });
} catch (err) {
// There is a chance that as a user when you try to setup and use the Coinbase Wallet with an existing
// Passkey in order to authenticate, the initial generate signature request to be rejected. For this
Expand All@@ -396,7 +403,7 @@ export class SignIn extends BaseResource implements SignInResource {
// error code 4001 means the user rejected the request
// Reference: https://docs.cdp.coinbase.com/wallet-sdk/docs/errors
if (provider === 'coinbase_wallet' && err.code === 4001) {
signature = await generateSignature({ identifier, nonce: message, provider });
signature = await generateSignature({ identifier, nonce: message, provider, walletName });
} else {
throw err;
}
Expand DownExpand Up@@ -444,6 +451,31 @@ export class SignIn extends BaseResource implements SignInResource {
});
};

/**
* Authenticates a user using a Solana Web3 wallet during sign-in.
*
* @param params - Configuration for Solana authentication
* @param params.walletName - The name of the Solana wallet to use for authentication
* @returns A promise that resolves to the updated SignIn resource
* @throws {ClerkRuntimeError} If walletName is not provided or wallet connection fails
*
* @example
* ```typescript
* await signIn.authenticateWithSolana({ walletName: 'phantom' });
* ```
*/
public authenticateWithSolana = async ({
walletName,
}: SignInAuthenticateWithSolanaParams): Promise<SignInResource> => {
const identifier = await web3().getSolanaIdentifier(walletName);
return this.authenticateWithWeb3({
identifier,
generateSignature: p => web3().generateSignatureWithSolana({ ...p, walletName: walletName }),
strategy: 'web3_solana_signature',
walletName: walletName,
});
};

public authenticateWithPasskey = async (params?: AuthenticateWithPasskeyParams): Promise<SignInResource> => {
const { flow } = params || {};

Expand DownExpand Up@@ -961,7 +993,7 @@ class SignInFuture implements SignInFutureResource {

return runAsyncResourceTask(this.#resource, async () => {
let identifier;
let generateSignature;
let generateSignature: GenerateSignature;
switch (provider) {
case 'metamask':
identifier = await web3().getMetamaskIdentifier();
Expand All@@ -979,6 +1011,16 @@ class SignInFuture implements SignInFutureResource {
identifier = await web3().getOKXWalletIdentifier();
generateSignature = web3().generateSignatureWithOKXWallet;
break;
case 'solana':
if (!params.walletName) {
throw new ClerkRuntimeError('Wallet name is required for Solana authentication.', {
code: 'web3_solana_wallet_name_required',
});
}
identifier = await web3().getSolanaIdentifier(params.walletName);
generateSignature = p =>
web3().generateSignatureWithSolana({ ...p, walletName: params.walletName as string });
break;
default:
throw new Error(`Unsupported Web3 provider: ${provider}`);
}
Expand All@@ -1004,7 +1046,12 @@ class SignInFuture implements SignInFutureResource {

let signature: string;
try {
signature = await generateSignature({ identifier, nonce: message });
signature = await generateSignature({
identifier,
nonce: message,
walletName: params?.walletName,
provider,
});
} catch (err) {
// There is a chance that as a user when you try to setup and use the Coinbase Wallet with an existing
// Passkey in order to authenticate, the initial generate signature request to be rejected. For this
Expand All@@ -1013,7 +1060,11 @@ class SignInFuture implements SignInFutureResource {
// error code 4001 means the user rejected the request
// Reference: https://docs.cdp.coinbase.com/wallet-sdk/docs/errors
if (provider === 'coinbase_wallet' && err.code === 4001) {
signature = await generateSignature({ identifier, nonce: message });
signature = await generateSignature({
identifier,
nonce: message,
provider,
});
} else {
throw err;
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(clerk-js,react,localizations,shared,ui): Add Solana feature support to core 3 by kduprey · Pull Request #7450 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/afraid-apes-cough.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/shared': minor
---

Add Web3 Solana support to `<UserProfile />`
9 changes: 9 additions & 0 deletions .changeset/legal-jokes-beg.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/shared': minor
'@clerk/react': minor
'@clerk/ui': minor
---

Add support for Sign in with Solana.
Comment thread
coderabbitai[bot] marked this conversation as resolved.
4 changes: 2 additions & 2 deletions packages/clerk-js/bundle-check.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import path from 'node:path';
import { pipeline } from 'node:stream';
import zlib from 'node:zlib';

import { chromium } from 'playwright';
import { chromium } from '@playwright/test';

/**
* This script generates a CLI report detailing the gzipped size of JavaScript resources loaded by `clerk-js` for a
Expand DownExpand Up@@ -212,7 +212,7 @@ function report(url, responses) {

/**
* Loads the given `url` in `browser`, capturing all HTTP requests that occur.
* @param {import('playwright').Browser} browser
* @param {import('@playwright/test').Browser} browser
* @param {string} url
*/
async function getResponseSizes(browser, url) {
Expand Down
4 changes: 4 additions & 0 deletions packages/clerk-js/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,9 +62,13 @@
"@base-org/account": "catalog:module-manager",
"@clerk/shared": "workspace:^",
"@coinbase/wallet-sdk": "catalog:module-manager",
"@solana/wallet-adapter-base": "catalog:module-manager",
"@solana/wallet-adapter-react": "catalog:module-manager",
"@solana/wallet-standard": "catalog:module-manager",
"@stripe/stripe-js": "5.6.0",
"@swc/helpers": "^0.5.17",
"@tanstack/query-core": "5.87.4",
"@wallet-standard/core": "catalog:module-manager",
"@zxcvbn-ts/core": "catalog:module-manager",
"@zxcvbn-ts/language-common": "catalog:module-manager",
"alien-signals": "2.0.6",
Expand Down
15 changes: 14 additions & 1 deletion packages/clerk-js/rspack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,20 @@ const common = ({ mode, variant, disableRHC = false }) => {
},
defaultVendors: {
minChunks: 1,
test: /[\\/]node_modules[\\/]/,
test: module => {
if (!(module instanceof rspack.NormalModule) || !module.resource) {
return false;
}
// Exclude Solana packages and their known transitive dependencies
if (
/[\\/]node_modules[\\/](@solana|@solana-mobile|@wallet-standard|bn\.js|borsh|buffer|superstruct|bs58|jayson|rpc-websockets|qrcode)[\\/]/.test(
module.resource,
)
) {
return false;
}
return /[\\/]node_modules[\\/]/.test(module.resource);
},
name: 'vendors',
priority: -10,
},
Expand Down
26 changes: 23 additions & 3 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,6 +59,7 @@ import type {
AuthenticateWithGoogleOneTapParams,
AuthenticateWithMetamaskParams,
AuthenticateWithOKXWalletParams,
AuthenticateWithSolanaParams,
BillingNamespace,
CheckoutSignalValue,
Clerk as ClerkInterface,
Expand All@@ -74,7 +75,7 @@ import type {
EnvironmentJSON,
EnvironmentJSONSnapshot,
EnvironmentResource,
GenerateSignatureParams,
GenerateSignature,
GoogleOneTapProps,
HandleEmailLinkVerificationParams,
HandleOAuthCallbackParams,
Expand DownExpand Up@@ -2338,6 +2339,13 @@ export class Clerk implements ClerkInterface {
});
};

public authenticateWithSolana = async (props: AuthenticateWithSolanaParams): Promise<void> => {
await this.authenticateWithWeb3({
...props,
strategy: 'web3_solana_signature',
});
};

public authenticateWithWeb3 = async ({
redirectUrl,
signUpContinueUrl,
Expand All@@ -2346,6 +2354,7 @@ export class Clerk implements ClerkInterface {
strategy,
legalAccepted,
secondFactorUrl,
walletName,
}: ClerkAuthenticateWithWeb3Params): Promise<void> => {
if (!this.client || !this.environment) {
return;
Expand All@@ -2354,8 +2363,8 @@ export class Clerk implements ClerkInterface {
const { displayConfig } = this.environment;

const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider;
const identifier = await web3().getWeb3Identifier({ provider });
let generateSignature: (params: GenerateSignatureParams) => Promise<string>;
const identifier = await web3().getWeb3Identifier({ provider, walletName });
let generateSignature: GenerateSignature;
switch (provider) {
case 'metamask':
generateSignature = web3().generateSignatureWithMetamask;
Expand All@@ -2366,6 +2375,15 @@ export class Clerk implements ClerkInterface {
case 'coinbase_wallet':
generateSignature = web3().generateSignatureWithCoinbaseWallet;
break;
case 'solana':
if (!walletName) {
throw new ClerkRuntimeError('Wallet name is required for Solana authentication.', {
code: 'web3_solana_wallet_name_required',
});
}
// Solana requires walletName; bind it into the helper
generateSignature = params => web3().generateSignatureWithSolana({ ...params, walletName });
break;
default:
generateSignature = web3().generateSignatureWithOKXWallet;
break;
Expand DownExpand Up@@ -2395,6 +2413,7 @@ export class Clerk implements ClerkInterface {
identifier,
generateSignature,
strategy,
walletName,
});
} catch (err) {
if (isError(err, ERROR_CODES.FORM_IDENTIFIER_NOT_FOUND)) {
Expand All@@ -2404,6 +2423,7 @@ export class Clerk implements ClerkInterface {
unsafeMetadata,
strategy,
legalAccepted,
walletName,
});

if (
Expand Down
63 changes: 57 additions & 6 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ import type {
EmailLinkConfig,
EmailLinkFactor,
EnterpriseSSOConfig,
GenerateSignature,
PassKeyConfig,
PasskeyFactor,
PhoneCodeConfig,
Expand All@@ -32,6 +33,7 @@ import type {
ResetPasswordEmailCodeFactorConfig,
ResetPasswordParams,
ResetPasswordPhoneCodeFactorConfig,
SignInAuthenticateWithSolanaParams,
SignInCreateParams,
SignInFirstFactor,
SignInFutureBackupCodeVerifyParams,
Expand DownExpand Up@@ -202,6 +204,7 @@ export class SignIn extends BaseResource implements SignInResource {
case 'web3_base_signature':
case 'web3_coinbase_wallet_signature':
case 'web3_okx_wallet_signature':
case 'web3_solana_signature':
config = { web3WalletId: params.web3WalletId } as Web3SignatureConfig;
break;
case 'reset_password_phone_code':
Expand DownExpand Up@@ -363,13 +366,17 @@ export class SignIn extends BaseResource implements SignInResource {
};

public authenticateWithWeb3 = async (params: AuthenticateWithWeb3Params): Promise<SignInResource> => {
const { identifier, generateSignature, strategy = 'web3_metamask_signature' } = params || {};
const { identifier, generateSignature, strategy = 'web3_metamask_signature', walletName } = params || {};
const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider;

if (!(typeof generateSignature === 'function')) {
clerkMissingOptionError('generateSignature');
}

if (provider === 'solana' && !walletName) {
clerkMissingOptionError('walletName');
}

await this.create({ identifier });

const web3FirstFactor = this.supportedFirstFactors?.find(f => f.strategy === strategy) as Web3SignatureFactor;
Expand All@@ -387,7 +394,7 @@ export class SignIn extends BaseResource implements SignInResource {

let signature: string;
try {
signature = await generateSignature({ identifier, nonce: message, provider });
signature = await generateSignature({ identifier, nonce: message, walletName, provider });
} catch (err) {
// There is a chance that as a user when you try to setup and use the Coinbase Wallet with an existing
// Passkey in order to authenticate, the initial generate signature request to be rejected. For this
Expand All@@ -396,7 +403,7 @@ export class SignIn extends BaseResource implements SignInResource {
// error code 4001 means the user rejected the request
// Reference: https://docs.cdp.coinbase.com/wallet-sdk/docs/errors
if (provider === 'coinbase_wallet' && err.code === 4001) {
signature = await generateSignature({ identifier, nonce: message, provider });
signature = await generateSignature({ identifier, nonce: message, provider, walletName });
} else {
throw err;
}
Expand DownExpand Up@@ -444,6 +451,31 @@ export class SignIn extends BaseResource implements SignInResource {
});
};

/**
* Authenticates a user using a Solana Web3 wallet during sign-in.
*
* @param params - Configuration for Solana authentication
* @param params.walletName - The name of the Solana wallet to use for authentication
* @returns A promise that resolves to the updated SignIn resource
* @throws {ClerkRuntimeError} If walletName is not provided or wallet connection fails
*
* @example
* ```typescript
* await signIn.authenticateWithSolana({ walletName: 'phantom' });
* ```
*/
public authenticateWithSolana = async ({
walletName,
}: SignInAuthenticateWithSolanaParams): Promise<SignInResource> => {
const identifier = await web3().getSolanaIdentifier(walletName);
return this.authenticateWithWeb3({
identifier,
generateSignature: p => web3().generateSignatureWithSolana({ ...p, walletName: walletName }),
strategy: 'web3_solana_signature',
walletName: walletName,
});
};

public authenticateWithPasskey = async (params?: AuthenticateWithPasskeyParams): Promise<SignInResource> => {
const { flow } = params || {};

Expand DownExpand Up@@ -961,7 +993,7 @@ class SignInFuture implements SignInFutureResource {

return runAsyncResourceTask(this.#resource, async () => {
let identifier;
let generateSignature;
let generateSignature: GenerateSignature;
switch (provider) {
case 'metamask':
identifier = await web3().getMetamaskIdentifier();
Expand All@@ -979,6 +1011,16 @@ class SignInFuture implements SignInFutureResource {
identifier = await web3().getOKXWalletIdentifier();
generateSignature = web3().generateSignatureWithOKXWallet;
break;
case 'solana':
if (!params.walletName) {
throw new ClerkRuntimeError('Wallet name is required for Solana authentication.', {
code: 'web3_solana_wallet_name_required',
});
}
identifier = await web3().getSolanaIdentifier(params.walletName);
generateSignature = p =>
web3().generateSignatureWithSolana({ ...p, walletName: params.walletName as string });
break;
default:
throw new Error(`Unsupported Web3 provider: ${provider}`);
}
Expand All@@ -1004,7 +1046,12 @@ class SignInFuture implements SignInFutureResource {

let signature: string;
try {
signature = await generateSignature({ identifier, nonce: message });
signature = await generateSignature({
identifier,
nonce: message,
walletName: params?.walletName,
provider,
});
} catch (err) {
// There is a chance that as a user when you try to setup and use the Coinbase Wallet with an existing
// Passkey in order to authenticate, the initial generate signature request to be rejected. For this
Expand All@@ -1013,7 +1060,11 @@ class SignInFuture implements SignInFutureResource {
// error code 4001 means the user rejected the request
// Reference: https://docs.cdp.coinbase.com/wallet-sdk/docs/errors
if (provider === 'coinbase_wallet' && err.code === 4001) {
signature = await generateSignature({ identifier, nonce: message });
signature = await generateSignature({
identifier,
nonce: message,
provider,
});
} else {
throw err;
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(clerk-js,react,localizations,shared,ui): Add Solana feature support to core 3 by kduprey · Pull Request #7450 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/afraid-apes-cough.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/shared': minor
---

Add Web3 Solana support to `<UserProfile />`
9 changes: 9 additions & 0 deletions .changeset/legal-jokes-beg.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/shared': minor
'@clerk/react': minor
'@clerk/ui': minor
---

Add support for Sign in with Solana.
Comment thread
coderabbitai[bot] marked this conversation as resolved.
4 changes: 2 additions & 2 deletions packages/clerk-js/bundle-check.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import path from 'node:path';
import { pipeline } from 'node:stream';
import zlib from 'node:zlib';

import { chromium } from 'playwright';
import { chromium } from '@playwright/test';

/**
* This script generates a CLI report detailing the gzipped size of JavaScript resources loaded by `clerk-js` for a
Expand DownExpand Up@@ -212,7 +212,7 @@ function report(url, responses) {

/**
* Loads the given `url` in `browser`, capturing all HTTP requests that occur.
* @param {import('playwright').Browser} browser
* @param {import('@playwright/test').Browser} browser
* @param {string} url
*/
async function getResponseSizes(browser, url) {
Expand Down
4 changes: 4 additions & 0 deletions packages/clerk-js/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,9 +62,13 @@
"@base-org/account": "catalog:module-manager",
"@clerk/shared": "workspace:^",
"@coinbase/wallet-sdk": "catalog:module-manager",
"@solana/wallet-adapter-base": "catalog:module-manager",
"@solana/wallet-adapter-react": "catalog:module-manager",
"@solana/wallet-standard": "catalog:module-manager",
"@stripe/stripe-js": "5.6.0",
"@swc/helpers": "^0.5.17",
"@tanstack/query-core": "5.87.4",
"@wallet-standard/core": "catalog:module-manager",
"@zxcvbn-ts/core": "catalog:module-manager",
"@zxcvbn-ts/language-common": "catalog:module-manager",
"alien-signals": "2.0.6",
Expand Down
15 changes: 14 additions & 1 deletion packages/clerk-js/rspack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,20 @@ const common = ({ mode, variant, disableRHC = false }) => {
},
defaultVendors: {
minChunks: 1,
test: /[\\/]node_modules[\\/]/,
test: module => {
if (!(module instanceof rspack.NormalModule) || !module.resource) {
return false;
}
// Exclude Solana packages and their known transitive dependencies
if (
/[\\/]node_modules[\\/](@solana|@solana-mobile|@wallet-standard|bn\.js|borsh|buffer|superstruct|bs58|jayson|rpc-websockets|qrcode)[\\/]/.test(
module.resource,
)
) {
return false;
}
return /[\\/]node_modules[\\/]/.test(module.resource);
},
name: 'vendors',
priority: -10,
},
Expand Down
26 changes: 23 additions & 3 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,6 +59,7 @@ import type {
AuthenticateWithGoogleOneTapParams,
AuthenticateWithMetamaskParams,
AuthenticateWithOKXWalletParams,
AuthenticateWithSolanaParams,
BillingNamespace,
CheckoutSignalValue,
Clerk as ClerkInterface,
Expand All@@ -74,7 +75,7 @@ import type {
EnvironmentJSON,
EnvironmentJSONSnapshot,
EnvironmentResource,
GenerateSignatureParams,
GenerateSignature,
GoogleOneTapProps,
HandleEmailLinkVerificationParams,
HandleOAuthCallbackParams,
Expand DownExpand Up@@ -2338,6 +2339,13 @@ export class Clerk implements ClerkInterface {
});
};

public authenticateWithSolana = async (props: AuthenticateWithSolanaParams): Promise<void> => {
await this.authenticateWithWeb3({
...props,
strategy: 'web3_solana_signature',
});
};

public authenticateWithWeb3 = async ({
redirectUrl,
signUpContinueUrl,
Expand All@@ -2346,6 +2354,7 @@ export class Clerk implements ClerkInterface {
strategy,
legalAccepted,
secondFactorUrl,
walletName,
}: ClerkAuthenticateWithWeb3Params): Promise<void> => {
if (!this.client || !this.environment) {
return;
Expand All@@ -2354,8 +2363,8 @@ export class Clerk implements ClerkInterface {
const { displayConfig } = this.environment;

const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider;
const identifier = await web3().getWeb3Identifier({ provider });
let generateSignature: (params: GenerateSignatureParams) => Promise<string>;
const identifier = await web3().getWeb3Identifier({ provider, walletName });
let generateSignature: GenerateSignature;
switch (provider) {
case 'metamask':
generateSignature = web3().generateSignatureWithMetamask;
Expand All@@ -2366,6 +2375,15 @@ export class Clerk implements ClerkInterface {
case 'coinbase_wallet':
generateSignature = web3().generateSignatureWithCoinbaseWallet;
break;
case 'solana':
if (!walletName) {
throw new ClerkRuntimeError('Wallet name is required for Solana authentication.', {
code: 'web3_solana_wallet_name_required',
});
}
// Solana requires walletName; bind it into the helper
generateSignature = params => web3().generateSignatureWithSolana({ ...params, walletName });
break;
default:
generateSignature = web3().generateSignatureWithOKXWallet;
break;
Expand DownExpand Up@@ -2395,6 +2413,7 @@ export class Clerk implements ClerkInterface {
identifier,
generateSignature,
strategy,
walletName,
});
} catch (err) {
if (isError(err, ERROR_CODES.FORM_IDENTIFIER_NOT_FOUND)) {
Expand All@@ -2404,6 +2423,7 @@ export class Clerk implements ClerkInterface {
unsafeMetadata,
strategy,
legalAccepted,
walletName,
});

if (
Expand Down
63 changes: 57 additions & 6 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ import type {
EmailLinkConfig,
EmailLinkFactor,
EnterpriseSSOConfig,
GenerateSignature,
PassKeyConfig,
PasskeyFactor,
PhoneCodeConfig,
Expand All@@ -32,6 +33,7 @@ import type {
ResetPasswordEmailCodeFactorConfig,
ResetPasswordParams,
ResetPasswordPhoneCodeFactorConfig,
SignInAuthenticateWithSolanaParams,
SignInCreateParams,
SignInFirstFactor,
SignInFutureBackupCodeVerifyParams,
Expand DownExpand Up@@ -202,6 +204,7 @@ export class SignIn extends BaseResource implements SignInResource {
case 'web3_base_signature':
case 'web3_coinbase_wallet_signature':
case 'web3_okx_wallet_signature':
case 'web3_solana_signature':
config = { web3WalletId: params.web3WalletId } as Web3SignatureConfig;
break;
case 'reset_password_phone_code':
Expand DownExpand Up@@ -363,13 +366,17 @@ export class SignIn extends BaseResource implements SignInResource {
};

public authenticateWithWeb3 = async (params: AuthenticateWithWeb3Params): Promise<SignInResource> => {
const { identifier, generateSignature, strategy = 'web3_metamask_signature' } = params || {};
const { identifier, generateSignature, strategy = 'web3_metamask_signature', walletName } = params || {};
const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider;

if (!(typeof generateSignature === 'function')) {
clerkMissingOptionError('generateSignature');
}

if (provider === 'solana' && !walletName) {
clerkMissingOptionError('walletName');
}

await this.create({ identifier });

const web3FirstFactor = this.supportedFirstFactors?.find(f => f.strategy === strategy) as Web3SignatureFactor;
Expand All@@ -387,7 +394,7 @@ export class SignIn extends BaseResource implements SignInResource {

let signature: string;
try {
signature = await generateSignature({ identifier, nonce: message, provider });
signature = await generateSignature({ identifier, nonce: message, walletName, provider });
} catch (err) {
// There is a chance that as a user when you try to setup and use the Coinbase Wallet with an existing
// Passkey in order to authenticate, the initial generate signature request to be rejected. For this
Expand All@@ -396,7 +403,7 @@ export class SignIn extends BaseResource implements SignInResource {
// error code 4001 means the user rejected the request
// Reference: https://docs.cdp.coinbase.com/wallet-sdk/docs/errors
if (provider === 'coinbase_wallet' && err.code === 4001) {
signature = await generateSignature({ identifier, nonce: message, provider });
signature = await generateSignature({ identifier, nonce: message, provider, walletName });
} else {
throw err;
}
Expand DownExpand Up@@ -444,6 +451,31 @@ export class SignIn extends BaseResource implements SignInResource {
});
};

/**
* Authenticates a user using a Solana Web3 wallet during sign-in.
*
* @param params - Configuration for Solana authentication
* @param params.walletName - The name of the Solana wallet to use for authentication
* @returns A promise that resolves to the updated SignIn resource
* @throws {ClerkRuntimeError} If walletName is not provided or wallet connection fails
*
* @example
* ```typescript
* await signIn.authenticateWithSolana({ walletName: 'phantom' });
* ```
*/
public authenticateWithSolana = async ({
walletName,
}: SignInAuthenticateWithSolanaParams): Promise<SignInResource> => {
const identifier = await web3().getSolanaIdentifier(walletName);
return this.authenticateWithWeb3({
identifier,
generateSignature: p => web3().generateSignatureWithSolana({ ...p, walletName: walletName }),
strategy: 'web3_solana_signature',
walletName: walletName,
});
};

public authenticateWithPasskey = async (params?: AuthenticateWithPasskeyParams): Promise<SignInResource> => {
const { flow } = params || {};

Expand DownExpand Up@@ -961,7 +993,7 @@ class SignInFuture implements SignInFutureResource {

return runAsyncResourceTask(this.#resource, async () => {
let identifier;
let generateSignature;
let generateSignature: GenerateSignature;
switch (provider) {
case 'metamask':
identifier = await web3().getMetamaskIdentifier();
Expand All@@ -979,6 +1011,16 @@ class SignInFuture implements SignInFutureResource {
identifier = await web3().getOKXWalletIdentifier();
generateSignature = web3().generateSignatureWithOKXWallet;
break;
case 'solana':
if (!params.walletName) {
throw new ClerkRuntimeError('Wallet name is required for Solana authentication.', {
code: 'web3_solana_wallet_name_required',
});
}
identifier = await web3().getSolanaIdentifier(params.walletName);
generateSignature = p =>
web3().generateSignatureWithSolana({ ...p, walletName: params.walletName as string });
break;
default:
throw new Error(`Unsupported Web3 provider: ${provider}`);
}
Expand All@@ -1004,7 +1046,12 @@ class SignInFuture implements SignInFutureResource {

let signature: string;
try {
signature = await generateSignature({ identifier, nonce: message });
signature = await generateSignature({
identifier,
nonce: message,
walletName: params?.walletName,
provider,
});
} catch (err) {
// There is a chance that as a user when you try to setup and use the Coinbase Wallet with an existing
// Passkey in order to authenticate, the initial generate signature request to be rejected. For this
Expand All@@ -1013,7 +1060,11 @@ class SignInFuture implements SignInFutureResource {
// error code 4001 means the user rejected the request
// Reference: https://docs.cdp.coinbase.com/wallet-sdk/docs/errors
if (provider === 'coinbase_wallet' && err.code === 4001) {
signature = await generateSignature({ identifier, nonce: message });
signature = await generateSignature({
identifier,
nonce: message,
provider,
});
} else {
throw err;
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' feat(clerk-js,react,localizations,shared,ui): Add Solana feature support to core 3 by kduprey · Pull Request #7450 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/afraid-apes-cough.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/shared': minor
---

Add Web3 Solana support to `<UserProfile />`
9 changes: 9 additions & 0 deletions .changeset/legal-jokes-beg.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/shared': minor
'@clerk/react': minor
'@clerk/ui': minor
---

Add support for Sign in with Solana.
Comment thread
coderabbitai[bot] marked this conversation as resolved.
4 changes: 2 additions & 2 deletions packages/clerk-js/bundle-check.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import path from 'node:path';
import { pipeline } from 'node:stream';
import zlib from 'node:zlib';

import { chromium } from 'playwright';
import { chromium } from '@playwright/test';

/**
* This script generates a CLI report detailing the gzipped size of JavaScript resources loaded by `clerk-js` for a
Expand DownExpand Up@@ -212,7 +212,7 @@ function report(url, responses) {

/**
* Loads the given `url` in `browser`, capturing all HTTP requests that occur.
* @param {import('playwright').Browser} browser
* @param {import('@playwright/test').Browser} browser
* @param {string} url
*/
async function getResponseSizes(browser, url) {
Expand Down
4 changes: 4 additions & 0 deletions packages/clerk-js/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,9 +62,13 @@
"@base-org/account": "catalog:module-manager",
"@clerk/shared": "workspace:^",
"@coinbase/wallet-sdk": "catalog:module-manager",
"@solana/wallet-adapter-base": "catalog:module-manager",
"@solana/wallet-adapter-react": "catalog:module-manager",
"@solana/wallet-standard": "catalog:module-manager",
"@stripe/stripe-js": "5.6.0",
"@swc/helpers": "^0.5.17",
"@tanstack/query-core": "5.87.4",
"@wallet-standard/core": "catalog:module-manager",
"@zxcvbn-ts/core": "catalog:module-manager",
"@zxcvbn-ts/language-common": "catalog:module-manager",
"alien-signals": "2.0.6",
Expand Down
15 changes: 14 additions & 1 deletion packages/clerk-js/rspack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,20 @@ const common = ({ mode, variant, disableRHC = false }) => {
},
defaultVendors: {
minChunks: 1,
test: /[\\/]node_modules[\\/]/,
test: module => {
if (!(module instanceof rspack.NormalModule) || !module.resource) {
return false;
}
// Exclude Solana packages and their known transitive dependencies
if (
/[\\/]node_modules[\\/](@solana|@solana-mobile|@wallet-standard|bn\.js|borsh|buffer|superstruct|bs58|jayson|rpc-websockets|qrcode)[\\/]/.test(
module.resource,
)
) {
return false;
}
return /[\\/]node_modules[\\/]/.test(module.resource);
},
name: 'vendors',
priority: -10,
},
Expand Down
26 changes: 23 additions & 3 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,6 +59,7 @@ import type {
AuthenticateWithGoogleOneTapParams,
AuthenticateWithMetamaskParams,
AuthenticateWithOKXWalletParams,
AuthenticateWithSolanaParams,
BillingNamespace,
CheckoutSignalValue,
Clerk as ClerkInterface,
Expand All@@ -74,7 +75,7 @@ import type {
EnvironmentJSON,
EnvironmentJSONSnapshot,
EnvironmentResource,
GenerateSignatureParams,
GenerateSignature,
GoogleOneTapProps,
HandleEmailLinkVerificationParams,
HandleOAuthCallbackParams,
Expand DownExpand Up@@ -2338,6 +2339,13 @@ export class Clerk implements ClerkInterface {
});
};

public authenticateWithSolana = async (props: AuthenticateWithSolanaParams): Promise<void> => {
await this.authenticateWithWeb3({
...props,
strategy: 'web3_solana_signature',
});
};

public authenticateWithWeb3 = async ({
redirectUrl,
signUpContinueUrl,
Expand All@@ -2346,6 +2354,7 @@ export class Clerk implements ClerkInterface {
strategy,
legalAccepted,
secondFactorUrl,
walletName,
}: ClerkAuthenticateWithWeb3Params): Promise<void> => {
if (!this.client || !this.environment) {
return;
Expand All@@ -2354,8 +2363,8 @@ export class Clerk implements ClerkInterface {
const { displayConfig } = this.environment;

const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider;
const identifier = await web3().getWeb3Identifier({ provider });
let generateSignature: (params: GenerateSignatureParams) => Promise<string>;
const identifier = await web3().getWeb3Identifier({ provider, walletName });
let generateSignature: GenerateSignature;
switch (provider) {
case 'metamask':
generateSignature = web3().generateSignatureWithMetamask;
Expand All@@ -2366,6 +2375,15 @@ export class Clerk implements ClerkInterface {
case 'coinbase_wallet':
generateSignature = web3().generateSignatureWithCoinbaseWallet;
break;
case 'solana':
if (!walletName) {
throw new ClerkRuntimeError('Wallet name is required for Solana authentication.', {
code: 'web3_solana_wallet_name_required',
});
}
// Solana requires walletName; bind it into the helper
generateSignature = params => web3().generateSignatureWithSolana({ ...params, walletName });
break;
default:
generateSignature = web3().generateSignatureWithOKXWallet;
break;
Expand DownExpand Up@@ -2395,6 +2413,7 @@ export class Clerk implements ClerkInterface {
identifier,
generateSignature,
strategy,
walletName,
});
} catch (err) {
if (isError(err, ERROR_CODES.FORM_IDENTIFIER_NOT_FOUND)) {
Expand All@@ -2404,6 +2423,7 @@ export class Clerk implements ClerkInterface {
unsafeMetadata,
strategy,
legalAccepted,
walletName,
});

if (
Expand Down
63 changes: 57 additions & 6 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ import type {
EmailLinkConfig,
EmailLinkFactor,
EnterpriseSSOConfig,
GenerateSignature,
PassKeyConfig,
PasskeyFactor,
PhoneCodeConfig,
Expand All@@ -32,6 +33,7 @@ import type {
ResetPasswordEmailCodeFactorConfig,
ResetPasswordParams,
ResetPasswordPhoneCodeFactorConfig,
SignInAuthenticateWithSolanaParams,
SignInCreateParams,
SignInFirstFactor,
SignInFutureBackupCodeVerifyParams,
Expand DownExpand Up@@ -202,6 +204,7 @@ export class SignIn extends BaseResource implements SignInResource {
case 'web3_base_signature':
case 'web3_coinbase_wallet_signature':
case 'web3_okx_wallet_signature':
case 'web3_solana_signature':
config = { web3WalletId: params.web3WalletId } as Web3SignatureConfig;
break;
case 'reset_password_phone_code':
Expand DownExpand Up@@ -363,13 +366,17 @@ export class SignIn extends BaseResource implements SignInResource {
};

public authenticateWithWeb3 = async (params: AuthenticateWithWeb3Params): Promise<SignInResource> => {
const { identifier, generateSignature, strategy = 'web3_metamask_signature' } = params || {};
const { identifier, generateSignature, strategy = 'web3_metamask_signature', walletName } = params || {};
const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider;

if (!(typeof generateSignature === 'function')) {
clerkMissingOptionError('generateSignature');
}

if (provider === 'solana' && !walletName) {
clerkMissingOptionError('walletName');
}

await this.create({ identifier });

const web3FirstFactor = this.supportedFirstFactors?.find(f => f.strategy === strategy) as Web3SignatureFactor;
Expand All@@ -387,7 +394,7 @@ export class SignIn extends BaseResource implements SignInResource {

let signature: string;
try {
signature = await generateSignature({ identifier, nonce: message, provider });
signature = await generateSignature({ identifier, nonce: message, walletName, provider });
} catch (err) {
// There is a chance that as a user when you try to setup and use the Coinbase Wallet with an existing
// Passkey in order to authenticate, the initial generate signature request to be rejected. For this
Expand All@@ -396,7 +403,7 @@ export class SignIn extends BaseResource implements SignInResource {
// error code 4001 means the user rejected the request
// Reference: https://docs.cdp.coinbase.com/wallet-sdk/docs/errors
if (provider === 'coinbase_wallet' && err.code === 4001) {
signature = await generateSignature({ identifier, nonce: message, provider });
signature = await generateSignature({ identifier, nonce: message, provider, walletName });
} else {
throw err;
}
Expand DownExpand Up@@ -444,6 +451,31 @@ export class SignIn extends BaseResource implements SignInResource {
});
};

/**
* Authenticates a user using a Solana Web3 wallet during sign-in.
*
* @param params - Configuration for Solana authentication
* @param params.walletName - The name of the Solana wallet to use for authentication
* @returns A promise that resolves to the updated SignIn resource
* @throws {ClerkRuntimeError} If walletName is not provided or wallet connection fails
*
* @example
* ```typescript
* await signIn.authenticateWithSolana({ walletName: 'phantom' });
* ```
*/
public authenticateWithSolana = async ({
walletName,
}: SignInAuthenticateWithSolanaParams): Promise<SignInResource> => {
const identifier = await web3().getSolanaIdentifier(walletName);
return this.authenticateWithWeb3({
identifier,
generateSignature: p => web3().generateSignatureWithSolana({ ...p, walletName: walletName }),
strategy: 'web3_solana_signature',
walletName: walletName,
});
};

public authenticateWithPasskey = async (params?: AuthenticateWithPasskeyParams): Promise<SignInResource> => {
const { flow } = params || {};

Expand DownExpand Up@@ -961,7 +993,7 @@ class SignInFuture implements SignInFutureResource {

return runAsyncResourceTask(this.#resource, async () => {
let identifier;
let generateSignature;
let generateSignature: GenerateSignature;
switch (provider) {
case 'metamask':
identifier = await web3().getMetamaskIdentifier();
Expand All@@ -979,6 +1011,16 @@ class SignInFuture implements SignInFutureResource {
identifier = await web3().getOKXWalletIdentifier();
generateSignature = web3().generateSignatureWithOKXWallet;
break;
case 'solana':
if (!params.walletName) {
throw new ClerkRuntimeError('Wallet name is required for Solana authentication.', {
code: 'web3_solana_wallet_name_required',
});
}
identifier = await web3().getSolanaIdentifier(params.walletName);
generateSignature = p =>
web3().generateSignatureWithSolana({ ...p, walletName: params.walletName as string });
break;
default:
throw new Error(`Unsupported Web3 provider: ${provider}`);
}
Expand All@@ -1004,7 +1046,12 @@ class SignInFuture implements SignInFutureResource {

let signature: string;
try {
signature = await generateSignature({ identifier, nonce: message });
signature = await generateSignature({
identifier,
nonce: message,
walletName: params?.walletName,
provider,
});
} catch (err) {
// There is a chance that as a user when you try to setup and use the Coinbase Wallet with an existing
// Passkey in order to authenticate, the initial generate signature request to be rejected. For this
Expand All@@ -1013,7 +1060,11 @@ class SignInFuture implements SignInFutureResource {
// error code 4001 means the user rejected the request
// Reference: https://docs.cdp.coinbase.com/wallet-sdk/docs/errors
if (provider === 'coinbase_wallet' && err.code === 4001) {
signature = await generateSignature({ identifier, nonce: message });
signature = await generateSignature({
identifier,
nonce: message,
provider,
});
} else {
throw err;
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(clerk-js,react,localizations,shared,ui): Add Solana feature support to core 3 by kduprey · Pull Request #7450 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/afraid-apes-cough.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/shared': minor
---

Add Web3 Solana support to `<UserProfile />`
9 changes: 9 additions & 0 deletions .changeset/legal-jokes-beg.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/shared': minor
'@clerk/react': minor
'@clerk/ui': minor
---

Add support for Sign in with Solana.
Comment thread
coderabbitai[bot] marked this conversation as resolved.
4 changes: 2 additions & 2 deletions packages/clerk-js/bundle-check.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import path from 'node:path';
import { pipeline } from 'node:stream';
import zlib from 'node:zlib';

import { chromium } from 'playwright';
import { chromium } from '@playwright/test';

/**
* This script generates a CLI report detailing the gzipped size of JavaScript resources loaded by `clerk-js` for a
Expand DownExpand Up@@ -212,7 +212,7 @@ function report(url, responses) {

/**
* Loads the given `url` in `browser`, capturing all HTTP requests that occur.
* @param {import('playwright').Browser} browser
* @param {import('@playwright/test').Browser} browser
* @param {string} url
*/
async function getResponseSizes(browser, url) {
Expand Down
4 changes: 4 additions & 0 deletions packages/clerk-js/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,9 +62,13 @@
"@base-org/account": "catalog:module-manager",
"@clerk/shared": "workspace:^",
"@coinbase/wallet-sdk": "catalog:module-manager",
"@solana/wallet-adapter-base": "catalog:module-manager",
"@solana/wallet-adapter-react": "catalog:module-manager",
"@solana/wallet-standard": "catalog:module-manager",
"@stripe/stripe-js": "5.6.0",
"@swc/helpers": "^0.5.17",
"@tanstack/query-core": "5.87.4",
"@wallet-standard/core": "catalog:module-manager",
"@zxcvbn-ts/core": "catalog:module-manager",
"@zxcvbn-ts/language-common": "catalog:module-manager",
"alien-signals": "2.0.6",
Expand Down
15 changes: 14 additions & 1 deletion packages/clerk-js/rspack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,20 @@ const common = ({ mode, variant, disableRHC = false }) => {
},
defaultVendors: {
minChunks: 1,
test: /[\\/]node_modules[\\/]/,
test: module => {
if (!(module instanceof rspack.NormalModule) || !module.resource) {
return false;
}
// Exclude Solana packages and their known transitive dependencies
if (
/[\\/]node_modules[\\/](@solana|@solana-mobile|@wallet-standard|bn\.js|borsh|buffer|superstruct|bs58|jayson|rpc-websockets|qrcode)[\\/]/.test(
module.resource,
)
) {
return false;
}
return /[\\/]node_modules[\\/]/.test(module.resource);
},
name: 'vendors',
priority: -10,
},
Expand Down
26 changes: 23 additions & 3 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,6 +59,7 @@ import type {
AuthenticateWithGoogleOneTapParams,
AuthenticateWithMetamaskParams,
AuthenticateWithOKXWalletParams,
AuthenticateWithSolanaParams,
BillingNamespace,
CheckoutSignalValue,
Clerk as ClerkInterface,
Expand All@@ -74,7 +75,7 @@ import type {
EnvironmentJSON,
EnvironmentJSONSnapshot,
EnvironmentResource,
GenerateSignatureParams,
GenerateSignature,
GoogleOneTapProps,
HandleEmailLinkVerificationParams,
HandleOAuthCallbackParams,
Expand DownExpand Up@@ -2338,6 +2339,13 @@ export class Clerk implements ClerkInterface {
});
};

public authenticateWithSolana = async (props: AuthenticateWithSolanaParams): Promise<void> => {
await this.authenticateWithWeb3({
...props,
strategy: 'web3_solana_signature',
});
};

public authenticateWithWeb3 = async ({
redirectUrl,
signUpContinueUrl,
Expand All@@ -2346,6 +2354,7 @@ export class Clerk implements ClerkInterface {
strategy,
legalAccepted,
secondFactorUrl,
walletName,
}: ClerkAuthenticateWithWeb3Params): Promise<void> => {
if (!this.client || !this.environment) {
return;
Expand All@@ -2354,8 +2363,8 @@ export class Clerk implements ClerkInterface {
const { displayConfig } = this.environment;

const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider;
const identifier = await web3().getWeb3Identifier({ provider });
let generateSignature: (params: GenerateSignatureParams) => Promise<string>;
const identifier = await web3().getWeb3Identifier({ provider, walletName });
let generateSignature: GenerateSignature;
switch (provider) {
case 'metamask':
generateSignature = web3().generateSignatureWithMetamask;
Expand All@@ -2366,6 +2375,15 @@ export class Clerk implements ClerkInterface {
case 'coinbase_wallet':
generateSignature = web3().generateSignatureWithCoinbaseWallet;
break;
case 'solana':
if (!walletName) {
throw new ClerkRuntimeError('Wallet name is required for Solana authentication.', {
code: 'web3_solana_wallet_name_required',
});
}
// Solana requires walletName; bind it into the helper
generateSignature = params => web3().generateSignatureWithSolana({ ...params, walletName });
break;
default:
generateSignature = web3().generateSignatureWithOKXWallet;
break;
Expand DownExpand Up@@ -2395,6 +2413,7 @@ export class Clerk implements ClerkInterface {
identifier,
generateSignature,
strategy,
walletName,
});
} catch (err) {
if (isError(err, ERROR_CODES.FORM_IDENTIFIER_NOT_FOUND)) {
Expand All@@ -2404,6 +2423,7 @@ export class Clerk implements ClerkInterface {
unsafeMetadata,
strategy,
legalAccepted,
walletName,
});

if (
Expand Down
63 changes: 57 additions & 6 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ import type {
EmailLinkConfig,
EmailLinkFactor,
EnterpriseSSOConfig,
GenerateSignature,
PassKeyConfig,
PasskeyFactor,
PhoneCodeConfig,
Expand All@@ -32,6 +33,7 @@ import type {
ResetPasswordEmailCodeFactorConfig,
ResetPasswordParams,
ResetPasswordPhoneCodeFactorConfig,
SignInAuthenticateWithSolanaParams,
SignInCreateParams,
SignInFirstFactor,
SignInFutureBackupCodeVerifyParams,
Expand DownExpand Up@@ -202,6 +204,7 @@ export class SignIn extends BaseResource implements SignInResource {
case 'web3_base_signature':
case 'web3_coinbase_wallet_signature':
case 'web3_okx_wallet_signature':
case 'web3_solana_signature':
config = { web3WalletId: params.web3WalletId } as Web3SignatureConfig;
break;
case 'reset_password_phone_code':
Expand DownExpand Up@@ -363,13 +366,17 @@ export class SignIn extends BaseResource implements SignInResource {
};

public authenticateWithWeb3 = async (params: AuthenticateWithWeb3Params): Promise<SignInResource> => {
const { identifier, generateSignature, strategy = 'web3_metamask_signature' } = params || {};
const { identifier, generateSignature, strategy = 'web3_metamask_signature', walletName } = params || {};
const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider;

if (!(typeof generateSignature === 'function')) {
clerkMissingOptionError('generateSignature');
}

if (provider === 'solana' && !walletName) {
clerkMissingOptionError('walletName');
}

await this.create({ identifier });

const web3FirstFactor = this.supportedFirstFactors?.find(f => f.strategy === strategy) as Web3SignatureFactor;
Expand All@@ -387,7 +394,7 @@ export class SignIn extends BaseResource implements SignInResource {

let signature: string;
try {
signature = await generateSignature({ identifier, nonce: message, provider });
signature = await generateSignature({ identifier, nonce: message, walletName, provider });
} catch (err) {
// There is a chance that as a user when you try to setup and use the Coinbase Wallet with an existing
// Passkey in order to authenticate, the initial generate signature request to be rejected. For this
Expand All@@ -396,7 +403,7 @@ export class SignIn extends BaseResource implements SignInResource {
// error code 4001 means the user rejected the request
// Reference: https://docs.cdp.coinbase.com/wallet-sdk/docs/errors
if (provider === 'coinbase_wallet' && err.code === 4001) {
signature = await generateSignature({ identifier, nonce: message, provider });
signature = await generateSignature({ identifier, nonce: message, provider, walletName });
} else {
throw err;
}
Expand DownExpand Up@@ -444,6 +451,31 @@ export class SignIn extends BaseResource implements SignInResource {
});
};

/**
* Authenticates a user using a Solana Web3 wallet during sign-in.
*
* @param params - Configuration for Solana authentication
* @param params.walletName - The name of the Solana wallet to use for authentication
* @returns A promise that resolves to the updated SignIn resource
* @throws {ClerkRuntimeError} If walletName is not provided or wallet connection fails
*
* @example
* ```typescript
* await signIn.authenticateWithSolana({ walletName: 'phantom' });
* ```
*/
public authenticateWithSolana = async ({
walletName,
}: SignInAuthenticateWithSolanaParams): Promise<SignInResource> => {
const identifier = await web3().getSolanaIdentifier(walletName);
return this.authenticateWithWeb3({
identifier,
generateSignature: p => web3().generateSignatureWithSolana({ ...p, walletName: walletName }),
strategy: 'web3_solana_signature',
walletName: walletName,
});
};

public authenticateWithPasskey = async (params?: AuthenticateWithPasskeyParams): Promise<SignInResource> => {
const { flow } = params || {};

Expand DownExpand Up@@ -961,7 +993,7 @@ class SignInFuture implements SignInFutureResource {

return runAsyncResourceTask(this.#resource, async () => {
let identifier;
let generateSignature;
let generateSignature: GenerateSignature;
switch (provider) {
case 'metamask':
identifier = await web3().getMetamaskIdentifier();
Expand All@@ -979,6 +1011,16 @@ class SignInFuture implements SignInFutureResource {
identifier = await web3().getOKXWalletIdentifier();
generateSignature = web3().generateSignatureWithOKXWallet;
break;
case 'solana':
if (!params.walletName) {
throw new ClerkRuntimeError('Wallet name is required for Solana authentication.', {
code: 'web3_solana_wallet_name_required',
});
}
identifier = await web3().getSolanaIdentifier(params.walletName);
generateSignature = p =>
web3().generateSignatureWithSolana({ ...p, walletName: params.walletName as string });
break;
default:
throw new Error(`Unsupported Web3 provider: ${provider}`);
}
Expand All@@ -1004,7 +1046,12 @@ class SignInFuture implements SignInFutureResource {

let signature: string;
try {
signature = await generateSignature({ identifier, nonce: message });
signature = await generateSignature({
identifier,
nonce: message,
walletName: params?.walletName,
provider,
});
} catch (err) {
// There is a chance that as a user when you try to setup and use the Coinbase Wallet with an existing
// Passkey in order to authenticate, the initial generate signature request to be rejected. For this
Expand All@@ -1013,7 +1060,11 @@ class SignInFuture implements SignInFutureResource {
// error code 4001 means the user rejected the request
// Reference: https://docs.cdp.coinbase.com/wallet-sdk/docs/errors
if (provider === 'coinbase_wallet' && err.code === 4001) {
signature = await generateSignature({ identifier, nonce: message });
signature = await generateSignature({
identifier,
nonce: message,
provider,
});
} else {
throw err;
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(clerk-js,react,localizations,shared,ui): Add Solana feature support to core 3 by kduprey · Pull Request #7450 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/afraid-apes-cough.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/shared': minor
---

Add Web3 Solana support to `<UserProfile />`
9 changes: 9 additions & 0 deletions .changeset/legal-jokes-beg.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/shared': minor
'@clerk/react': minor
'@clerk/ui': minor
---

Add support for Sign in with Solana.
Comment thread
coderabbitai[bot] marked this conversation as resolved.
4 changes: 2 additions & 2 deletions packages/clerk-js/bundle-check.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import path from 'node:path';
import { pipeline } from 'node:stream';
import zlib from 'node:zlib';

import { chromium } from 'playwright';
import { chromium } from '@playwright/test';

/**
* This script generates a CLI report detailing the gzipped size of JavaScript resources loaded by `clerk-js` for a
Expand DownExpand Up@@ -212,7 +212,7 @@ function report(url, responses) {

/**
* Loads the given `url` in `browser`, capturing all HTTP requests that occur.
* @param {import('playwright').Browser} browser
* @param {import('@playwright/test').Browser} browser
* @param {string} url
*/
async function getResponseSizes(browser, url) {
Expand Down
4 changes: 4 additions & 0 deletions packages/clerk-js/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,9 +62,13 @@
"@base-org/account": "catalog:module-manager",
"@clerk/shared": "workspace:^",
"@coinbase/wallet-sdk": "catalog:module-manager",
"@solana/wallet-adapter-base": "catalog:module-manager",
"@solana/wallet-adapter-react": "catalog:module-manager",
"@solana/wallet-standard": "catalog:module-manager",
"@stripe/stripe-js": "5.6.0",
"@swc/helpers": "^0.5.17",
"@tanstack/query-core": "5.87.4",
"@wallet-standard/core": "catalog:module-manager",
"@zxcvbn-ts/core": "catalog:module-manager",
"@zxcvbn-ts/language-common": "catalog:module-manager",
"alien-signals": "2.0.6",
Expand Down
15 changes: 14 additions & 1 deletion packages/clerk-js/rspack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,20 @@ const common = ({ mode, variant, disableRHC = false }) => {
},
defaultVendors: {
minChunks: 1,
test: /[\\/]node_modules[\\/]/,
test: module => {
if (!(module instanceof rspack.NormalModule) || !module.resource) {
return false;
}
// Exclude Solana packages and their known transitive dependencies
if (
/[\\/]node_modules[\\/](@solana|@solana-mobile|@wallet-standard|bn\.js|borsh|buffer|superstruct|bs58|jayson|rpc-websockets|qrcode)[\\/]/.test(
module.resource,
)
) {
return false;
}
return /[\\/]node_modules[\\/]/.test(module.resource);
},
name: 'vendors',
priority: -10,
},
Expand Down
26 changes: 23 additions & 3 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,6 +59,7 @@ import type {
AuthenticateWithGoogleOneTapParams,
AuthenticateWithMetamaskParams,
AuthenticateWithOKXWalletParams,
AuthenticateWithSolanaParams,
BillingNamespace,
CheckoutSignalValue,
Clerk as ClerkInterface,
Expand All@@ -74,7 +75,7 @@ import type {
EnvironmentJSON,
EnvironmentJSONSnapshot,
EnvironmentResource,
GenerateSignatureParams,
GenerateSignature,
GoogleOneTapProps,
HandleEmailLinkVerificationParams,
HandleOAuthCallbackParams,
Expand DownExpand Up@@ -2338,6 +2339,13 @@ export class Clerk implements ClerkInterface {
});
};

public authenticateWithSolana = async (props: AuthenticateWithSolanaParams): Promise<void> => {
await this.authenticateWithWeb3({
...props,
strategy: 'web3_solana_signature',
});
};

public authenticateWithWeb3 = async ({
redirectUrl,
signUpContinueUrl,
Expand All@@ -2346,6 +2354,7 @@ export class Clerk implements ClerkInterface {
strategy,
legalAccepted,
secondFactorUrl,
walletName,
}: ClerkAuthenticateWithWeb3Params): Promise<void> => {
if (!this.client || !this.environment) {
return;
Expand All@@ -2354,8 +2363,8 @@ export class Clerk implements ClerkInterface {
const { displayConfig } = this.environment;

const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider;
const identifier = await web3().getWeb3Identifier({ provider });
let generateSignature: (params: GenerateSignatureParams) => Promise<string>;
const identifier = await web3().getWeb3Identifier({ provider, walletName });
let generateSignature: GenerateSignature;
switch (provider) {
case 'metamask':
generateSignature = web3().generateSignatureWithMetamask;
Expand All@@ -2366,6 +2375,15 @@ export class Clerk implements ClerkInterface {
case 'coinbase_wallet':
generateSignature = web3().generateSignatureWithCoinbaseWallet;
break;
case 'solana':
if (!walletName) {
throw new ClerkRuntimeError('Wallet name is required for Solana authentication.', {
code: 'web3_solana_wallet_name_required',
});
}
// Solana requires walletName; bind it into the helper
generateSignature = params => web3().generateSignatureWithSolana({ ...params, walletName });
break;
default:
generateSignature = web3().generateSignatureWithOKXWallet;
break;
Expand DownExpand Up@@ -2395,6 +2413,7 @@ export class Clerk implements ClerkInterface {
identifier,
generateSignature,
strategy,
walletName,
});
} catch (err) {
if (isError(err, ERROR_CODES.FORM_IDENTIFIER_NOT_FOUND)) {
Expand All@@ -2404,6 +2423,7 @@ export class Clerk implements ClerkInterface {
unsafeMetadata,
strategy,
legalAccepted,
walletName,
});

if (
Expand Down
63 changes: 57 additions & 6 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ import type {
EmailLinkConfig,
EmailLinkFactor,
EnterpriseSSOConfig,
GenerateSignature,
PassKeyConfig,
PasskeyFactor,
PhoneCodeConfig,
Expand All@@ -32,6 +33,7 @@ import type {
ResetPasswordEmailCodeFactorConfig,
ResetPasswordParams,
ResetPasswordPhoneCodeFactorConfig,
SignInAuthenticateWithSolanaParams,
SignInCreateParams,
SignInFirstFactor,
SignInFutureBackupCodeVerifyParams,
Expand DownExpand Up@@ -202,6 +204,7 @@ export class SignIn extends BaseResource implements SignInResource {
case 'web3_base_signature':
case 'web3_coinbase_wallet_signature':
case 'web3_okx_wallet_signature':
case 'web3_solana_signature':
config = { web3WalletId: params.web3WalletId } as Web3SignatureConfig;
break;
case 'reset_password_phone_code':
Expand DownExpand Up@@ -363,13 +366,17 @@ export class SignIn extends BaseResource implements SignInResource {
};

public authenticateWithWeb3 = async (params: AuthenticateWithWeb3Params): Promise<SignInResource> => {
const { identifier, generateSignature, strategy = 'web3_metamask_signature' } = params || {};
const { identifier, generateSignature, strategy = 'web3_metamask_signature', walletName } = params || {};
const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider;

if (!(typeof generateSignature === 'function')) {
clerkMissingOptionError('generateSignature');
}

if (provider === 'solana' && !walletName) {
clerkMissingOptionError('walletName');
}

await this.create({ identifier });

const web3FirstFactor = this.supportedFirstFactors?.find(f => f.strategy === strategy) as Web3SignatureFactor;
Expand All@@ -387,7 +394,7 @@ export class SignIn extends BaseResource implements SignInResource {

let signature: string;
try {
signature = await generateSignature({ identifier, nonce: message, provider });
signature = await generateSignature({ identifier, nonce: message, walletName, provider });
} catch (err) {
// There is a chance that as a user when you try to setup and use the Coinbase Wallet with an existing
// Passkey in order to authenticate, the initial generate signature request to be rejected. For this
Expand All@@ -396,7 +403,7 @@ export class SignIn extends BaseResource implements SignInResource {
// error code 4001 means the user rejected the request
// Reference: https://docs.cdp.coinbase.com/wallet-sdk/docs/errors
if (provider === 'coinbase_wallet' && err.code === 4001) {
signature = await generateSignature({ identifier, nonce: message, provider });
signature = await generateSignature({ identifier, nonce: message, provider, walletName });
} else {
throw err;
}
Expand DownExpand Up@@ -444,6 +451,31 @@ export class SignIn extends BaseResource implements SignInResource {
});
};

/**
* Authenticates a user using a Solana Web3 wallet during sign-in.
*
* @param params - Configuration for Solana authentication
* @param params.walletName - The name of the Solana wallet to use for authentication
* @returns A promise that resolves to the updated SignIn resource
* @throws {ClerkRuntimeError} If walletName is not provided or wallet connection fails
*
* @example
* ```typescript
* await signIn.authenticateWithSolana({ walletName: 'phantom' });
* ```
*/
public authenticateWithSolana = async ({
walletName,
}: SignInAuthenticateWithSolanaParams): Promise<SignInResource> => {
const identifier = await web3().getSolanaIdentifier(walletName);
return this.authenticateWithWeb3({
identifier,
generateSignature: p => web3().generateSignatureWithSolana({ ...p, walletName: walletName }),
strategy: 'web3_solana_signature',
walletName: walletName,
});
};

public authenticateWithPasskey = async (params?: AuthenticateWithPasskeyParams): Promise<SignInResource> => {
const { flow } = params || {};

Expand DownExpand Up@@ -961,7 +993,7 @@ class SignInFuture implements SignInFutureResource {

return runAsyncResourceTask(this.#resource, async () => {
let identifier;
let generateSignature;
let generateSignature: GenerateSignature;
switch (provider) {
case 'metamask':
identifier = await web3().getMetamaskIdentifier();
Expand All@@ -979,6 +1011,16 @@ class SignInFuture implements SignInFutureResource {
identifier = await web3().getOKXWalletIdentifier();
generateSignature = web3().generateSignatureWithOKXWallet;
break;
case 'solana':
if (!params.walletName) {
throw new ClerkRuntimeError('Wallet name is required for Solana authentication.', {
code: 'web3_solana_wallet_name_required',
});
}
identifier = await web3().getSolanaIdentifier(params.walletName);
generateSignature = p =>
web3().generateSignatureWithSolana({ ...p, walletName: params.walletName as string });
break;
default:
throw new Error(`Unsupported Web3 provider: ${provider}`);
}
Expand All@@ -1004,7 +1046,12 @@ class SignInFuture implements SignInFutureResource {

let signature: string;
try {
signature = await generateSignature({ identifier, nonce: message });
signature = await generateSignature({
identifier,
nonce: message,
walletName: params?.walletName,
provider,
});
} catch (err) {
// There is a chance that as a user when you try to setup and use the Coinbase Wallet with an existing
// Passkey in order to authenticate, the initial generate signature request to be rejected. For this
Expand All@@ -1013,7 +1060,11 @@ class SignInFuture implements SignInFutureResource {
// error code 4001 means the user rejected the request
// Reference: https://docs.cdp.coinbase.com/wallet-sdk/docs/errors
if (provider === 'coinbase_wallet' && err.code === 4001) {
signature = await generateSignature({ identifier, nonce: message });
signature = await generateSignature({
identifier,
nonce: message,
provider,
});
} else {
throw err;
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); feat(clerk-js,react,localizations,shared,ui): Add Solana feature support to core 3 by kduprey · Pull Request #7450 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/afraid-apes-cough.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/shared': minor
---

Add Web3 Solana support to `<UserProfile />`
9 changes: 9 additions & 0 deletions .changeset/legal-jokes-beg.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
---
'@clerk/localizations': minor
'@clerk/clerk-js': minor
'@clerk/shared': minor
'@clerk/react': minor
'@clerk/ui': minor
---

Add support for Sign in with Solana.
Comment thread
coderabbitai[bot] marked this conversation as resolved.
4 changes: 2 additions & 2 deletions packages/clerk-js/bundle-check.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import path from 'node:path';
import { pipeline } from 'node:stream';
import zlib from 'node:zlib';

import { chromium } from 'playwright';
import { chromium } from '@playwright/test';

/**
* This script generates a CLI report detailing the gzipped size of JavaScript resources loaded by `clerk-js` for a
Expand DownExpand Up@@ -212,7 +212,7 @@ function report(url, responses) {

/**
* Loads the given `url` in `browser`, capturing all HTTP requests that occur.
* @param {import('playwright').Browser} browser
* @param {import('@playwright/test').Browser} browser
* @param {string} url
*/
async function getResponseSizes(browser, url) {
Expand Down
4 changes: 4 additions & 0 deletions packages/clerk-js/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,9 +62,13 @@
"@base-org/account": "catalog:module-manager",
"@clerk/shared": "workspace:^",
"@coinbase/wallet-sdk": "catalog:module-manager",
"@solana/wallet-adapter-base": "catalog:module-manager",
"@solana/wallet-adapter-react": "catalog:module-manager",
"@solana/wallet-standard": "catalog:module-manager",
"@stripe/stripe-js": "5.6.0",
"@swc/helpers": "^0.5.17",
"@tanstack/query-core": "5.87.4",
"@wallet-standard/core": "catalog:module-manager",
"@zxcvbn-ts/core": "catalog:module-manager",
"@zxcvbn-ts/language-common": "catalog:module-manager",
"alien-signals": "2.0.6",
Expand Down
15 changes: 14 additions & 1 deletion packages/clerk-js/rspack.config.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,7 +123,20 @@ const common = ({ mode, variant, disableRHC = false }) => {
},
defaultVendors: {
minChunks: 1,
test: /[\\/]node_modules[\\/]/,
test: module => {
if (!(module instanceof rspack.NormalModule) || !module.resource) {
return false;
}
// Exclude Solana packages and their known transitive dependencies
if (
/[\\/]node_modules[\\/](@solana|@solana-mobile|@wallet-standard|bn\.js|borsh|buffer|superstruct|bs58|jayson|rpc-websockets|qrcode)[\\/]/.test(
module.resource,
)
) {
return false;
}
return /[\\/]node_modules[\\/]/.test(module.resource);
},
name: 'vendors',
priority: -10,
},
Expand Down
26 changes: 23 additions & 3 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,6 +59,7 @@ import type {
AuthenticateWithGoogleOneTapParams,
AuthenticateWithMetamaskParams,
AuthenticateWithOKXWalletParams,
AuthenticateWithSolanaParams,
BillingNamespace,
CheckoutSignalValue,
Clerk as ClerkInterface,
Expand All@@ -74,7 +75,7 @@ import type {
EnvironmentJSON,
EnvironmentJSONSnapshot,
EnvironmentResource,
GenerateSignatureParams,
GenerateSignature,
GoogleOneTapProps,
HandleEmailLinkVerificationParams,
HandleOAuthCallbackParams,
Expand DownExpand Up@@ -2338,6 +2339,13 @@ export class Clerk implements ClerkInterface {
});
};

public authenticateWithSolana = async (props: AuthenticateWithSolanaParams): Promise<void> => {
await this.authenticateWithWeb3({
...props,
strategy: 'web3_solana_signature',
});
};

public authenticateWithWeb3 = async ({
redirectUrl,
signUpContinueUrl,
Expand All@@ -2346,6 +2354,7 @@ export class Clerk implements ClerkInterface {
strategy,
legalAccepted,
secondFactorUrl,
walletName,
}: ClerkAuthenticateWithWeb3Params): Promise<void> => {
if (!this.client || !this.environment) {
return;
Expand All@@ -2354,8 +2363,8 @@ export class Clerk implements ClerkInterface {
const { displayConfig } = this.environment;

const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider;
const identifier = await web3().getWeb3Identifier({ provider });
let generateSignature: (params: GenerateSignatureParams) => Promise<string>;
const identifier = await web3().getWeb3Identifier({ provider, walletName });
let generateSignature: GenerateSignature;
switch (provider) {
case 'metamask':
generateSignature = web3().generateSignatureWithMetamask;
Expand All@@ -2366,6 +2375,15 @@ export class Clerk implements ClerkInterface {
case 'coinbase_wallet':
generateSignature = web3().generateSignatureWithCoinbaseWallet;
break;
case 'solana':
if (!walletName) {
throw new ClerkRuntimeError('Wallet name is required for Solana authentication.', {
code: 'web3_solana_wallet_name_required',
});
}
// Solana requires walletName; bind it into the helper
generateSignature = params => web3().generateSignatureWithSolana({ ...params, walletName });
break;
default:
generateSignature = web3().generateSignatureWithOKXWallet;
break;
Expand DownExpand Up@@ -2395,6 +2413,7 @@ export class Clerk implements ClerkInterface {
identifier,
generateSignature,
strategy,
walletName,
});
} catch (err) {
if (isError(err, ERROR_CODES.FORM_IDENTIFIER_NOT_FOUND)) {
Expand All@@ -2404,6 +2423,7 @@ export class Clerk implements ClerkInterface {
unsafeMetadata,
strategy,
legalAccepted,
walletName,
});

if (
Expand Down
63 changes: 57 additions & 6 deletions packages/clerk-js/src/core/resources/SignIn.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ import type {
EmailLinkConfig,
EmailLinkFactor,
EnterpriseSSOConfig,
GenerateSignature,
PassKeyConfig,
PasskeyFactor,
PhoneCodeConfig,
Expand All@@ -32,6 +33,7 @@ import type {
ResetPasswordEmailCodeFactorConfig,
ResetPasswordParams,
ResetPasswordPhoneCodeFactorConfig,
SignInAuthenticateWithSolanaParams,
SignInCreateParams,
SignInFirstFactor,
SignInFutureBackupCodeVerifyParams,
Expand DownExpand Up@@ -202,6 +204,7 @@ export class SignIn extends BaseResource implements SignInResource {
case 'web3_base_signature':
case 'web3_coinbase_wallet_signature':
case 'web3_okx_wallet_signature':
case 'web3_solana_signature':
config = { web3WalletId: params.web3WalletId } as Web3SignatureConfig;
break;
case 'reset_password_phone_code':
Expand DownExpand Up@@ -363,13 +366,17 @@ export class SignIn extends BaseResource implements SignInResource {
};

public authenticateWithWeb3 = async (params: AuthenticateWithWeb3Params): Promise<SignInResource> => {
const { identifier, generateSignature, strategy = 'web3_metamask_signature' } = params || {};
const { identifier, generateSignature, strategy = 'web3_metamask_signature', walletName } = params || {};
const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider;

if (!(typeof generateSignature === 'function')) {
clerkMissingOptionError('generateSignature');
}

if (provider === 'solana' && !walletName) {
clerkMissingOptionError('walletName');
}

await this.create({ identifier });

const web3FirstFactor = this.supportedFirstFactors?.find(f => f.strategy === strategy) as Web3SignatureFactor;
Expand All@@ -387,7 +394,7 @@ export class SignIn extends BaseResource implements SignInResource {

let signature: string;
try {
signature = await generateSignature({ identifier, nonce: message, provider });
signature = await generateSignature({ identifier, nonce: message, walletName, provider });
} catch (err) {
// There is a chance that as a user when you try to setup and use the Coinbase Wallet with an existing
// Passkey in order to authenticate, the initial generate signature request to be rejected. For this
Expand All@@ -396,7 +403,7 @@ export class SignIn extends BaseResource implements SignInResource {
// error code 4001 means the user rejected the request
// Reference: https://docs.cdp.coinbase.com/wallet-sdk/docs/errors
if (provider === 'coinbase_wallet' && err.code === 4001) {
signature = await generateSignature({ identifier, nonce: message, provider });
signature = await generateSignature({ identifier, nonce: message, provider, walletName });
} else {
throw err;
}
Expand DownExpand Up@@ -444,6 +451,31 @@ export class SignIn extends BaseResource implements SignInResource {
});
};

/**
* Authenticates a user using a Solana Web3 wallet during sign-in.
*
* @param params - Configuration for Solana authentication
* @param params.walletName - The name of the Solana wallet to use for authentication
* @returns A promise that resolves to the updated SignIn resource
* @throws {ClerkRuntimeError} If walletName is not provided or wallet connection fails
*
* @example
* ```typescript
* await signIn.authenticateWithSolana({ walletName: 'phantom' });
* ```
*/
public authenticateWithSolana = async ({
walletName,
}: SignInAuthenticateWithSolanaParams): Promise<SignInResource> => {
const identifier = await web3().getSolanaIdentifier(walletName);
return this.authenticateWithWeb3({
identifier,
generateSignature: p => web3().generateSignatureWithSolana({ ...p, walletName: walletName }),
strategy: 'web3_solana_signature',
walletName: walletName,
});
};

public authenticateWithPasskey = async (params?: AuthenticateWithPasskeyParams): Promise<SignInResource> => {
const { flow } = params || {};

Expand DownExpand Up@@ -961,7 +993,7 @@ class SignInFuture implements SignInFutureResource {

return runAsyncResourceTask(this.#resource, async () => {
let identifier;
let generateSignature;
let generateSignature: GenerateSignature;
switch (provider) {
case 'metamask':
identifier = await web3().getMetamaskIdentifier();
Expand All@@ -979,6 +1011,16 @@ class SignInFuture implements SignInFutureResource {
identifier = await web3().getOKXWalletIdentifier();
generateSignature = web3().generateSignatureWithOKXWallet;
break;
case 'solana':
if (!params.walletName) {
throw new ClerkRuntimeError('Wallet name is required for Solana authentication.', {
code: 'web3_solana_wallet_name_required',
});
}
identifier = await web3().getSolanaIdentifier(params.walletName);
generateSignature = p =>
web3().generateSignatureWithSolana({ ...p, walletName: params.walletName as string });
break;
default:
throw new Error(`Unsupported Web3 provider: ${provider}`);
}
Expand All@@ -1004,7 +1046,12 @@ class SignInFuture implements SignInFutureResource {

let signature: string;
try {
signature = await generateSignature({ identifier, nonce: message });
signature = await generateSignature({
identifier,
nonce: message,
walletName: params?.walletName,
provider,
});
} catch (err) {
// There is a chance that as a user when you try to setup and use the Coinbase Wallet with an existing
// Passkey in order to authenticate, the initial generate signature request to be rejected. For this
Expand All@@ -1013,7 +1060,11 @@ class SignInFuture implements SignInFutureResource {
// error code 4001 means the user rejected the request
// Reference: https://docs.cdp.coinbase.com/wallet-sdk/docs/errors
if (provider === 'coinbase_wallet' && err.code === 4001) {
signature = await generateSignature({ identifier, nonce: message });
signature = await generateSignature({
identifier,
nonce: message,
provider,
});
} else {
throw err;
}
Expand Down
Loading