feat: auth services v10 & wallet-service changes.

android/build.gradle

@@ -51,6 +51,6 @@ android {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
-    implementation 'com.github.Web3Auth:web3auth-android-sdk:9.1.3'
+    implementation 'com.github.Web3Auth:web3auth-android-sdk:10.0.0'
     implementation 'com.google.code.gson:gson:2.10.1'
 }

android/src/main/kotlin/com/web3auth/flutter/web3auth_flutter/Web3AuthFlutterPlugin.kt

@@ -3,7 +3,6 @@ package com.web3auth.flutter.web3auth_flutter
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
 import android.util.Log
 import androidx.annotation.Keep
 import androidx.annotation.NonNull
@@ -12,7 +11,6 @@ import com.google.gson.JsonArray
 import com.google.gson.JsonElement
 import com.google.gson.JsonPrimitive
 import com.web3auth.core.Web3Auth
-import com.web3auth.core.types.ChainConfig
 import com.web3auth.core.types.ErrorCode
 import com.web3auth.core.types.LoginParams
 import com.web3auth.core.types.Web3AuthError
@@ -99,7 +97,8 @@ class Web3AuthFlutterPlugin : FlutterPlugin, ActivityAware, MethodCallHandler,
                 val initParams = gson.fromJson(initArgs, Web3AuthOptions::class.java)
                 // handle custom parameters which are gson excluded
                 val obj = JSONObject(initArgs)
-                if (obj.has("redirectUrl")) initParams.redirectUrl = Uri.parse(obj.get("redirectUrl") as String?)
+                if (obj.has("redirectUrl")) initParams.redirectUrl =
+                    obj.get("redirectUrl").toString()
                 // Log.d(initParams.toString(), "#initParams")
                 web3auth = Web3Auth(
                     initParams, activity!!
@@ -111,14 +110,13 @@ class Web3AuthFlutterPlugin : FlutterPlugin, ActivityAware, MethodCallHandler,
                 return null
             }
 
