feat: auth services v10 & wallet-service changes.

android/build.gradle

@@ -51,6 +51,7 @@ 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:9.1.3'
+    implementation 'com.github.grvgoel81:web3auth-android-sdk:2.0.0.5'
     implementation 'com.google.code.gson:gson:2.10.1'
 }

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

@@ -99,7 +99,7 @@ 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 +111,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 +150,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 +188,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 +211,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 +237,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 +260,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 +294,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/lib/main.dart

@@ -8,6 +8,7 @@ import 'package:web3auth_flutter/enums.dart';
 import 'package:web3auth_flutter/input.dart';
 import 'package:web3auth_flutter/output.dart';
 import 'package:web3auth_flutter/web3auth_flutter.dart';
+import 'package:web3auth_flutter_example/utils.dart';
 import 'package:web3dart/web3dart.dart';
 
 void main() {
@@ -53,39 +54,34 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
     HashMap themeMap = HashMap<String, String>();
     themeMap['primary'] = "#229954";
 
-    Uri redirectUrl;
+    String redirectUrl;
     if (Platform.isAndroid) {
-      redirectUrl = Uri.parse('torusapp://org.torusresearch.flutter.web3authexample');
+      redirectUrl = 'torusapp://org.torusresearch.flutter.web3authexample';
     } else if (Platform.isIOS) {
-      redirectUrl =
-          Uri.parse('com.web3auth.flutter.web3authflutterexample://auth');
+      redirectUrl = 'com.web3auth.flutter.web3authflutterexample://auth';
     } else {
       throw UnKnownException('Unknown platform');
     }
 
-    final loginConfig = HashMap<String, LoginConfigItem>();
-    loginConfig['jwt'] = LoginConfigItem(
-        verifier: "w3a-auth0-demo", // get it from web3auth dashboard
-        typeOfLogin: TypeOfLogin.jwt,
-        clientId: "hUVVf4SEsZT7syOiL0gLU9hFEtm2gQ6O" // auth0 client id
-        );
+    final List<AuthConnectionConfig> authConnectionConfig = [
+      AuthConnectionConfig(
+        authConnectionId: "web3auth-auth0-email-passwordless-sapphire-devnet",
+        authConnection: AuthConnection.custom,
+        clientId: "d84f6xvbdV75VTGmHiMWfZLeSPk8M07C",
+      )
+    ];
 
     await Web3AuthFlutter.init(
       Web3AuthOptions(
         clientId:
-            'BHgArYmWwSeq21czpcarYh0EVq2WWOzflX-NTK-tY1-1pauPzHKRRLgpABkmYiIV_og9jAvoIxQ8L3Smrwe04Lw',
+            'BPi5PB_UiIZ-cPz1GtV5i1I2iOSOHuimiXBI0e-Oe_u6X3oVAbCiAZOTEBtTXw4tsluTITPqA8zMsfxIKMjiqNQ',
         //sdkUrl: 'https://auth.mocaverse.xyz',
         //walletSdkUrl: 'https://lrc-mocaverse.web3auth.io',
-        network: Network.sapphire_devnet,
-        buildEnv: BuildEnv.production,
+        web3AuthNetwork: Web3AuthNetwork.sapphire_mainnet,
+        authBuildEnv: BuildEnv.testing,
         redirectUrl: redirectUrl,
-        whiteLabel: WhiteLabelData(
-          mode: ThemeModes.dark,
-          defaultLanguage: Language.en,
-          appName: "Web3Auth Flutter App",
-          theme: themeMap,
-        ),
-        loginConfig: loginConfig,
+        authConnectionConfig: authConnectionConfig,
+        defaultChainId: "0x1",
       ),
     );
 
@@ -95,7 +91,7 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
       print('Error during Web3Auth initialization: $e');
     }
 
-    final String res = await Web3AuthFlutter.getPrivKey();
+    final String res = await Web3AuthFlutter.getPrivateKey();
     log(res);
     if (res.isNotEmpty) {
       setState(() {
@@ -186,6 +182,10 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
                             onPressed: _login(_withDiscord),
                             child: const Text('Discord'),
                           ),
+                          ElevatedButton(
+                            onPressed: _login(sfaSignIn),
+                            child: const Text('SFA SignIn'),
+                          ),
                         ],
                       ),
                     ),
