wip: feat(clerk-js): enforce required walletName parameter for Solana authentication methods

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

Author: kduprey

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

@@ -49,7 +49,7 @@ import type {
   EnvironmentJSON,
   EnvironmentJSONSnapshot,
   EnvironmentResource,
-  GenerateSignatureParams,
+  GenerateSignature,
   GoogleOneTapProps,
   HandleEmailLinkVerificationParams,
   HandleOAuthCallbackParams,
@@ -2257,7 +2257,7 @@ export class Clerk implements ClerkInterface {
     });
   };
 
-  public authenticateWithSolana = async (props: AuthenticateWithSolanaParams = {}): Promise<void> => {
+  public authenticateWithSolana = async (props: AuthenticateWithSolanaParams): Promise<void> => {
     await this.authenticateWithWeb3({
       ...props,
       strategy: 'web3_solana_signature',
@@ -2282,7 +2282,7 @@ export class Clerk implements ClerkInterface {
 
     const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider;
     const identifier = await getWeb3Identifier({ provider, walletName });
-    let generateSignature: (params: GenerateSignatureParams) => Promise<string>;
+    let generateSignature: GenerateSignature;
     switch (provider) {
       case 'metamask':
         generateSignature = generateSignatureWithMetamask;

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

@@ -16,6 +16,7 @@ import type {
   EmailLinkConfig,
   EmailLinkFactor,
   EnterpriseSSOConfig,
+  GenerateSignature,
   PassKeyConfig,
   PasskeyFactor,
   PhoneCodeConfig,
@@ -468,8 +469,8 @@ export class SignIn extends BaseResource implements SignInResource {
     });
   };
 
-  public authenticateWithSolana = async (params?: AuthenticateWithSolanaParams): Promise<SignInResource> => {
-    const identifier = await getSolanaIdentifier({ walletName: params?.walletName });
+  public authenticateWithSolana = async (params: AuthenticateWithSolanaParams): Promise<SignInResource> => {
+    const identifier = await getSolanaIdentifier(params.walletName);
     return this.authenticateWithWeb3({
       identifier,
       generateSignature: generateSignatureWithSolana,
@@ -982,11 +983,12 @@ class SignInFuture implements SignInFutureResource {
 
   async web3(params: SignInFutureWeb3Params): Promise<{ error: ClerkError | null }> {
     const { strategy } = params;
-    const provider = strategy.replace('web3_', '').replace('_signature', '') as Web3Provider;
+    const provider = strategy.replace('web3_', '').replace('_signature', '');
+    // as Web3Provider;
 
     return runAsyncResourceTask(this.resource, async () => {
       let identifier;
-      let generateSignature;
+      let generateSignature: GenerateSignature;
       switch (provider) {
         case 'metamask':
           identifier = await getMetamaskIdentifier();
@@ -1006,11 +1008,9 @@ class SignInFuture implements SignInFutureResource {
           break;
         case 'solana':
           if (!params.walletName) {
-            throw new ClerkRuntimeError('walletName is required for solana web3 authentication', {
-              code: 'missing_wallet_name',
-            });
+            throw new Error('walletName is required for solana web3 authentication');
           }
-          identifier = await getSolanaIdentifier({ walletName: params.walletName });
+          identifier = await getSolanaIdentifier(params.walletName);
           generateSignature = generateSignatureWithSolana;
           break;
         default:
@@ -1041,7 +1041,7 @@ class SignInFuture implements SignInFutureResource {
         signature = await generateSignature({
           identifier,
           nonce: message,
-          walletName: params.walletName,
+          walletName: params?.walletName,
         });
       } catch (err) {
         // There is a chance that as a user when you try to setup and use the Coinbase Wallet with an existing
@@ -1054,7 +1054,6 @@ class SignInFuture implements SignInFutureResource {
           signature = await generateSignature({
             identifier,
             nonce: message,
-            walletName: params.walletName,
           });
         } else {
           throw err;

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

@@ -380,19 +380,19 @@ export class SignUp extends BaseResource implements SignUpResource {
   };
 
   public authenticateWithSolana = async (
-    params?: SignUpAuthenticateWithWeb3Params & {
-      walletName?: string;
+    params: SignUpAuthenticateWithWeb3Params & {
+      walletName: string;
       legalAccepted?: boolean;
     },
   ): Promise<SignUpResource> => {
-    const identifier = await getSolanaIdentifier({ walletName: params?.walletName });
+    const identifier = await getSolanaIdentifier(params.walletName);
     return this.authenticateWithWeb3({
       identifier,
       generateSignature: generateSignatureWithSolana,
       unsafeMetadata: params?.unsafeMetadata,
       strategy: 'web3_solana_signature',
       legalAccepted: params?.legalAccepted,
-      walletName: params?.walletName,
+      walletName: params.walletName,
     });
   };