Fix: fakedapp legacy cluster param (#750)

* fix legacy cluster param * refactor
solana-mobile · Mar 14, 2024 · 88cc36a · 88cc36a
1 parent 02af0ce
commit 88cc36a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/android/fakedapp/src/main/java/com/solana/mobilewalletadapter/fakedapp/MainViewModel.kt b/android/fakedapp/src/main/java/com/solana/mobilewalletadapter/fakedapp/MainViewModel.kt
@@ -456,11 +456,11 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     private suspend fun doAuthorize(
         client: MobileWalletAdapterUseCase.Client,
         identity: MobileWalletAdapterUseCase.DappIdentity,
-        cluster: String?,
+        chain: String?,
         signInPayload: SignInWithSolana.Payload? = null
     ): MobileWalletAdapterClient.AuthorizationResult {
         val result = try {
-            client.authorize(identity, cluster, signInPayload)
+            client.authorize(identity, chain, signInPayload, uiState.value.sessionProtocolVersion!!)
         } catch (e: MobileWalletAdapterUseCase.MobileWalletAdapterOperationFailedException) {
             _uiState.update {
                 it.copy(

diff --git a/...c/main/java/com/solana/mobilewalletadapter/fakedapp/usecase/MobileWalletAdapterUseCase.kt b/...c/main/java/com/solana/mobilewalletadapter/fakedapp/usecase/MobileWalletAdapterUseCase.kt
@@ -22,6 +22,7 @@ import com.solana.mobilewalletadapter.clientlib.scenario.LocalAssociationScenari
 import com.solana.mobilewalletadapter.clientlib.scenario.Scenario
 import com.solana.mobilewalletadapter.common.ProtocolContract
 import com.solana.mobilewalletadapter.common.protocol.SessionProperties
+import com.solana.mobilewalletadapter.common.protocol.SessionProperties.ProtocolVersion
 import com.solana.mobilewalletadapter.common.signin.SignInWithSolana
 import kotlinx.coroutines.*
 import kotlinx.coroutines.sync.Semaphore
@@ -47,17 +48,31 @@ object MobileWalletAdapterUseCase {
     )
 
     class Client(private val client: MobileWalletAdapterClient) {
+
         suspend fun authorize(
             identity: DappIdentity,
             chain: String?,
-            signInPayload: SignInWithSolana.Payload?
+            signInPayload: SignInWithSolana.Payload?,
+            protocolVersion: ProtocolVersion = ProtocolVersion.V1
         ): MobileWalletAdapterClient.AuthorizationResult = coroutineScope {
             try {
                 runInterruptible(Dispatchers.IO) {
-                    client.authorize(
-                        identity.uri, identity.iconRelativeUri, identity.name, chain,
-                        null, null, null, signInPayload
-                    ).get()!!
+                    if (protocolVersion == ProtocolVersion.V1) {
+                        client.authorize(
+                            identity.uri, identity.iconRelativeUri, identity.name, chain,
+                            null, null, null, signInPayload
+                        ).get()!!
+                    } else {
+                        val cluster = when (chain) {
+                            ProtocolContract.CHAIN_SOLANA_MAINNET -> ProtocolContract.CLUSTER_MAINNET_BETA
+                            ProtocolContract.CHAIN_SOLANA_TESTNET -> ProtocolContract.CLUSTER_TESTNET
+                            ProtocolContract.CHAIN_SOLANA_DEVNET -> ProtocolContract.CLUSTER_DEVNET
+                            else -> throw IllegalArgumentException("Provided chain parameter is not valid for a legacy session: $chain")
+                        }
+                        client.authorize(
+                            identity.uri, identity.iconRelativeUri, identity.name, cluster
+                        ).get()!!
+                    }
                 }
             } catch (e: ExecutionException) {
                 when (val cause = e.cause) {
@@ -84,6 +99,9 @@ object MobileWalletAdapterUseCase {
                     is JsonRpc20Client.JsonRpc20Exception -> throw MobileWalletAdapterOperationFailedException(
                         "JSON-RPC client exception for authorize", cause
                     )
+                    is IllegalArgumentException -> throw MobileWalletAdapterOperationFailedException(
+                        "Invalid chain for legacy session", cause
+                    )
                     else -> throw MobileWalletAdapterOperationFailedException(null, e)
                 }
             } catch (e: CancellationException) {