Updated and tested solana example

Author: ihsraham

android-solana-example/app/build.gradle.kts

@@ -63,7 +63,7 @@ dependencies {
     implementation("androidx.compose.ui:ui-graphics")
     implementation("androidx.compose.ui:ui-tooling-preview")
     implementation("androidx.compose.material3:material3")
-    implementation("com.github.Web3Auth:web3auth-android-sdk:9.0.4")
+    implementation("com.github.Web3Auth:web3auth-android-sdk:10.0.0")
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")

android-solana-example/app/src/main/java/com/example/androidsolanaexample/data/Web3AuthHelper.kt

@@ -14,6 +14,6 @@ interface Web3AuthHelper {
     fun getUserInfo(): UserInfo
     suspend fun initialize(): CompletableFuture<Void>
 
-    suspend fun setResultUrl(uri: Uri?): Unit
+    fun setResultUrl(uri: Uri?)
     suspend fun isUserAuthenticated(): Boolean
-}
+}

android-solana-example/app/src/main/java/com/example/androidsolanaexample/data/Web3AuthHelperImpl.kt

@@ -11,15 +11,15 @@ class Web3AuthHelperImpl(
     private val web3Auth: Web3Auth
 ): Web3AuthHelper {
     override suspend fun login(loginParams: LoginParams): CompletableFuture<Web3AuthResponse> {
-       return web3Auth.login(loginParams)
+       return web3Auth.connectTo(loginParams)
     }
 
     override suspend fun logOut(): CompletableFuture<Void> {
         return web3Auth.logout()
     }
 
     override fun getSolanaPrivateKey(): String {
-        return web3Auth.getEd25519PrivKey()
+        return web3Auth.getEd25519PrivateKey()
     }
 
     override fun getUserInfo(): UserInfo {
@@ -39,12 +39,15 @@ class Web3AuthHelperImpl(
        }
     }
 
-    override suspend fun setResultUrl(uri: Uri?) {
-        return web3Auth.setResultUrl(uri)
+    override fun setResultUrl(uri: Uri?) {
+        web3Auth.setResultUrl(uri)
     }
 
-    override suspend fun isUserAuthenticated(): Boolean {
-        return web3Auth.getPrivkey().isNotEmpty()
-    }
+    override suspend fun isUserAuthenticated(): Boolean =
+        try {
+            web3Auth.getPrivateKey().isNotEmpty()
+        } catch (_: Exception) {
+            false
+        }
 
-}
+}

android-solana-example/app/src/main/java/com/example/androidsolanaexample/data/Web3AuthSampleConfig.kt

@@ -0,0 +1,11 @@
+package com.example.androidsolanaexample.data
+
+object Web3AuthSampleConfig {
+    const val CLIENT_ID =
+        "BPi5PB_UiIZ-cPz1GtV5i1I2iOSOHuimiXBI0e-Oe_u6X3oVAbCiAZOTEBtTXw4tsluTITPqA8zMsfxIKMjiqNQ"
+    const val REDIRECT_URL = "com.example.androidsolanaexample://auth"
+    const val GOOGLE_AUTH_CONNECTION_ID = "w3ads"
+    const val GOOGLE_CLIENT_ID =
+        "519228911939-snh959gvvmjieoo4j14kkaancbkjp34r.apps.googleusercontent.com"
+    const val GROUPED_AUTH_CONNECTION_ID = "aggregate-mobile"
+}

android-solana-example/app/src/main/java/com/example/androidsolanaexample/di/appModule.kt

@@ -1,19 +1,28 @@
 package com.example.androidsolanaexample.di
 
 import android.content.Context
-import android.net.Uri
 import com.example.androidsolanaexample.data.SolanaUseCaseImpl
 import com.example.androidsolanaexample.data.Web3AuthHelper
 import com.example.androidsolanaexample.data.Web3AuthHelperImpl
+import com.example.androidsolanaexample.data.Web3AuthSampleConfig
 import com.example.androidsolanaexample.domain.SolanaUseCase
 import com.example.androidsolanaexample.viewmodel.MainViewModel
 import com.web3auth.core.Web3Auth
-import com.web3auth.core.types.Network
+import com.web3auth.core.types.AuthConnection
+import com.web3auth.core.types.AuthConnectionConfig
+import com.web3auth.core.types.BuildEnv
+import com.web3auth.core.types.Language
+import com.web3auth.core.types.MfaSetting
+import com.web3auth.core.types.MfaSettings
+import com.web3auth.core.types.ThemeModes
 import com.web3auth.core.types.Web3AuthOptions
+import com.web3auth.core.types.WalletServicesConfig
+import com.web3auth.core.types.WhiteLabelData
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.dsl.module
 import org.sol4k.Connection
 import org.sol4k.RpcUrl
