@circle-fin/w3s-pw-react-native-sdk 1.0.6 → 1.1.0

package/ios/RnWalletSdk+CustomizeAdapter.swift

@@ -21,7 +21,7 @@ extension RNWalletSdk {
 
     func customizeAdapter(controller: UIViewController) {
 
-        // UI Flow - New PIN
+        // MARK: UI Flow - New PIN
 
         if let controller = controller as? NewPINCodeViewController {
             if let configs = sTextsMap[.newPinCodeHeadline] { // A1
@@ -197,7 +197,7 @@ extension RNWalletSdk {
             }
         }
 
-        // UI Flow - Enter PIN
+        // MARK: UI Flow - Enter PIN
 
         if let controller = controller as? EnterPINCodeViewController {
             if let configs = sTextsMap[.enterPinCodeHeadline] { // A2
@@ -223,7 +223,7 @@ extension RNWalletSdk {
             }
         }
 
-        // UI Flow - Recover PIN
+        // MARK: UI Flow - Recover PIN
 
         if let controller = controller as? RecoverPINCodeViewController {
             if let configs = sTextsMap[.recoverPinCodeHeadline] { // A7
@@ -237,7 +237,7 @@ extension RNWalletSdk {
             }
 
             if let textConfig = self.sTextMap[.circlepw_recover_pincode_error_config] { // C38
-                self.setText(label: controller.errorMessageLabel, textConfig: textConfig)
+                self.setText(label: controller.errorMessageLabel, textConfig: textConfig, shouldReplaceText: false)
             }
 
             DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
@@ -276,7 +276,7 @@ extension RNWalletSdk {
             }
         }
 
-        // UI Flow - Biometrics
+        // MARK: UI Flow - Biometrics
 
         if let controller = controller as? BiometricsPromptViewController {
             if let textConfig = sTextMap[.circlepw_pin_biometrics_allow_title] { // C46
@@ -295,6 +295,177 @@ extension RNWalletSdk {
                 setText(button: controller.dontAskButton, textConfig: textConfig)
             }
         }
+
+        // MARK: UI Flow - Transaction Request
+
+        if let controller = controller as? BaseRequestViewController {
+            if let textConfig = sTextMap[.circlepw_transaction_request_title] { // C63
+                setText(label: controller.baseNaviTitleLabel, textConfig: textConfig)
+            }
+            if let textConfig = sTextMap[.circlepw_transaction_request_subtitle] { // C64
+                setText(label: controller.descriptionLabel, textConfig: textConfig)
+            }
+            if let textConfig = sTextMap[.circlepw_transaction_request_error_config] { // C79
+                setText(label: controller.errorLabel, textConfig: textConfig, shouldReplaceText: false)
+            }
+            if let textConfig = sTextMap[.circlepw_confirm] { // C45
+                setText(button: controller.confirmButton, textConfig: textConfig)
+            }
+        }
+
+        if let controller = controller as? TransactionRequestViewController {
+            if let textConfig = sTextMap[.circlepw_transaction_request_main_currency] { // C65
+                setText(label: controller.currencyLabel, textConfig: textConfig)
+            }
+            if let textConfig = sTextMap[.circlepw_transaction_request_exchange_value] { // C66
+                setText(label: controller.txFiatValueLabel, textConfig: textConfig, shouldReplaceText: false)
+            }
+            if let textConfig = sTextMap[.circlepw_transaction_request_from_label] { // C67
+                setText(label: controller.fromTitleLabel, textConfig: textConfig)
+            }
+            if let textConfig = sTextMap[.circlepw_transaction_request_from] { // C68
+                setText(label: controller.fromLabel, textConfig: textConfig, shouldReplaceText: false)
+            }
+            if let textConfig = sTextMap[.circlepw_transaction_request_to_label] { // C69
+                setText(label: controller.toTitleLabel, textConfig: textConfig)
+            }
+            if let textConfig = sTextMap[.circlepw_transaction_request_to_config] { // C70
+                setText(label: controller.toLabel, textConfig: textConfig, shouldReplaceText: false)
+            }
+            if let textConfig = sTextMap[.circlepw_transaction_request_to_contract_name] { // C71
+                setText(label: controller.toContractNameLabel, textConfig: textConfig, shouldReplaceText: false)
+            }
+            if let textConfig = sTextMap[.circlepw_transaction_request_to_contract_url] { // C72
+                setText(label: controller.toContractURLLabel, textConfig: textConfig, shouldReplaceText: false)
+            }
+            if let textConfig = sTextMap[.circlepw_transaction_request_network_fee_label] { // C73
+                setText(label: controller.feeTitleLabel, textConfig: textConfig)
+            }
+            if let textConfig = sTextMap[.circlepw_transaction_request_network_fee] { // C74
+                setText(label: controller.feeLabel, textConfig: textConfig, shouldReplaceText: false)
+            }
+            if let textConfig = sTextMap[.circlepw_transaction_request_exchange_network_fee] { // C75
+                setText(label: controller.feeFiatValueLabel, textConfig: textConfig, shouldReplaceText: false)
+            }
+            if let textConfig = sTextMap[.circlepw_transaction_request_total_label] { // C76
+                setText(label: controller.totalTitleLabel, textConfig: textConfig)
+            }
+            if let textConfig = sTextMap[.circlepw_transaction_request_total_config] { // C77
+                setText(label: controller.totalLabel, textConfig: textConfig, shouldReplaceText: false)
+            }
+            if let textConfig = sTextMap[.circlepw_transaction_request_exchange_total_value] { // C78
+                setText(label: controller.totalFiatValueLabel, textConfig: textConfig, shouldReplaceText: false)
+            }
+
+        }
+
+        if let controller = controller as? FeeTipViewController {
+            if let textConfig = sTextMap[.circlepw_transaction_request_fee_tip] { // C80
+                setText(label: controller.descriptionLabel, textConfig: textConfig)
+            }
+        }
+
+        // MARK: UI Flow - Raw Transaction Request
+
+        if let controller = controller as? RawTransactionRequestViewController {
+            if let textConfig = sTextMap[.circlepw_transaction_request_raw_tx_description] { // C89
+                setText(label: controller.rawTxTitleLabel, textConfig: textConfig)
+            }
+            if let textConfig = sTextMap[.circlepw_transaction_request_raw_tx_config] { // C90
+                setText(label: controller.rawTxLabel, textConfig: textConfig, shouldReplaceText: false)
+            }
+        }
+
+        // MARK: UI Flow - Contract Interaction Request
+
+        if let controller = controller as? ContractRequestViewController {
+            if let textConfig = sTextMap[.circlepw_contract_interaction_title] { // C?
+                setText(label: controller.baseNaviTitleLabel, textConfig: textConfig)
+            }
+            if let textConfig = sTextMap[.circlepw_contract_interaction_subtitle] { // C?
+                setText(label: controller.descriptionLabel, textConfig: textConfig)
+            }
+            if let textConfig = sTextMap[.circlepw_contract_interaction_contract_address_label] { // C81
+                setText(label: controller.contractAddressTitleLabel, textConfig: textConfig)
+            }
+            if let textConfig = sTextMap[.circlepw_contract_interaction_contract_address_config] { // C82
+                setText(label: controller.contractAddressLabel, textConfig: textConfig, shouldReplaceText: false)
+            }
+            if let textConfig = sTextMap[.circlepw_contract_interaction_data_details] { // C83
+                setText(label: controller.dataDetailsLabel, textConfig: textConfig)
+            }
+            if let textConfig = sTextMap[.circlepw_contract_interaction_abi_function_label] { // C84
+                setText(label: controller.abiFunctionTitleLabel, textConfig: textConfig)
+            }
+            if let textConfig = sTextMap[.circlepw_contract_interaction_abi_function_config] { // C85
+                setText(label: controller.abiFunctionLabel, textConfig: textConfig, shouldReplaceText: false)
+            }
+            if let textConfig = sTextMap[.circlepw_contract_interaction_abi_parameter_label] { // C86
+                setText(label: controller.abiParameterTitleLabel, textConfig: textConfig)
+            }
+            if let textConfig = sTextMap[.circlepw_contract_interaction_call_data_label] { // C87
+                setText(label: controller.callDataTitleLabel, textConfig: textConfig)
+            }
+            if let textConfig = sTextMap[.circlepw_contract_interaction_call_data_config] { // C88
+                setText(label: controller.abiParameterLabel, textConfig: textConfig, shouldReplaceText: false)
+                setText(label: controller.callDataLabel, textConfig: textConfig, shouldReplaceText: false)
+            }
+        }
+
+        // MARK: UI Flow - Signature Request
+
+        if let controller = controller as? SignatureRequestViewController {
+            if let textConfig = sTextMap[.circlepw_signature_request_title] { // C91
+                setText(label: controller.titleLabel, textConfig: textConfig)
+            }
+            if let textConfig = sTextMap[.circlepw_signature_request_contract_name] { // C92
+                setText(label: controller.contractNameLabel, textConfig: textConfig, shouldReplaceText: false)
+            }
+            if let textConfig = sTextMap[.circlepw_signature_request_contract_url] { // C93
+                setText(label: controller.contractURLLabel, textConfig: textConfig, shouldReplaceText: false)
+            }
+            if let textConfig = sTextMap[.circlepw_signature_request_subtitle] { // C94
+                setText(label: controller.subtitleLabel, textConfig: textConfig)
+            }
+            if let textConfig = sTextMap[.circlepw_signature_request_description] { // C95
+                setText(label: controller.descriptionLabel, textConfig: textConfig)
+            }
+            if let textConfig = sTextMap[.circlepw_signature_request_msg_config] { // C96
+                setText(label: controller.messageLabel, textConfig: textConfig, shouldReplaceText: false)
+            }
+            if let textConfig = sTextMap[.circlepw_confirm] { // C45
+                setText(button: controller.confirmButton, textConfig: textConfig)
+            }
+        }
+
+        // MARK: UI Flow - Email OTP
+
+        if let controller = controller as? EmailOTPViewController {
+            if let textConfig = sTextMap[.circlepw_email_otp_title] { // C99
+                setText(label: controller.baseNaviTitleLabel, textConfig: textConfig)
+            }
+            if let textConfig1 = sTextMap[.circlepw_email_otp_description],
+               let textConfig2 = sTextMap[.circlepw_email_otp_email] { // C100, C101
+                var textConfig = textConfig1
+                if let text2 = textConfig2.text {
+                    textConfig.text?.append(" ")
+                    textConfig.text?.append(text2)
+                }
+                setText(label: controller.descriptionLabel, textConfig: textConfig)
+            }
+            if let textConfig = sTextMap[.circlepw_email_otp_head_config] { // C102
+                setText(label: controller.otpHeadLabel, textConfig: textConfig, shouldReplaceText: false)
+            }
+            if let textConfig = sTextMap[.circlepw_email_otp_dash] { // C103
+                setText(label: controller.otpDashLabel, textConfig: textConfig)
+            }
+            if let textConfig = sTextMap[.circlepw_email_otp_send_again_hint] { // C104
+                setText(label: controller.sendAgainHintLabel, textConfig: textConfig)
+            }
+            if let textConfig = sTextMap[.circlepw_email_otp_send_again] { // C105
+                setText(button: controller.sendAgainButton, textConfig: textConfig)
+            }
+        }
     }
 }
 

package/ios/RnWalletSdk.swift

@@ -76,21 +76,21 @@ public class RNWalletSdk: NSObject {
         DispatchQueue.main.async {
             WalletSdk.shared.execute(userToken: userToken,
                                      encryptionKey: encryptionKey,
-                                     challengeIds: challengeIdArr) { response in
-                switch response.result {
-                case .success(let result):
-                    self._handleSuccessResult(result: result,
-                                              onWarning: response.onWarning,
-                                              controller: response.onErrorController,
+                                     challengeIds: challengeIdArr) { executeCompletion in
+                switch executeCompletion.result {
+                case .success(let executeResult):
+                    self._handleExecuteResult(result: executeResult,
+                                              onWarning: executeCompletion.onWarning,
+                                              controller: executeCompletion.onErrorController,
                                               resolve: resolve)
 
                 case .failure(let error):
                     self._handleErrorResult(error: error,
-                                            controller: response.onErrorController,
+                                            controller: executeCompletion.onErrorController,
                                             reject: reject)
                 }
 
-                // TODO: Remove cache controller for different use cases
+                // Remove cache controller
                 self.sdkNavigationController = nil
             }
         }
@@ -102,32 +102,7 @@ public class RNWalletSdk: NSObject {
                                             challengeIds: NSArray,
                                             resolve: @escaping RCTPromiseResolveBlock,
                                             reject: @escaping RCTPromiseRejectBlock) {
-        guard let challengeIdArr = challengeIds as? [String] else {
-            reject(nil, "[unknown format] challengeIds", nil)
-            return
-        }
-
-        DispatchQueue.main.async {
-            WalletSdk.shared.executeWithUserSecret(userToken: userToken,
-                                                   encryptionKey: encryptionKey,
-                                                   userSecret: userSecret,
-                                                   challengeIds: challengeIdArr) { response in
-                switch response.result {
-                case .success(let result):
-                    self._handleSuccessResult(result: result,
-                                              onWarning: response.onWarning,
-                                              controller: response.onErrorController,
-                                              resolve: resolve)
-
-                case .failure(let error):
-                    self._handleErrorResult(error: error,
-                                            controller: response.onErrorController,
-                                            reject: reject)
-                }
-
-                self.sdkNavigationController = nil
-            }
-        }
+        reject(nil, "executeWithUserSecret func deprecated", nil)
     }
 
     @objc public func setBiometricsPin(_ userToken: String,
@@ -136,71 +111,81 @@ public class RNWalletSdk: NSObject {
                                        reject: @escaping RCTPromiseRejectBlock) {
 
         DispatchQueue.main.async {
-            WalletSdk.shared.setBiometricsPin(userToken: userToken, encryptionKey: encryptionKey) { response in
-                switch response.result {
-                case .success(let result):
-                    self._handleSuccessResult(result: result,
-                                              onWarning: response.onWarning,
-                                              controller: response.onErrorController,
+            WalletSdk.shared.setBiometricsPin(userToken: userToken, encryptionKey: encryptionKey) { executeCompletion in
+                switch executeCompletion.result {
+                case .success(let executeResult):
+                    self._handleExecuteResult(result: executeResult,
+                                              onWarning: executeCompletion.onWarning,
+                                              controller: executeCompletion.onErrorController,
                                               resolve: resolve)
 
                 case .failure(let error):
                     self._handleErrorResult(error: error,
-                                            controller: response.onErrorController,
+                                            controller: executeCompletion.onErrorController,
                                             reject: reject)
                 }
             }
         }
     }
 
-    private func _handleSuccessResult(result: ExecuteResult,
-                                      onWarning: ExecuteWarning?,
-                                      controller: UIViewController?,
-                                      resolve: @escaping RCTPromiseResolveBlock) {
-        let challengeStatus = result.status.rawValue
-        let challengeType = result.resultType.rawValue
-        var dismiss = false
-        var dict: [String: Any] = [
-            "result": [
-                "status": challengeStatus,
-                "resultType": challengeType,
-                "data": [
-                    "signature": result.data?.signature
-                ]
-            ]
-        ]
+    @objc public func performLogin(provider: String,
+                                   deviceToken: String,
+                                   encryptionKey: String,
+                                   resolve: @escaping RCTPromiseResolveBlock,
+                                   reject: @escaping RCTPromiseRejectBlock) {
+        guard let socialProvider = SocialProvider(rawValue: provider) else {
+            reject(nil, "[unknown format] invalid provider string", nil)
+            return
+        }
+        DispatchQueue.main.async {
+            WalletSdk.shared.performLogin(provider: socialProvider,
+                                          deviceToken: deviceToken,
+                                          encryptionKey: encryptionKey) { loginCompletion in
+                switch loginCompletion.result {
+                case .success(let loginResult):
+                    self._handleLoginResult(result: loginResult, resolve: resolve)
 
-        if let onWarning = onWarning {
-            dict["warning"] = [
-                "warningType": onWarning.warningType.rawValue,
-                "warningString": onWarning.warningString
-            ]
-            dismiss = self.sDismissOnCallbackMap[onWarning.warningType.rawValue] == true
+                case .failure(let error):
+                    reject(String(error.errorCode.rawValue), error.displayString, error)
+                }
+            }
         }
+    }
 
-        if dismiss {
-            controller?.dismiss(animated: true)
-            resolve(dict)
+    @objc public func verifyOTP(deviceToken: String,
+                                encryptionKey: String,
+                                otpToken: String,
+                                resolve: @escaping RCTPromiseResolveBlock,
+                                reject: @escaping RCTPromiseRejectBlock) {
 
-        } else {
-            EventEmitter.sharedInstance.dispatch(name: "CirclePwOnSuccess", body: dict)
+        DispatchQueue.main.async {
+            WalletSdk.shared.verifyOTP(deviceToken: deviceToken,
+                                       encryptionKey: encryptionKey,
+                                       otpToken: otpToken) { loginCompletion in
+                switch loginCompletion.result {
+                case .success(let loginResult):
+                    self._handleLoginResult(result: loginResult, resolve: resolve)
+
+                case .failure(let error):
+                    self._handleErrorResult(error: error,
+                                            controller: loginCompletion.onErrorController,
+                                            reject: reject)
+                }
+            }
         }
     }
 
-    private func _handleErrorResult(error: ApiError,
-                                    controller: UIViewController?,
+    @objc public func performLogout(provider: String,
+                                    resolve: @escaping RCTPromiseResolveBlock,
                                     reject: @escaping RCTPromiseRejectBlock) {
-
-        if self.sDismissOnCallbackMap[error.errorCode.rawValue] == true {
-            controller?.dismiss(animated: true)
-            reject(String(error.errorCode.rawValue), error.displayString, error)
-
-        } else {
-            let dict: [String: Any] = [
-                "code": String(error.errorCode.rawValue),
-                "message": error.displayString
-            ]
-            EventEmitter.sharedInstance.dispatch(name: "CirclePwOnError", body: dict)
+        guard let socialProvider = SocialProvider(rawValue: provider) else {
+            reject(nil, "[unknown format] invalid provider string", nil)
+            return
+        }
+        DispatchQueue.main.async {
+            WalletSdk.shared.performLogout(provider: socialProvider) { _ in
+                resolve(nil)
+            }
         }
     }
 
@@ -318,3 +303,83 @@ extension RNWalletSdk: WalletSdkLayoutProvider {
         return ImageStore(local: sLocal, remote: sRemote)
     }
 }
+
+private extension RNWalletSdk {
+
+    func _handleExecuteResult(result: ExecuteResult,
+                              onWarning: ExecuteWarning?,
+                              controller: UIViewController?,
+                              resolve: @escaping RCTPromiseResolveBlock) {
+        let challengeStatus = result.status.rawValue
+        let challengeType = result.resultType.rawValue
+        var dismiss = false
+        var dict: [String: Any] = [
+            "result": [
+                "status": challengeStatus,
+                "resultType": challengeType,
+                "data": [
+                    "signature": result.data?.signature
+                ]
+            ]
+        ]
+
+        if let onWarning = onWarning {
+            dict["warning"] = [
+                "warningType": onWarning.warningType.rawValue,
+                "warningString": onWarning.warningString
+            ]
+            dismiss = self.sDismissOnCallbackMap[onWarning.warningType.rawValue] == true
+        }
+
+        if dismiss {
+            controller?.dismiss(animated: true)
+            resolve(dict)
+
+        } else {
+            EventEmitter.sharedInstance.dispatch(name: "CirclePwOnSuccess", body: dict)
+        }
+    }
+
+    func _handleLoginResult(result: LoginResult,
+                            resolve: @escaping RCTPromiseResolveBlock) {
+        
+        var oauthInfoDict: [String: Any]?
+        if let oauthInfo = result.oauthInfo {
+            oauthInfoDict = [
+                "provider": oauthInfo.provider,
+                "scope": oauthInfo.scope as Any,
+                "socialUserUUID": oauthInfo.socialUserUUID,
+                "socialUserInfo": [
+                    "name": oauthInfo.socialUserInfo?.name,
+                    "email": oauthInfo.socialUserInfo?.email,
+                    "phone": oauthInfo.socialUserInfo?.phone,
+                ]
+            ]
+        }
+        let dict: [String: Any] = [
+            "userToken": result.userToken,
+            "encryptionKey": result.encryptionKey,
+            "refreshToken": result.refreshToken,
+            "oauthInfo": oauthInfoDict as Any
+        ]
+
+        resolve(dict)
+    }
+
+    func _handleErrorResult(error: ApiError,
+                            controller: UIViewController?,
+                            reject: @escaping RCTPromiseRejectBlock) {
+
+        if self.sDismissOnCallbackMap[error.errorCode.rawValue] == true {
+            controller?.dismiss(animated: true)
+            reject(String(error.errorCode.rawValue), error.displayString, error)
+
+        } else {
+            let dict: [String: Any] = [
+                "code": String(error.errorCode.rawValue),
+                "message": error.displayString
+            ]
+            EventEmitter.sharedInstance.dispatch(name: "CirclePwOnError", body: dict)
+        }
+    }
+}