fix(clerk-js): require wallet name for Solana authentication and improve error handling

Signed-off-by: Kenton Duprey <kenton@clerk.dev>

Author: kduprey

packages/clerk-js/src/core/clerk.ts

@@ -2294,7 +2294,13 @@ export class Clerk implements ClerkInterface {
         generateSignature = generateSignatureWithCoinbaseWallet;
         break;
       case 'solana':
-        generateSignature = generateSignatureWithSolana;
+        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 => generateSignatureWithSolana({ ...params, walletName });
         break;
       default:
         generateSignature = generateSignatureWithOKXWallet;

packages/clerk-js/src/core/resources/SignIn.ts

@@ -473,7 +473,7 @@ export class SignIn extends BaseResource implements SignInResource {
     const identifier = await getSolanaIdentifier(params.walletName);
     return this.authenticateWithWeb3({
       identifier,
-      generateSignature: generateSignatureWithSolana,
+      generateSignature: p => generateSignatureWithSolana({ ...p, walletName: params.walletName }),
       strategy: 'web3_solana_signature',
       walletName: params.walletName,
     });
@@ -1006,8 +1006,13 @@ class SignInFuture implements SignInFutureResource {
           generateSignature = 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 getSolanaIdentifier(params.walletName);
-          generateSignature = generateSignatureWithSolana;
+          generateSignature = p => generateSignatureWithSolana({ ...p, walletName: params.walletName as string });
           break;
         default:
           throw new Error(`Unsupported Web3 provider: ${provider}`);

packages/clerk-js/src/core/resources/SignUp.ts

@@ -388,7 +388,7 @@ export class SignUp extends BaseResource implements SignUpResource {
     const identifier = await getSolanaIdentifier(params.walletName);
     return this.authenticateWithWeb3({
       identifier,
-      generateSignature: generateSignatureWithSolana,
+      generateSignature: p => generateSignatureWithSolana({ ...p, walletName: params.walletName }),
       unsafeMetadata: params?.unsafeMetadata,
       strategy: 'web3_solana_signature',
       legalAccepted: params?.legalAccepted,

packages/clerk-js/src/utils/web3.ts

@@ -98,10 +98,7 @@ export async function getBaseIdentifier(): Promise<string> {
   return await getWeb3Identifier({ provider: 'base' });
 }
 
-export async function getSolanaIdentifier(walletName?: string): Promise<string> {
-  if (!walletName) {
-    throw new Error('walletName is required for solana web3 authentication');
-  }
+export async function getSolanaIdentifier(walletName: string): Promise<string> {
   return await getWeb3Identifier({ provider: 'solana', walletName });
 }
 
@@ -110,6 +107,10 @@ type GenerateSignatureParams = {
   nonce: string;
 };
 
+type GenerateSolanaSignatureParams = GenerateSignatureParams & {
+  walletName: string;
+};
+
 export async function generateSignatureWithMetamask(params: GenerateSignatureParams): Promise<string> {
   return await generateWeb3Signature({ ...params, provider: 'metamask' });
 }
@@ -126,7 +127,7 @@ export async function generateSignatureWithBase(params: GenerateSignatureParams)
   return await generateWeb3Signature({ ...params, provider: 'base' });
 }
 
-export async function generateSignatureWithSolana(params: GenerateSignatureParams): Promise<string> {
+export async function generateSignatureWithSolana(params: GenerateSolanaSignatureParams): Promise<string> {
   return await generateWeb3Signature({ ...params, provider: 'solana' });
 }