false message when request is invalid

TalaoDAO · Nov 4, 2022 · f96ed2b · f96ed2b
1 parent d4f5b6f
commit f96ed2b
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## 1.0.6
 * default wallet name can be added
+
 ## 1.0.5
 * add types of signing type (Micheline, Operation, Raw)
 * disconnect beacon before connection for android

diff --git a/android/src/main/kotlin/io/altme/beacon/beacon/BeaconPlugin.kt b/android/src/main/kotlin/io/altme/beacon/beacon/BeaconPlugin.kt
@@ -288,9 +288,18 @@ class BeaconPlugin : MethodChannel.MethodCallHandler, EventChannel.StreamHandler
 
     private fun tezosResponse(call: MethodCall, result: Result) {
         val id: String? = call.argument("id")
-        val request = awaitingRequest ?: return
 
-        if (request.id != id) return
+        if (awaitingRequest == null) {
+            result.success(mapOf("success" to false, "message" to "INVALID_REQUEST"))
+            return
+        }   
+
+        val request = awaitingRequest!!
+
+        if (request.id != id) {
+            result.success(mapOf("success" to false, "message" to "INVALID_ID"))
+            return
+        }
 
         CoroutineScope(Dispatchers.IO).launch {
             val response = when (request) {

diff --git a/ios/Classes/BeaconChannelHandler.swift b/ios/Classes/BeaconChannelHandler.swift
@@ -132,10 +132,16 @@ class BeaconChannelHandler: NSObject {
 
 
     func tezosResponse(call: FlutterMethodCall, result: @escaping FlutterResult) {
-        BeaconConnectService.shared.tezosResponse(call:call, completion: { _ in
-            result([
-                "success": true
-            ])
+        BeaconConnectService.shared.tezosResponse(call:call, completion: { (data) in
+            if(data.isSuccess){
+                result([
+                    "success": true
+                ])
+            }else{
+                result([
+                    "success": false
+                ])
+            }
         })
     }
 

diff --git a/ios/Classes/BeaconChannelService.swift b/ios/Classes/BeaconChannelService.swift
@@ -264,10 +264,23 @@ class BeaconConnectService{
     }
 
     func tezosResponse(call: FlutterMethodCall, completion: @escaping Completion<Void>) {
-        // TODO(bibash): compare request.id with awaitingRequest.id
+        let args: NSDictionary = call.arguments as! NSDictionary
+        let id: String = args["id"] as! String
+
+        if (awaitingRequest == nil) {
+            completion(.failure(AppError.INVALID_REQUEST))
+            return
+        }
+
+
         if let request = awaitingRequest {
             awaitingRequest = nil
             do {
+                if (request.id != id) {
+                    completion(.failure(AppError.INVALID_ID))
+                    return
+                }
+
                 beaconClient?.respond(with: try response(call:call, from: request)) { result in
                     switch result {
                     case .success(_):
@@ -493,3 +506,7 @@ extension BroadcastTezosRequest {
 }
 
 
+enum AppError: String, Error {
+    case INVALID_ID
+    case INVALID_REQUEST
+}