@@ -213,8 +213,8 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
                             child: const Text('Launch Wallet Services'),
                           ),
                           ElevatedButton(
-                            onPressed: _setupMFA(),
-                            child: const Text('Setup MFA'),
+                            onPressed: _enableMFA(),
+                            child: const Text('Enable MFA'),
                           ),
                           ElevatedButton(
                             onPressed: _manageMFA(),
@@ -277,7 +277,7 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
   VoidCallback _privKey(Future<String?> Function() method) {
     return () async {
       try {
-        final String response = await Web3AuthFlutter.getPrivKey();
+        final String response = await Web3AuthFlutter.getPrivateKey();
         setState(() {
           _result = response;
           logoutVisible = true;
@@ -290,10 +290,10 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
     };
   }
 
-  VoidCallback _userInfo(Future<TorusUserInfo> Function() method) {
+  VoidCallback _userInfo(Future<UserInfo> Function() method) {
     return () async {
       try {
-        final TorusUserInfo response = await Web3AuthFlutter.getUserInfo();
+        final UserInfo response = await Web3AuthFlutter.getUserInfo();
         setState(() {
           _result = response.toString();
           logoutVisible = true;
@@ -307,19 +307,21 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
   }
 
   Future<Web3AuthResponse> _withGoogle() {
-    return Web3AuthFlutter.login(
-      LoginParams(loginProvider: Provider.google, mfaLevel: MFALevel.NONE),
+    return Web3AuthFlutter.connectTo(
+      LoginParams(
+          authConnection: AuthConnection.google, mfaLevel: MFALevel.NONE),
     );
   }
 
   Future<Web3AuthResponse> _withFacebook() {
-    return Web3AuthFlutter.login(LoginParams(loginProvider: Provider.facebook));
+    return Web3AuthFlutter.connectTo(
+        LoginParams(authConnection: AuthConnection.facebook));
   }
 
   Future<Web3AuthResponse> _withEmailPasswordless() {
-    return Web3AuthFlutter.login(
+    return Web3AuthFlutter.connectTo(
       LoginParams(
-        loginProvider: Provider.email_passwordless,
+        authConnection: AuthConnection.email_passwordless,
         extraLoginOptions: ExtraLoginOptions(
           login_hint: textEditingController.text,
         ),
@@ -328,27 +330,30 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
   }
 
   Future<Web3AuthResponse> _withDiscord() {
-    return Web3AuthFlutter.login(LoginParams(loginProvider: Provider.discord));
+    return Web3AuthFlutter.connectTo(
+        LoginParams(authConnection: AuthConnection.discord));
+  }
+
+  Future<Web3AuthResponse> sfaSignIn() {
+    return Web3AuthFlutter.connectTo(
+        LoginParams(authConnection: AuthConnection.discord,
+        authConnectionId: "torus-test-health",
+        idToken: Utils().es256Token("devnettestuser@tor.us"),
+        groupedAuthConnectionId: "torus-aggregate-sapphire-mainnet"));
   }
 
   Future<String?> _getPrivKey() {
-    return Web3AuthFlutter.getPrivKey();
+    return Web3AuthFlutter.getPrivateKey();
   }
 
-  Future<TorusUserInfo> _getUserInfo() {
+  Future<UserInfo> _getUserInfo() {
     return Web3AuthFlutter.getUserInfo();
   }
 
   VoidCallback _launchWalletServices() {
     return () async {
       try {
-        await Web3AuthFlutter.launchWalletServices(
-          ChainConfig(
-            chainId: "0x89",
-            rpcTarget:
-                "https://mainnet.infura.io/v3/daeee53504be4cd3a997d4f2718d33e0",
-          ),
-        );
+        await Web3AuthFlutter.showWalletUI();
       } on UserCancelledException {
         log("User cancelled.");
       } on UnKnownException {
@@ -357,7 +362,7 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
     };
   }
 
-  VoidCallback _setupMFA() {
+  VoidCallback _enableMFA() {
     return () async {
       try {
         await Web3AuthFlutter.enableMFA();
@@ -397,7 +402,6 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
         params.add(address.hexEip55);
         params.add("Web3Auth");
         final signResponse = await Web3AuthFlutter.request(
-          ChainConfig(chainId: "0x89", rpcTarget: "https://polygon-rpc.com/"),
           "personal_sign",
           params,
           appState: "web3auth",

example/lib/utils.dart

@@ -0,0 +1,32 @@
+import 'package:dart_jsonwebtoken/dart_jsonwebtoken.dart';
+
+class Utils {
+  String es256Token(String email) {
+    String token;
+
+    /* Sign */ {
+      // Create a json web token
+      final jwt = JWT({
+        "sub": "email|hello",
+        "aud": "torus-key-test",
+        "exp": DateTime.now().millisecond,
+        "iat": DateTime.now().millisecond,
+        "iss": "torus-key-test",
+        "email": email,
+        "nickname": email.split("@")[0],
+        "name": email,
+        "picture": "",
+        "email_verified": true
+      });
+
+      // Sign it
+      final key = ECPrivateKey("-----BEGIN PRIVATE KEY-----\n"
+          "MEECAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQcEJzAlAgEBBCCD7oLrcKae+jVZPGx52Cb/lKhdKxpXjl9eGNa1MlY57A=="
+          "\n-----END PRIVATE KEY-----");
+      token = jwt.sign(key, algorithm: JWTAlgorithm.ES256);
+
+      print('Signed token: \n $token\n');
+      return token;
+    }
+  }
+}

example/pubspec.yaml

@@ -30,6 +30,7 @@ dependencies:
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.8
   web3dart: ^2.7.3
+  dart_jsonwebtoken: ^2.7.1
 
 dev_dependencies:
   flutter_test: