aligning v2 auth with server-side validation

Author: prsvic

packages/blockchain-sdk-solana/src/auth/sign-message-v2/solana-sign-message-v2-token-generator.ts

@@ -1,23 +1,24 @@
 import {
+  bytesFromBase64,
   jsonParseFromBase64,
   type Token,
+  TokenGenerator,
   type TokenSigner,
 } from '@dialectlabs/sdk';
-import { TokenGenerator } from '@dialectlabs/sdk';
 import axios from 'axios';
-import { Buffer } from 'buffer/';
-import { bytesFromBase64 } from '@dialectlabs/sdk/src';
+import bs58 from 'bs58';
 
 export class SolanaSignMessageV2TokenGenerator extends TokenGenerator {
   constructor(signer: TokenSigner, private readonly v2BaseUrl: string) {
     super(signer);
   }
 
-  override async generate(ttlSeconds: number): Promise<Token> {
+  override async generate(): Promise<Token> {
     const prepareResponse = await axios.post<{ message: string }>(
       `${this.v2BaseUrl}/v2/auth/solana/prepare`,
       { walletAddress: this.signer.subject },
     );
+
     const messageToSign = prepareResponse.data.message;
 
     const { signature } = await this.signer.sign(
@@ -28,11 +29,12 @@ export class SolanaSignMessageV2TokenGenerator extends TokenGenerator {
       `${this.v2BaseUrl}/v2/auth/solana/verify`,
       {
         message: messageToSign,
-        signature: Buffer.from(signature).toString('base64'),
+        signature: bs58.encode(signature),
       },
     );
 
     const tokenStr = tokenResponse.data.token;
+
     const [base64Header, base64Body, base64Signature] = tokenStr.split('.');
     if (!base64Header || !base64Body || !base64Signature) {
       throw new Error('Invalid token format from backend');

packages/blockchain-sdk-solana/src/auth/sign-message-v2/solana-sign-message-v2-token-validator.ts

@@ -1,16 +1,16 @@
-import type { Token, TokenHeader } from '@dialectlabs/sdk';
+import type { TokenHeader } from '@dialectlabs/sdk';
 import { TokenValidator } from '@dialectlabs/sdk';
 
 export class SolanaSignMessageV2TokenValidator extends TokenValidator {
-  constructor(private readonly baseUrl: string) {
+  constructor() {
     super();
   }
 
   override canValidate(tokenHeader: TokenHeader): boolean {
     return tokenHeader.typ === 'JWT' && tokenHeader.alg === 'HS256';
   }
 
-  override isSignatureValid(token: Token): boolean {
+  override isSignatureValid(): boolean {
     return true;
   }
 }

packages/blockchain-sdk-solana/src/sdk/sdk.ts

@@ -51,6 +51,7 @@ Solana settings:
   Wallet supports authentication: ${
     config.wallet.canSignMessage() || config.wallet.canSignTransaction()
   }
+  Auth version: ${config.authVersion}
 `,
       );
     }
@@ -67,13 +68,10 @@ Solana settings:
       config.encryptionKeysStore,
     );
 
-    const authenticationFacadeFactory = wallet.canSignMessage()
-      ? new SolanaEd25519AuthenticationFacadeFactory(
-          new DialectWalletAdapterSolanaEd25519TokenSigner(wallet),
-        )
-      : new SolanaTxAuthenticationFacadeFactory(
-          new DialectWalletAdapterSolanaTxTokenSigner(wallet),
-        );
+    const authenticationFacadeFactory = this.createAuthenticationFacadeFactory(
+      solanaConfig,
+      config,
+    );
     const authenticationFacade = authenticationFacadeFactory.get();
 
     return {
@@ -87,28 +85,31 @@ Solana settings:
     };
   }
 
-  createAuthenticationFacade(solanaConfig: SolanaConfig, config: Config) {
+  createAuthenticationFacadeFactory(
+    solanaConfig: SolanaConfig,
+    config: Config,
+  ) {
     if (solanaConfig.authVersion === 1) {
       if (solanaConfig.wallet.canSignMessage()) {
         return new SolanaEd25519AuthenticationFacadeFactory(
           new DialectWalletAdapterSolanaEd25519TokenSigner(solanaConfig.wallet),
-        ).get();
+        );
       }
       if (solanaConfig.wallet.canSignTransaction()) {
         return new SolanaTxAuthenticationFacadeFactory(
           new DialectWalletAdapterSolanaTxTokenSigner(solanaConfig.wallet),
-        ).get();
+        );
       }
     }
     if (solanaConfig.authVersion === 2) {
       if (solanaConfig.wallet.canSignMessage()) {
         return new SolanaSignMessageV2AuthenticationFacadeFactory(
           new DialectWalletAdapterSolanaEd25519TokenSigner(solanaConfig.wallet),
           config.dialectCloud.v2Url,
-        ).get();
+        );
       }
     }
-    throw new IllegalArgumentError('Unsupported auth version');
+    throw new IllegalArgumentError('Unsupported authentication');
   }
 
   private initializeSolanaConfig(): SolanaConfig {