-            "login" -> {
+            "connectTo" -> {
                 try {
                     val loginArgs = call.arguments<String>() ?: return null
                     val loginParams = gson.fromJson(loginArgs, LoginParams::class.java)
                     val obj = JSONObject(loginArgs)
-                    if (obj.has("redirectUrl")) loginParams.redirectUrl = Uri.parse(obj.get("redirectUrl") as String?)
-                    val loginCF = web3auth.login(loginParams)
-                    // Log.d(loginParams.toString(), "#loginParams")
+                    //Log.d("#loginParams", loginParams.toString())
+                    val loginCF = web3auth.connectTo(loginParams)
                     Log.d("${Web3AuthFlutterPlugin::class.qualifiedName}", "#login")
                     val loginResult: Web3AuthResponse = loginCF.get()
                     return gson.toJson(loginResult)
@@ -151,15 +149,15 @@ class Web3AuthFlutterPlugin : FlutterPlugin, ActivityAware, MethodCallHandler,
                 }
             }
 
-            "getPrivKey" -> {
-                val privKey = web3auth.getPrivkey()
-                Log.d("${Web3AuthFlutterPlugin::class.qualifiedName}", "#getPrivKey")
+            "getPrivateKey" -> {
+                val privKey = web3auth.getPrivateKey()
+                Log.d("${Web3AuthFlutterPlugin::class.qualifiedName}", "#getPrivateKey")
                 return privKey
             }
 
-            "getEd25519PrivKey" -> {
-                val ed25519Key = web3auth.getEd25519PrivKey()
-                Log.d("${Web3AuthFlutterPlugin::class.qualifiedName}", "#getEd25519PrivKey")
+            "getEd25519PrivateKey" -> {
+                val ed25519Key = web3auth.getEd25519PrivateKey()
+                Log.d("${Web3AuthFlutterPlugin::class.qualifiedName}", "#getEd25519PrivateKey")
                 return ed25519Key
             }
 
@@ -189,14 +187,13 @@ class Web3AuthFlutterPlugin : FlutterPlugin, ActivityAware, MethodCallHandler,
                 }
             }
 
-            "launchWalletServices" -> {
+            "showWalletUI" -> {
                 try {
-                    Log.d("${Web3AuthFlutterPlugin::class.qualifiedName}", "#launchWalletServices")
+                    Log.d("${Web3AuthFlutterPlugin::class.qualifiedName}", "#showWalletUI")
                     val wsArgs = call.arguments<String>() ?: return null
                     val wsParams = gson.fromJson(wsArgs, WalletServicesJson::class.java)
                     Log.d(wsParams.toString(), "#wsParams")
-                    val launchWalletCF = web3auth.launchWalletServices(
-                        wsParams.chainConfig,
+                    val launchWalletCF = web3auth.showWalletUI(
                         wsParams.path
                     )
                     launchWalletCF.get()
@@ -213,8 +210,6 @@ class Web3AuthFlutterPlugin : FlutterPlugin, ActivityAware, MethodCallHandler,
                     val loginArgs = call.arguments<String>() ?: return null
                     val loginParams = gson.fromJson(loginArgs, LoginParams::class.java)
                     val obj = JSONObject(loginArgs)
-                    if (obj.has("redirectUrl")) loginParams.redirectUrl =
-                        Uri.parse(obj.get("redirectUrl") as String?)
                     val setupMfaCF = web3auth.enableMFA(loginParams)
                     Log.d("${Web3AuthFlutterPlugin::class.qualifiedName}", "#enableMFA")
                     return setupMfaCF.get()
@@ -241,12 +236,11 @@ class Web3AuthFlutterPlugin : FlutterPlugin, ActivityAware, MethodCallHandler,
 
             "request" -> {
                 try {
-                    Log.d("${Web3AuthFlutterPlugin::class.qualifiedName}", "#signMessage")
+                    Log.d("${Web3AuthFlutterPlugin::class.qualifiedName}", "#request")
                     val requestArgs = call.arguments<String>() ?: return null
                     val reqParams = gson.fromJson(requestArgs, RequestJson::class.java)
                     Log.d(reqParams.toString(), "#reqParams")
                     val requestCF = web3auth.request(
-                        reqParams.chainConfig,
                         reqParams.method,
                         convertListToJsonArray(reqParams.requestParams) ,
                         reqParams.path,
@@ -265,8 +259,6 @@ class Web3AuthFlutterPlugin : FlutterPlugin, ActivityAware, MethodCallHandler,
                     val loginArgs = call.arguments<String>() ?: return null
                     val loginParams = gson.fromJson(loginArgs, LoginParams::class.java)
                     val obj = JSONObject(loginArgs)
-                    if (obj.has("redirectUrl")) loginParams.redirectUrl =
-                        Uri.parse(obj.get("redirectUrl") as String?)
                     val setupMfaCF = web3auth.manageMFA(loginParams)
                     Log.d("${Web3AuthFlutterPlugin::class.qualifiedName}", "#enableMFA")
                     return setupMfaCF.get()
@@ -301,13 +293,11 @@ class Web3AuthFlutterPlugin : FlutterPlugin, ActivityAware, MethodCallHandler,
 }
 @Keep
 data class WalletServicesJson(
-    @Keep val chainConfig: ChainConfig,
     @Keep val path: String? = "wallet"
 )
 
 @Keep
 data class RequestJson(
-    @Keep val chainConfig: ChainConfig,
     @Keep val method: String,
     @Keep val requestParams: List<Any?>,
     @Keep val path: String? = "wallet/request",

example/android/app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
-
-    <application
+   <application
         android:label="web3auth_flutter_example"
         android:name="${applicationName}"
         tools:replace="android:name"

example/android/build.gradle

@@ -6,13 +6,12 @@ allprojects {
 }
 
 rootProject.buildDir = '../build'
+
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
-subprojects {
-    project.evaluationDependsOn(':app')
-}
 
 tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
+

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,6 @@
 #Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
+https://github.com/Web3Auth/web3auth-flutter-sdk/pull/104/conflict?name=example%252Fandroid%252Fapp%252Fsrc%252Fmain%252FAndroidManifest.xml&ancestor_oid=ec00abe0c8ddb6dfa91343c66f24e48b431d1a15&base_oid=697fc9ac55830ca35e100ca84d4439da7ffddd85&head_oid=479557102c69887429d4fb9b8c21bf4760acb305distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
-
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip

example/android/settings.gradle

@@ -17,9 +17,9 @@ pluginManagement {
 }
 
 plugins {
-    id "com.android.application" version "8.1.4" apply false
-    id "org.jetbrains.kotlin.android" version "1.9.24" apply false
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "8.2.2" apply false
+    id "org.jetbrains.kotlin.android" version "1.9.10" apply false
 }
 
 include ":app"

example/ios/Podfile.lock

@@ -1,29 +1,49 @@
 PODS:
+  - AnalyticsSwiftCocoapod (1.8.0):
+    - JSONSafeEncoding (= 2.0.0)
+    - Sovran (= 1.1.1)
   - BigInt (5.2.0)
   - curvelib.swift (2.0.0)
   - Flutter (1.0.0)
+  - JSONSafeEncoding (2.0.0)
+  - JWTDecode (3.3.0)
   - KeychainSwift (20.0.0)
-  - TorusSessionManager (6.0.2):
+  - Sovran (1.1.1)
+  - Torus-fetchNodeDetails (8.0.1):
+    - BigInt (~> 5.2.0)
+  - Torus-utils (10.0.1):
+    - curvelib.swift (~> 2.0.0)
+    - Torus-fetchNodeDetails (~> 8.0.1)
+  - TorusSessionManager (6.1.0):
     - curvelib.swift (~> 2.0.0)
     - KeychainSwift (~> 20.0.0)
-  - Web3Auth (11.0.5):
+  - Web3Auth (12.0.1):
+    - AnalyticsSwiftCocoapod (~> 1.8.0)
     - BigInt (~> 5.2.0)
     - curvelib.swift (~> 2.0.0)
+    - JWTDecode (~> 3.3.0)
     - KeychainSwift (~> 20.0.0)
-    - TorusSessionManager (~> 6.0.2)
+    - Torus-utils (~> 10.0.1)
+    - TorusSessionManager (~> 6.1.0)
   - web3auth_flutter (2.0.1):
     - Flutter
-    - Web3Auth (~> 11.0.5)
+    - Web3Auth (~> 12.0.1)
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
   - web3auth_flutter (from `.symlinks/plugins/web3auth_flutter/ios`)
 
 SPEC REPOS:
   https://github.com/CocoaPods/Specs.git:
+    - AnalyticsSwiftCocoapod
     - BigInt
     - curvelib.swift
+    - JSONSafeEncoding
+    - JWTDecode
     - KeychainSwift
+    - Sovran
+    - Torus-fetchNodeDetails
+    - Torus-utils
     - TorusSessionManager
     - Web3Auth
 
@@ -34,14 +54,20 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/web3auth_flutter/ios"
 
 SPEC CHECKSUMS:
+  AnalyticsSwiftCocoapod: cc3e4d4e381a080c89a6f5f56845577c298bc627
   BigInt: f668a80089607f521586bbe29513d708491ef2f7
   curvelib.swift: b9223e5cac801effed8a5fe8968e952b3fe427a5
-  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
+  Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
+  JSONSafeEncoding: 54722ebc4fe1482e3e60a8450e1287481e32dd8b
+  JWTDecode: 1ca6f765844457d0dd8690436860fecee788f631
   KeychainSwift: 0ce6a4d13f7228054d1a71bb1b500448fb2ab837
-  TorusSessionManager: 3c47c2a4c4d6173a10006eb0af4b86317ee45ff8
-  Web3Auth: cf501e2bccf63d7a9746c0e53eb98cf143841a5c
-  web3auth_flutter: 79be94bbb719a1837c79e0c07e793abd64e11dd7
+  Sovran: f8212bb3855042a24689a73ea0219ca5295235da
+  Torus-fetchNodeDetails: 0ae97719263ee98f5bf5549a86464eea38a828f3
+  Torus-utils: 7c53a9c71663c2f458bfdcf1a380d7a5b88f9632
+  TorusSessionManager: cd2de693425cefb976c7bca42a45964297d8c2cc
+  Web3Auth: 5459b2d5bcdb150c5e84c7229639422cba684814
+  web3auth_flutter: 9c145c6b87ac77f1cbd2a016188ac9ec6162b243
 
 PODFILE CHECKSUM: 1d58595b82b880200a7ded05da9181d30ef8c1b7
 
-COCOAPODS: 1.14.2
+COCOAPODS: 1.16.2