Merge pull request #13 from torusresearch/feat/more-params

feat: additional params

Author: chaitanyapotti

OpenLoginReactNativeSDKDemo2/.prettierrc.js

@@ -1,6 +1,5 @@
 module.exports = {
   bracketSpacing: false,
-  jsxBracketSameLine: true,
   singleQuote: true,
   trailingComma: 'all',
   arrowParens: 'avoid',

OpenLoginReactNativeSDKDemo2/App.js

@@ -2,13 +2,12 @@ import React, {useState} from 'react';
 
 import {StyleSheet, View, Text, Button} from 'react-native';
 import OpenloginReactNativeSdk, {
-  LoginResponse,
   LoginProvider,
   OpenloginNetwork,
 } from 'openlogin-react-native-sdk';
 
 export default function App() {
-  const [result, setResult] = useState('');
+  const [loginResult, setLoginResult] = useState('');
 
   React.useEffect(() => {
     OpenloginReactNativeSdk.init({
@@ -30,7 +29,7 @@ export default function App() {
             OpenloginReactNativeSdk.login({
               provider: LoginProvider.GOOGLE,
             })
-              .then(result => setResult(JSON.stringify(result)))
+              .then(result => setLoginResult(JSON.stringify(result)))
               .catch(err => console.log(`error: ${err}`))
           }
         />
@@ -42,7 +41,23 @@ export default function App() {
             OpenloginReactNativeSdk.login({
               provider: LoginProvider.APPLE,
             })
-              .then(result => setResult(JSON.stringify(result)))
+              .then(result => setLoginResult(JSON.stringify(result)))
+              .catch(err => console.log(`error: ${err}`))
+          }
+        />
+      </View>
+      <View style={styles.box}>
+        <Button
+          title="Login with Email"
+          onPress={() =>
+            OpenloginReactNativeSdk.login({
+              provider: LoginProvider.EMAIL_PASSWORDLESS,
+              relogin: true,
+              extraLoginOptions: {
+                login_hint: '[email protected]',
+              },
+            })
+              .then(result => setLoginResult(JSON.stringify(result)))
               .catch(err => console.log(`error: ${err}`))
           }
         />
@@ -51,8 +66,8 @@ export default function App() {
         <Button
           title="Login with OpenLogin"
           onPress={() =>
-            OpenloginReactNativeSdk.login({})
-              .then(result => setResult(JSON.stringify(result)))
+            OpenloginReactNativeSdk.login({extraLoginOptions: {}})
+              .then(result => setLoginResult(JSON.stringify(result)))
               .catch(err => console.log(`error: ${err}`))
           }
         />
@@ -61,15 +76,13 @@ export default function App() {
         <Button
           title="Logout"
           onPress={() =>
-            OpenloginReactNativeSdk.logout({
-              provider: LoginProvider.GOOGLE,
-            })
-              .then(result => setResult(''))
+            OpenloginReactNativeSdk.logout({})
+              .then(result => setLoginResult(''))
               .catch(err => console.log(`error: ${err}`))
           }
         />
       </View>
-      <Text style={styles.text}>Result: {result}</Text>
+      <Text style={styles.text}>Result: {loginResult}</Text>
     </View>
   );
 }

OpenLoginReactNativeSDKDemo2/ios/Podfile.lock

@@ -74,9 +74,9 @@ PODS:
   - glog (0.3.5)
   - libevent (2.1.12)
   - OpenLogin (1.0.0)
-  - openlogin-react-native-sdk (0.1.0):
-    - OpenLogin (= 1.0.0)
+  - openlogin-react-native-sdk (1.0.0):
     - React-Core
+    - Web3Auth (= 3.1.0)
   - OpenSSL-Universal (1.1.180)
   - RCT-Folly (2021.06.28.00-v2):
     - boost
@@ -341,6 +341,7 @@ PODS:
     - React-jsi (= 0.66.3)
     - React-logger (= 0.66.3)
     - React-perflogger (= 0.66.3)
+  - Web3Auth (3.1.0)
   - Yoga (1.14.0)
   - YogaKit (1.18.1):
     - Yoga (~> 1.14)
@@ -418,6 +419,7 @@ SPEC REPOS:
     - libevent
     - OpenLogin
     - OpenSSL-Universal
+    - Web3Auth
     - YogaKit
 
 EXTERNAL SOURCES:
@@ -503,7 +505,7 @@ SPEC CHECKSUMS:
   glog: 5337263514dd6f09803962437687240c5dc39aa4
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   OpenLogin: 055c3108e8ada81a1e833c2c59188faed302e32b
-  openlogin-react-native-sdk: 935885e0e368de62ecb08c9ca92f0a5e2ca953ba
+  openlogin-react-native-sdk: 59392576b4b481f39bc83063b0a81173f35bd627
   OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
   RCT-Folly: a21c126816d8025b547704b777a2ba552f3d9fa9
   RCTRequired: 59d2b744d8c2bf2d9bc7032a9f654809adcf7d50
@@ -529,6 +531,7 @@ SPEC CHECKSUMS:
   React-RCTVibration: 50cfe7049167cfc7e83ac5542c6fff0c76791a9b
   React-runtimeexecutor: bbbdb3d8fcf327c6e2249ee71b6ef1764b7dc266
   ReactCommon: 9bac022ab71596f2b0fde1268272543184c63971
+  Web3Auth: 81df9a25d1ca80b10ac1f0447713297fc9b3aa48
   Yoga: 32a18c0e845e185f4a2a66ec76e1fd1f958f22fa
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 

android/build.gradle

@@ -127,7 +127,7 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9")
   implementation 'net.sourceforge.streamsupport:streamsupport-cfuture:1.7.4'
-  implementation 'com.github.torusresearch:openlogin-android-sdk:1.0.1'
+  implementation 'org.torusresearch:web3auth-android-sdk:2.1.1'
 }
 
 configurations.all {

android/src/main/java/com/openloginreactnativesdk/OpenloginReactNativeSdkModule.kt

@@ -9,16 +9,14 @@ import android.app.Activity
 import android.content.Intent
 import android.net.Uri
 import com.facebook.react.bridge.*
-import com.openlogin.core.OpenLogin
+import com.web3auth.core.Web3Auth
 import java.lang.Exception
 import java.util.*
 import com.facebook.react.bridge.WritableMap
 
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter
-import com.openlogin.core.types.LoginParams
-import com.openlogin.core.types.OpenLoginOptions
-import com.openlogin.core.types.OpenLoginResponse
+import com.web3auth.core.types.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -27,24 +25,25 @@ import java8.util.concurrent.CompletableFuture
 // Quick note on allowing RN Modules to receive Activity Events
 // https://stackoverflow.com/questions/45744013/onnewintent-is-not-called-on-reactcontextbasejavamodule-react-native
 
-class OpenloginReactNativeSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
+class OpenloginReactNativeSdkModule(reactContext: ReactApplicationContext) :
+  ReactContextBaseJavaModule(reactContext) {
 
   override fun getName(): String {
     return "OpenloginReactNativeSdk"
   }
 
-  private lateinit var openlogin: OpenLogin
+  private lateinit var openlogin: Web3Auth
 
   @ReactMethod
   fun init(params: ReadableMap, promise: Promise) = try {
     val clientId = params.getString("clientId") as String
     val network = params.getString("network") as String
     val redirectUrl = params.getString("redirectUrl")
-    openlogin = OpenLogin(
-      OpenLoginOptions(
+    openlogin = Web3Auth(
+      Web3AuthOptions(
         context = currentActivity!!,
         clientId = clientId,
-        network = OpenLogin.Network.valueOf(network.toUpperCase(Locale.ROOT)),
+        network = Web3Auth.Network.valueOf(network.toUpperCase(Locale.ROOT)),
         redirectUrl = Uri.parse(redirectUrl ?: "${reactApplicationContext!!.packageName}://auth")
       )
     )
@@ -55,7 +54,7 @@ class OpenloginReactNativeSdkModule(reactContext: ReactApplicationContext) : Rea
       override fun onActivityResult(p0: Activity?, p1: Int, p2: Int, p3: Intent?) {}
 
       override fun onNewIntent(p0: Intent?) {
-               openlogin.setResultUrl(p0?.data)
+        openlogin.setResultUrl(p0?.data)
       }
     })
     promise.resolve(null)
@@ -69,7 +68,23 @@ class OpenloginReactNativeSdkModule(reactContext: ReactApplicationContext) : Rea
 
     CoroutineScope(Dispatchers.Default).launch {
       try {
-        val loginCF = openlogin.login(LoginParams(getOpenLoginProvider(provider)))
+        val loginParams = LoginParams(
+          loginProvider = getWeb3AuthProvider(provider),
+          relogin = if (!params.hasKey("relogin")) null else params.getBoolean("relogin"),
+          dappShare = if (!params.hasKey("dappShare")) null else params.getString("dappShare"),
+          redirectUrl = if (!params.hasKey("redirectUrl")) null else Uri.parse(params.getString("redirectUrl")),
+          appState = if (!params.hasKey("appState")) null else params.getString("appState"),
+          extraLoginOptions = ExtraLoginOptions(
+            login_hint = if (params.hasKey("extraLoginOptions") || params.getMap("extraLoginOptions")
+                ?.hasKey("login_hint") == null || params.getMap("extraLoginOptions")
+                ?.hasKey("login_hint") == true
+            ) params.getMap("extraLoginOptions")?.getString("login_hint") else null
+
+          )
+        )
+        val loginCF = openlogin.login(
+          loginParams,
+        )
         loginCF.join()
         loginCF.whenComplete { result, error ->
           launch(Dispatchers.Main) {
@@ -78,6 +93,7 @@ class OpenloginReactNativeSdkModule(reactContext: ReactApplicationContext) : Rea
             } else {
               val map = Arguments.createMap()
               map.putString("privKey", result.privKey)
+              map.putString("ed25519PrivKey", result.ed25519PrivKey)
               val userInfoMap = Arguments.createMap()
               userInfoMap.putString("email", result.userInfo?.email)
               userInfoMap.putString("name", result.userInfo?.name)
@@ -86,6 +102,7 @@ class OpenloginReactNativeSdkModule(reactContext: ReactApplicationContext) : Rea
               userInfoMap.putString("verifier", result.userInfo?.verifier)
               userInfoMap.putString("verifierId", result.userInfo?.verifierId)
               userInfoMap.putString("typeOfLogin", result.userInfo?.typeOfLogin)
+              userInfoMap.putString("dappShare", result.userInfo?.dappShare)
               map.putMap("userInfo", userInfoMap)
               promise.resolve(map)
             }
@@ -97,47 +114,47 @@ class OpenloginReactNativeSdkModule(reactContext: ReactApplicationContext) : Rea
     }
   }
 
-      @ReactMethod
-      fun logout(params: ReadableMap, promise: Promise) {
-        CoroutineScope(Dispatchers.Default).launch {
-          try {
-            val logoutCF = openlogin.logout()
-            logoutCF.join()
-            logoutCF.whenComplete { _, error ->
-              launch(Dispatchers.Main) {
-                if (error != null) {
-                  promise.reject(error)
-                } else {
-                  promise.resolve(null)
-                }
-              }
+  @ReactMethod
+  fun logout(params: ReadableMap, promise: Promise) {
+    CoroutineScope(Dispatchers.Default).launch {
+      try {
+        val logoutCF = openlogin.logout()
+        logoutCF.join()
+        logoutCF.whenComplete { _, error ->
+          launch(Dispatchers.Main) {
+            if (error != null) {
+              promise.reject(error)
+            } else {
+              promise.resolve(null)
             }
-          } catch (e: Exception) {
-            launch(Dispatchers.Main) { promise.reject(e) }
           }
         }
+      } catch (e: Exception) {
+        launch(Dispatchers.Main) { promise.reject(e) }
       }
+    }
+  }
 
-      fun getOpenLoginProvider(provider: String?): OpenLogin.Provider {
-        return when (provider) {
-          "google" -> OpenLogin.Provider.GOOGLE
-          "facebook" -> OpenLogin.Provider.FACEBOOK
-          "reddit" -> OpenLogin.Provider.REDDIT
-          "discord" -> OpenLogin.Provider.DISCORD
-          "twitch" -> OpenLogin.Provider.TWITCH
-          "apple" -> OpenLogin.Provider.APPLE
-          "line" -> OpenLogin.Provider.LINE
-          "github" -> OpenLogin.Provider.GITHUB
-          "kakao" -> OpenLogin.Provider.KAKAO
-          "linkedin" -> OpenLogin.Provider.LINKEDIN
-          "twitter" -> OpenLogin.Provider.TWITTER
-          "weibo" -> OpenLogin.Provider.WEIBO
-          "wechat" -> OpenLogin.Provider.WECHAT
-          "email_passwordless" -> OpenLogin.Provider.EMAIL_PASSWORDLESS
-
-          else -> OpenLogin.Provider.GOOGLE
-        }
-      }
+  fun getWeb3AuthProvider(provider: String?): Provider {
+    return when (provider) {
+      "google" -> Provider.GOOGLE
+      "facebook" -> Provider.FACEBOOK
+      "reddit" -> Provider.REDDIT
+      "discord" -> Provider.DISCORD
+      "twitch" -> Provider.TWITCH
+      "apple" -> Provider.APPLE
+      "line" -> Provider.LINE
+      "github" -> Provider.GITHUB
+      "kakao" -> Provider.KAKAO
+      "linkedin" -> Provider.LINKEDIN
+      "twitter" -> Provider.TWITTER
+      "weibo" -> Provider.WEIBO
+      "wechat" -> Provider.WECHAT
+      "email_passwordless" -> Provider.EMAIL_PASSWORDLESS
+
+      else -> Provider.GOOGLE
+    }
+  }
 
 }
 

ios/OpenloginReactNativeSdk.swift

@@ -1,10 +1,10 @@
-import OpenLogin
+import Web3Auth
 
 @available(iOS 13.0, *)
 @objc(OpenloginReactNativeSdk)
 class OpenloginReactNativeSdk: NSObject {
 
-    private var openlogin: OpenLogin?
+    private var openlogin: Web3Auth?
 
     @objc(init:withResolver:withRejecter:)
     func `init`(params: [String:String], resolve: RCTPromiseResolveBlock, reject:RCTPromiseRejectBlock) -> Void {
@@ -16,19 +16,32 @@ class OpenloginReactNativeSdk: NSObject {
             reject("ArgumentError", "invalid clientId or network", nil)
             return
         }
-        openlogin = OpenLogin(OLInitParams(clientId: clientId, network: network))
+        openlogin = Web3Auth(W3AInitParams(clientId: clientId, network: network))
         resolve(nil)
     }
 
     @objc(login:withResolver:withRejecter:)
-    func login(params: [String: String], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-        let provider = getOpenLoginProvider(params["provider"])
+    func login(params: [String: Any], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+        let provider = getWeb3AuthProvider(params["provider"] as? String)
+        let relogin = params["relogin"] as? Bool
+        let dappShare = params["dappShare"] as? String
+        let redirectUrl = params["redirectUrl"] as? String
+        let appState = params["appState"] as? String
+        let login_hint = (params["extraLoginOptions"] as? [String: Any?])?["login_hint"] as? String
         if let ol = openlogin {
-            ol.login(OLLoginParams(provider: provider)) {
+            ol.login(W3ALoginParams(
+                loginProvider: provider,
+                relogin: relogin,
+                dappShare: dappShare,
+                extraLoginOptions: login_hint == nil ? nil : ExtraLoginOptions(display: nil, prompt: nil, max_age: nil, ui_locales: nil, id_token_hint: nil, login_hint: login_hint, acr_values: nil, scope: nil, audience: nil, connection: nil, domain: nil, client_id: nil, redirect_uri: nil, leeway: nil, verifierIdField: nil, isVerifierIdCaseSensitive: nil),
+                redirectUrl: redirectUrl,
+                appState: appState
+            )) {
                 switch $0 {
                 case .success(let result):
                     let m: [String: Any] = [
                         "privKey": result.privKey,
+                        "ed25519PrivKey": result.ed25519PrivKey,
                         "userInfo": [
                             "name": result.userInfo.name,
                             "profileImage": result.userInfo.profileImage,
@@ -56,13 +69,13 @@ class OpenloginReactNativeSdk: NSObject {
 
 }
 
-func getOpenLoginProvider(_ str: String?) -> OpenLoginProvider?{
+func getWeb3AuthProvider(_ str: String?) -> Web3AuthProvider?{
     guard
         let unwrappedStr = str
     else {
         return nil
     }
-    let mapping: [String: OpenLoginProvider] = [
+    let mapping: [String: Web3AuthProvider] = [
         "google": .GOOGLE,
         "facebook": .FACEBOOK,
         "reddit": .REDDIT,

openlogin-react-native-sdk.podspec

@@ -16,5 +16,5 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
   s.dependency "React-Core"
-  s.dependency "OpenLogin", '1.0.0'
+  s.dependency "Web3Auth", '3.1.0'
 end