🔄 synced file(s) with circlefin/w3s-react-native-sdk-internal (#12)

Author: superandydong

README.md

@@ -15,15 +15,15 @@ curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash
 Create a Personal Access Token in your [GitHub setting](https://github.com/settings/tokens). Use `Configure SSO` button next to your created token to authorize `circlefin` organization. More instruction can be found [here](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens). Then, log in to `npm` on your terminal.
 
 ```bash
-npm login --scope=@OWNER --registry=https://npm.pkg.github.com
+npm login --scope=@OWNER --registry=https://registry.npmjs.org
 ```
 This will ask you to submit your GitHub personal access token as below.
 Check below links for creating GitHub PAT:
 - [Creating a fine-grained personal access token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens#creating-a-fine-grained-personal-access-token)
 - [Creating a personal access token (classic)](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens#creating-a-personal-access-token-classic)
 
 ```properties
-npm notice Log in on https://npm.pkg.github.com/
+npm notice Log in on https://registry.npmjs.org/
 Username: <insert your GitHub username here>
 Password: <insert your GitHub personal access token here>
 ```
@@ -79,7 +79,7 @@ pwsdk.maven.password=<GITHUB_PAT>
 Add below links at tne top of `ios/Podfile`:
 ```ruby
 source 'https://github.com/circlefin/w3s-ios-sdk.git'
-source 'https://cdn.cocoapods.org/'
+source 'https://github.com/CocoaPods/Specs.git'
 
 platform :ios, '13.4'
 ```

android/build.gradle

@@ -126,7 +126,7 @@ dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "circle.programmablewallet:sdk:1.0.+"
+  implementation "circle.programmablewallet:sdk:1.0.1059"
   implementation 'com.github.bumptech.glide:glide:4.14.2'
 }
 

android/src/main/java/com/circlefin/programmablewalletrnsdk/BridgeHelper.kt

@@ -27,6 +27,7 @@ import circle.programmablewallet.sdk.presentation.Resource
 import circle.programmablewallet.sdk.presentation.SecurityQuestion
 import circle.programmablewallet.sdk.presentation.SettingsManagement
 import circle.programmablewallet.sdk.presentation.TextConfig
+import com.circlefin.programmablewalletrnsdk.annotation.ExcludeFromGeneratedCCReport
 import com.circlefin.programmablewalletrnsdk.pwcustom.RnImageSetter
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReadableArray
@@ -38,9 +39,12 @@ import java.lang.reflect.Modifier
 object BridgeHelper {
   private val TAG = BridgeHelper::class.java.simpleName
   val typefaceMap: MutableMap<String?, Typeface?> = HashMap()
+  @ExcludeFromGeneratedCCReport
   var questionsForTest: Array<SecurityQuestion?>? = null
+  @ExcludeFromGeneratedCCReport
   var dismissOnCallbackForTest: MutableMap<Int, Boolean>? = null
 
+  @ExcludeFromGeneratedCCReport
   fun objectToMap(obj: ExecuteWarning?): WritableMap {
     val map = Arguments.createMap()
     obj ?: return map
@@ -49,6 +53,7 @@ object BridgeHelper {
     return map
   }
 
+  @ExcludeFromGeneratedCCReport
   fun objectToMap(obj: ApiError?): WritableMap {
     val map = Arguments.createMap()
     obj ?: return map
@@ -57,6 +62,7 @@ object BridgeHelper {
     return map
   }
 
+  @ExcludeFromGeneratedCCReport
   @JvmStatic
   fun objectToMap(obj: Any?): WritableMap {
     val map = Arguments.createMap()
@@ -101,6 +107,7 @@ object BridgeHelper {
     return map
   }
 
+  @ExcludeFromGeneratedCCReport
   private fun objectToArray(array: Any?): WritableArray {
     val arr = Arguments.createArray()
     array ?: return arr
@@ -204,7 +211,7 @@ object BridgeHelper {
   fun getSettingsManagement(rnMap: ReadableMap?): SettingsManagement? {
     rnMap ?: return null
     val settingsMap = safeGetMap(rnMap, "settingsManagement") ?: return null
-    return SettingsManagement(safeGetBoolean(settingsMap, "enableBiometricsPin"), safeGetBoolean(settingsMap, "disableConfirmationUI"))
+    return SettingsManagement(safeGetBoolean(settingsMap, "enableBiometricsPin"))
   }
 
   private fun safeGetBoolean(map: ReadableMap, key: String): Boolean{

android/src/main/java/com/circlefin/programmablewalletrnsdk/ProgrammablewalletRnSdkModule.kt

@@ -19,13 +19,14 @@ import android.app.ActivityManager
 import android.content.Context
 import circle.programmablewallet.sdk.WalletSdk
 import circle.programmablewallet.sdk.WalletSdk.execute
-import circle.programmablewallet.sdk.WalletSdk.executeWithUserSecret
 import circle.programmablewallet.sdk.WalletSdk.init
 import circle.programmablewallet.sdk.WalletSdk.setLayoutProvider
 import circle.programmablewallet.sdk.WalletSdk.setSecurityQuestions
 import circle.programmablewallet.sdk.WalletSdk.setViewSetterProvider
 import circle.programmablewallet.sdk.api.ExecuteEvent
+import circle.programmablewallet.sdk.api.SocialProvider
 import circle.programmablewallet.sdk.presentation.EventListener
+import com.circlefin.programmablewalletrnsdk.annotation.ExcludeFromGeneratedCCReport
 import com.circlefin.programmablewalletrnsdk.pwcustom.RnLayoutProvider
 import com.circlefin.programmablewalletrnsdk.pwcustom.RnViewSetterProvider
 import com.facebook.react.bridge.Arguments
@@ -51,6 +52,7 @@ class ProgrammablewalletRnSdkModule internal constructor(context: ReactApplicati
     setViewSetterProvider(viewSetterProvider)
   }
 
+  @ExcludeFromGeneratedCCReport
   override fun getName(): String {
     return NAME
   }
@@ -103,9 +105,10 @@ class ProgrammablewalletRnSdkModule internal constructor(context: ReactApplicati
   @ReactMethod
   override fun setDismissOnCallbackMap(readableMap: ReadableMap) {
     val map = BridgeHelper.getDismissOnCallbackMap(readableMap)
-    PromiseCallback.setDismissOnCallbackMap(map)
+    setDismissOnCallbackMap(map)
   }
 
+  @ExcludeFromGeneratedCCReport
   @ReactMethod
   override fun moveRnTaskToFront() {
     currentActivity?.let {
@@ -119,6 +122,7 @@ class ProgrammablewalletRnSdkModule internal constructor(context: ReactApplicati
     }
   }
 
+  @ExcludeFromGeneratedCCReport
   @ReactMethod
   override fun moveTaskToFront() {
     WalletSdk.moveTaskToFront(reactContext)
@@ -177,50 +181,78 @@ class ProgrammablewalletRnSdkModule internal constructor(context: ReactApplicati
       PromiseCallback(promise, reactContext)
     )
   }
-
+  @ExcludeFromGeneratedCCReport
   @ReactMethod
-  override fun executeWithUserSecret(
+  override fun setBiometricsPin(
     userToken: String?,
     secretKey: String?,
-    userSecret: String?,
-    challengeIdArr: ReadableArray,
     promise: Promise?
   ) {
-    val challengeIds = arrayOfNulls<String>(challengeIdArr.size())
-    for (i in challengeIds.indices) {
-      challengeIds[i] = challengeIdArr.getString(i)
-    }
-    executeWithUserSecret(
+    WalletSdk.setBiometricsPin(
       currentActivity,
       userToken,
       secretKey,
-      userSecret,
-      challengeIds,
       PromiseCallback(promise, reactContext)
     )
   }
 
   @ReactMethod
-  override fun setBiometricsPin(
-    userToken: String?,
-    secretKey: String?,
-    promise: Promise?
+  override fun performLogin(
+    provider: String,
+    deviceToken: String,
+    deviceEncryptionKey: String,
+    promise: Promise
   ) {
-    WalletSdk.setBiometricsPin(
+    WalletSdk.performLogin(
       currentActivity,
-      userToken,
-      secretKey,
-      PromiseCallback(promise, reactContext)
+      SocialProvider.valueOf(provider),
+      deviceToken,
+      deviceEncryptionKey,
+      PromiseSocialCallback(promise)
+    )
+  }
+
+  @ReactMethod
+  override fun verifyOTP(
+    otpToken: String,
+    deviceToken: String,
+    deviceEncryptionKey: String,
+    promise: Promise
+  ) {
+    WalletSdk.verifyOTP(
+      currentActivity,
+      otpToken,
+      deviceToken,
+      deviceEncryptionKey,
+      PromiseCallback2(promise, reactContext)
     )
   }
 
+  @ReactMethod
+  override fun performLogout(
+    provider: String,
+    promise: Promise
+  ) {
+
+    WalletSdk.performLogout(
+      currentActivity,
+      SocialProvider.valueOf(provider),
+      PromiseLogoutCallback(promise)
+    )
+  }
   companion object {
     const val NAME = "ProgrammablewalletRnSdk"
     const val EVENT_NAME_ON_EVENT = "CirclePwOnEvent"
     const val EVENT_NAME_ON_SUCCESS = "CirclePwOnSuccess"
     const val EVENT_NAME_ON_ERROR = "CirclePwOnError"
+    val dismissOnCallbackMap: MutableMap<Int, Boolean> = HashMap()
+    fun setDismissOnCallbackMap(map: Map<Int, Boolean>) {
+      dismissOnCallbackMap.clear()
+      dismissOnCallbackMap.putAll(map)
+    }
   }
 
+  @ExcludeFromGeneratedCCReport
   override fun onEvent(event: ExecuteEvent) {
     reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
       .emit(EVENT_NAME_ON_EVENT, event.name)

android/src/main/java/com/circlefin/programmablewalletrnsdk/PromiseCallback.kt

@@ -20,6 +20,7 @@ import circle.programmablewallet.sdk.api.ApiError
 import circle.programmablewallet.sdk.api.Callback
 import circle.programmablewallet.sdk.api.ExecuteWarning
 import com.circlefin.programmablewalletrnsdk.BridgeHelper.objectToMap
+import com.circlefin.programmablewalletrnsdk.annotation.ExcludeFromGeneratedCCReport
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
@@ -30,10 +31,12 @@ class PromiseCallback<R> internal constructor(
   private val context: ReactApplicationContext
 ) : Callback<R> {
   private var result: R? = null
+
+  @ExcludeFromGeneratedCCReport
   override fun onError(error: Throwable): Boolean {
     Log.w(TAG, "onError: ", error)
     if (error is ApiError) {
-      val isDismiss = java.lang.Boolean.TRUE == dismissOnCallbackMap[error.code.value]
+      val isDismiss = java.lang.Boolean.TRUE == ProgrammablewalletRnSdkModule.dismissOnCallbackMap[error.code.value]
       if (isDismiss) {
         promise?.reject(error.code.value.toString(), error.message, error)
       } else {
@@ -57,8 +60,9 @@ class PromiseCallback<R> internal constructor(
     promise.resolve(map)
   }
 
+  @ExcludeFromGeneratedCCReport
   override fun onWarning(warning: ExecuteWarning, result: R?): Boolean {
-    val isDismiss = java.lang.Boolean.TRUE == dismissOnCallbackMap[warning.warningType]
+    val isDismiss = java.lang.Boolean.TRUE == ProgrammablewalletRnSdkModule.dismissOnCallbackMap[warning.warningType]
     val map = Arguments.createMap()
     if (result == null) {
       map.putMap("result", objectToMap(this.result))
@@ -80,10 +84,5 @@ class PromiseCallback<R> internal constructor(
 
   companion object {
     private val TAG = PromiseCallback::class.java.simpleName
-    val dismissOnCallbackMap: MutableMap<Int, Boolean> = HashMap()
-    fun setDismissOnCallbackMap(map: Map<Int, Boolean>) {
-      dismissOnCallbackMap.clear()
-      dismissOnCallbackMap.putAll(map)
-    }
   }
 }

android/src/main/java/com/circlefin/programmablewalletrnsdk/PromiseCallback2.kt

@@ -0,0 +1,65 @@
+// Copyright (c) 2024, Circle Internet Financial, LTD. All rights reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package com.circlefin.programmablewalletrnsdk
+
+import android.util.Log
+import circle.programmablewallet.sdk.api.ApiError
+import circle.programmablewallet.sdk.api.Callback
+import circle.programmablewallet.sdk.api.Callback2
+import circle.programmablewallet.sdk.api.ExecuteWarning
+import com.circlefin.programmablewalletrnsdk.BridgeHelper.objectToMap
+import com.circlefin.programmablewalletrnsdk.annotation.ExcludeFromGeneratedCCReport
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.Promise
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.modules.core.DeviceEventManagerModule
+
+class PromiseCallback2<R> internal constructor(
+  private val promise: Promise?,
+  private val context: ReactApplicationContext
+) : Callback2<R> {
+
+  @ExcludeFromGeneratedCCReport
+  override fun onError(error: Throwable): Boolean {
+    Log.w(TAG, "onError: ", error)
+    if (error is ApiError) {
+      val isDismiss = java.lang.Boolean.TRUE == ProgrammablewalletRnSdkModule.dismissOnCallbackMap[error.code.value]
+      if (isDismiss) {
+        promise?.reject(error.code.value.toString(), error.message, error)
+      } else {
+        val map = objectToMap(error)
+        context.getJSModule(
+          DeviceEventManagerModule.RCTDeviceEventEmitter::class.java
+        )
+          .emit(ProgrammablewalletRnSdkModule.EVENT_NAME_ON_ERROR, map)
+      }
+      return !isDismiss
+    } else {
+      promise?.reject(RuntimeException(error.message))
+    }
+    return false
+  }
+
+  @ExcludeFromGeneratedCCReport
+  override fun onResult(result: R) {
+    promise ?: return
+    promise.resolve(objectToMap(result))
+  }
+
+  companion object {
+    private val TAG = PromiseCallback2::class.java.simpleName
+  }
+}

android/src/main/java/com/circlefin/programmablewalletrnsdk/PromiseLogoutCallback.kt

@@ -0,0 +1,47 @@
+// Copyright (c) 2024, Circle Internet Financial, LTD. All rights reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package com.circlefin.programmablewalletrnsdk
+
+import android.util.Log
+import circle.programmablewallet.sdk.api.ApiError
+import circle.programmablewallet.sdk.api.LogoutCallback
+import com.circlefin.programmablewalletrnsdk.annotation.ExcludeFromGeneratedCCReport
+import com.facebook.react.bridge.Promise
+
+class PromiseLogoutCallback internal constructor(
+  private val promise: Promise?,
+) : LogoutCallback {
+
+  @ExcludeFromGeneratedCCReport
+  override fun onError(error: Throwable) {
+    Log.w(TAG, "onError: ", error)
+    if (error is ApiError) {
+      promise?.reject(error.code.value.toString(), error.message, error)
+    } else {
+      promise?.reject(RuntimeException(error.message))
+    }
+  }
+
+  override fun onComplete() {
+    promise ?: return
+    promise.resolve(null)
+  }
+
+
+  companion object {
+    private val TAG = PromiseLogoutCallback::class.java.simpleName
+  }
+}