+import org.torusresearch.fetchnodedetails.types.Web3AuthNetwork
 
 val appModule = module {
     single {
@@ -30,13 +39,42 @@ val appModule = module {
 }
 
 private fun getWeb3AuthHelper(context: Context): Web3AuthHelper {
+    val whiteLabelData = WhiteLabelData(
+        appName = "Web3Auth Solana Example",
+        logoLight = "https://cryptologos.cc/logos/solana-sol-logo.png",
+        logoDark = "https://cryptologos.cc/logos/solana-sol-logo.png",
+        defaultLanguage = Language.EN,
+        mode = ThemeModes.LIGHT,
+        useLogoLoader = true,
+        theme = hashMapOf("primary" to "#14F195")
+    )
+
+    val authConnections = listOf(
+        AuthConnectionConfig(
+            authConnectionId = Web3AuthSampleConfig.GOOGLE_AUTH_CONNECTION_ID,
+            authConnection = AuthConnection.GOOGLE,
+            clientId = Web3AuthSampleConfig.GOOGLE_CLIENT_ID,
+            groupedAuthConnectionId = Web3AuthSampleConfig.GROUPED_AUTH_CONNECTION_ID
+        )
+    )
+
     val web3Auth: Web3Auth = Web3Auth(
         Web3AuthOptions(
-            clientId = "BPi5PB_UiIZ-cPz1GtV5i1I2iOSOHuimiXBI0e-Oe_u6X3oVAbCiAZOTEBtTXw4tsluTITPqA8zMsfxIKMjiqNQ",
-            network = Network.SAPPHIRE_MAINNET,
-            redirectUrl = Uri.parse( "com.example.androidsolanaexample://auth")
+            clientId = Web3AuthSampleConfig.CLIENT_ID,
+            web3AuthNetwork = Web3AuthNetwork.SAPPHIRE_MAINNET,
+            authBuildEnv = BuildEnv.TESTING,
+            redirectUrl = Web3AuthSampleConfig.REDIRECT_URL,
+            authConnectionConfig = authConnections,
+            whiteLabel = whiteLabelData,
+            walletServicesConfig = WalletServicesConfig(whiteLabel = whiteLabelData),
+            mfaSettings = MfaSettings(
+                deviceShareFactor = MfaSetting(true, 1, true),
+                socialBackupFactor = MfaSetting(true, 2, true),
+                passwordFactor = MfaSetting(true, 3, false),
+                backUpShareFactor = MfaSetting(true, 4, false),
+            )
         ), context
     )
 
     return Web3AuthHelperImpl(web3Auth)
-}
+}

android-solana-example/app/src/main/java/com/example/androidsolanaexample/viewmodel/MainViewModel.kt

@@ -4,9 +4,10 @@ import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.example.androidsolanaexample.data.Web3AuthHelper
+import com.example.androidsolanaexample.data.Web3AuthSampleConfig
 import com.example.androidsolanaexample.domain.SolanaUseCase
+import com.web3auth.core.types.AuthConnection
 import com.web3auth.core.types.LoginParams
-import com.web3auth.core.types.Provider
 import com.web3auth.core.types.UserInfo
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -34,7 +35,11 @@ class MainViewModel(private val web3AuthHelper: Web3AuthHelper, private val sola
         solanaKeyPair = Keypair.fromSecretKey(solanaPrivateKey().hexToByteArray())
     }
     fun login(){
-        val loginParams = LoginParams(loginProvider = Provider.GOOGLE)
+        val loginParams = LoginParams(
+            authConnection = AuthConnection.GOOGLE,
+            authConnectionId = Web3AuthSampleConfig.GOOGLE_AUTH_CONNECTION_ID,
+            groupedAuthConnectionId = Web3AuthSampleConfig.GROUPED_AUTH_CONNECTION_ID
+        )
         viewModelScope.launch {
             try {
                 web3AuthHelper.login(loginParams = loginParams).await()
@@ -98,9 +103,7 @@ class MainViewModel(private val web3AuthHelper: Web3AuthHelper, private val sola
     }
 
     fun setResultUrl(uri: Uri?) {
-        viewModelScope.launch {
-            web3AuthHelper.setResultUrl(uri)
-        }
+        web3AuthHelper.setResultUrl(uri)
     }
 
      fun signAndSendTransaction(onSign: (hash: String?, error: String?) -> Unit) {
@@ -133,4 +136,4 @@ class MainViewModel(private val web3AuthHelper: Web3AuthHelper, private val sola
            e.localizedMessage?.let { onAvailable( null, it) }
        }
     }
-}
+}