Merge pull request #56 from Web3Auth/feat/update-openlogin-version

update openlogin version

Author: chaitanyapotti

android/build.gradle

@@ -49,6 +49,6 @@ android {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
-    implementation 'org.torusresearch:web3auth-android-sdk:5.1.2'
+    implementation 'com.github.web3Auth:web3auth-android-sdk:5.3.0'
     implementation 'com.google.code.gson:gson:2.9.1'
 }

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

@@ -87,8 +87,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)
-                val redirectUrl = obj.get("redirectUrl") as String?
-                if (!redirectUrl.isNullOrEmpty()) initParams.redirectUrl = Uri.parse(redirectUrl)
+                if (obj.has("redirectUrl")) initParams.redirectUrl = Uri.parse(obj.get("redirectUrl") as String?)
                 initParams.context = activity!!
                 // Log.d(initParams.toString(), "#initParams")
                 web3auth = Web3Auth(
@@ -106,8 +105,7 @@ class Web3AuthFlutterPlugin : FlutterPlugin, ActivityAware, MethodCallHandler,
                     val loginArgs = call.arguments<String>() ?: return null
                     val loginParams = gson.fromJson(loginArgs, LoginParams::class.java)
                     val obj = JSONObject(loginArgs)
-                    val redirectUrl = obj.get("redirectUrl") as String?
-                    if (!redirectUrl.isNullOrEmpty()) loginParams.redirectUrl = Uri.parse(redirectUrl)
+                    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("${Web3AuthFlutterPlugin::class.qualifiedName}", "#login")

example/ios/Podfile.lock

@@ -15,14 +15,14 @@ PODS:
     - GenericJSON (~> 2.0)
     - Logging (~> 1.0.0)
     - secp256k1.swift (~> 0.1)
-  - Web3Auth (7.2.0):
+  - Web3Auth (7.4.0):
     - CryptoSwift (~> 1.8.0)
     - KeychainSwift (~> 20.0.0)
     - TorusSessionManager (~> 3.0.1)
     - web3.swift (~> 1.6.0)
   - web3auth_flutter (2.0.0):
     - Flutter
-    - Web3Auth (~> 7.2.0)
+    - Web3Auth (~> 7.4.0)
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
@@ -56,8 +56,8 @@ SPEC CHECKSUMS:
   secp256k1.swift: a7e7a214f6db6ce5db32cc6b2b45e5c4dd633634
   TorusSessionManager: 829495789427b7ad7e29f2b535092a44f3900b42
   web3.swift: 2263d1e12e121b2c42ffb63a5a7beb1acaf33959
-  Web3Auth: f11f6b8ed684ea47a362738758e444d22eeea691
-  web3auth_flutter: f260e2b6b437c0c62b16bbbf0eacbb46fc73378a
+  Web3Auth: 3d269bd583e7209961bf8752f3d52f70fc1689ae
+  web3auth_flutter: 776a8ad6436005de9072c0645473c688065c90ed
 
 PODFILE CHECKSUM: 1d58595b82b880200a7ded05da9181d30ef8c1b7
 

example/lib/main.dart

@@ -239,20 +239,8 @@ class _MyAppState extends State<MyApp> {
   }
 
   Future<Web3AuthResponse> _withGoogle() {
-    Uri redirectUrl;
-    if (Platform.isAndroid) {
-      redirectUrl = Uri.parse(
-          'torusapp://org.torusresearch.flutter.web3authexample/auth');
-    } else if (Platform.isIOS) {
-      redirectUrl =
-          Uri.parse('com.web3auth.flutter.web3authflutterexample://auth');
-    } else {
-      throw UnKnownException('Unknown platform');
-    }
-    return Web3AuthFlutter.login(LoginParams(
-        loginProvider: Provider.google,
-        mfaLevel: MFALevel.NONE,
-        redirectUrl: redirectUrl));
+    return Web3AuthFlutter.login(
+        LoginParams(loginProvider: Provider.google, mfaLevel: MFALevel.NONE));
   }
 
   Future<Web3AuthResponse> _withFacebook() {

ios/web3auth_flutter.podspec

@@ -15,7 +15,7 @@ Flutter SDK for Torus Web3Auth (OpenLogin)
   s.source           = { :path => '.' }
   s.source_files = 'Classes/**/*'
   s.dependency 'Flutter'
-  s.dependency 'Web3Auth', '~> 7.2.0'
+  s.dependency 'Web3Auth', '~> 7.4.0'
   s.platform = :ios, '14.0'
 
   # Flutter.framework does not contain a i386 slice.

lib/input.dart

@@ -14,7 +14,7 @@ class LoginParams {
   LoginParams(
       {required this.loginProvider,
       this.dappShare,
-      this.curve,
+      this.curve = Curve.secp256k1,
       this.extraLoginOptions,
       this.redirectUrl,
       this.appState,
@@ -224,7 +224,7 @@ class Web3AuthOptions {
   final Network network;
   final BuildEnv? buildEnv;
   final String? sdkUrl;
-  final Uri? redirectUrl;
+  final Uri redirectUrl;
   final WhiteLabelData? whiteLabel;
   final HashMap<String, LoginConfigItem>? loginConfig;
   final bool? useCoreKitKey;
@@ -237,7 +237,7 @@ class Web3AuthOptions {
       required this.network,
       this.buildEnv = BuildEnv.production,
       String? sdkUrl,
-      this.redirectUrl,
+      required this.redirectUrl,
       this.whiteLabel,
       this.loginConfig,
       this.useCoreKitKey,
@@ -252,7 +252,7 @@ class Web3AuthOptions {
       'network': network.name,
       'sdkUrl': sdkUrl,
       'buildEnv': buildEnv?.name,
-      'redirectUrl': redirectUrl?.toString(),
+      'redirectUrl': redirectUrl.toString(),
       'whiteLabel': whiteLabel?.toJson(),
       'loginConfig': loginConfig,
       'useCoreKitKey': useCoreKitKey,
@@ -272,7 +272,7 @@ class UnKnownException implements Exception {
 }
 
 String getSdkUrl(BuildEnv? buildEnv) {
-  const String version = "v5";
+  const String version = "v6";
   switch (buildEnv) {
     case BuildEnv.staging:
       return "https://staging-auth.web3auth.io/$version";