Merge pull request #59 from tw-mosip/remove-duplicate-error-handling-…

…on-ios feat(#71): [Tilak] Remove duplicate error handler from ios
mosip · May 17, 2023 · 50fe60f · 50fe60f
2 parents e2f829d + 4a902e3
commit 50fe60f
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 63 deletions.
diff --git a/ios/Exception/ErrorHandler.swift b/ios/Exception/ErrorHandler.swift
@@ -3,7 +3,7 @@ import Foundation
 class ErrorHandler {
     public static var sharedInstance = ErrorHandler()
     private var walletExceptionHandler: WalletExceptionHandler?
-    private var onError: ((_ message: String) -> Void)?
+    private var onError: ((_ message: String, _ code: String) -> Void)?
 
     private init() {}
 
@@ -16,14 +16,14 @@ class ErrorHandler {
         }
     }
 
-    func setOnError(onError: @escaping (_ message: String) -> Void) {
+    func setOnError(onError: @escaping (_ message: String. _ code: String) -> Void) {
         self.onError = onError
         walletExceptionHandler = WalletExceptionHandler(error: self.onError!)
     }
 
     private func handleUnknownException(error: WalletErrorEnum) {
         os_log(.error, "Error in OpenID4vBLE: %{public}@", error.description)
-        self.onError?(error.description)
+        self.onError?(error.description, error.code)
     }
 }
 

diff --git a/ios/Exception/VerifierExceptionHandler.swift b/ios/Exception/VerifierExceptionHandler.swift
@@ -17,4 +17,15 @@ extension VerifierErrorEnum: CustomStringConvertible {
             return "Minimum 512 MTU is required for VC transfer"
         }
     }
+
+    public var code: String {
+           switch self {
+           case .corruptedChunkReceived:
+               return "TVV_TRA_001"
+           case .tooManyFailureChunks:
+               return "TVV_TRA_002"
+           case .unsupportedMTUSizeException:
+               return "TVV_CON_001"
+           }
+       }
 }
diff --git a/ios/Exception/WalletExceptionHandler.swift b/ios/Exception/WalletExceptionHandler.swift
@@ -2,15 +2,15 @@ import Foundation
 
 class WalletExceptionHandler {
 
-    private var onError: ((_ message: String) -> Void)?
+    private var onError: ((_ message: String, _ code: String) -> Void)?
 
-    init(error: (@escaping (String) -> Void)) {
+    init(error: (@escaping (String, String) -> Void)) {
         self.onError = error
     }
 
     func handle(error: WalletErrorEnum) {
         os_log(.error, "Error in OpenID4vBLE: %{public}@", error.description)
-        self.onError?(error.description)
+        self.onError?(error.description, error.code)
     }
 }
 
@@ -28,4 +28,13 @@ extension WalletErrorEnum: CustomStringConvertible {
             return "failed to write response"
         }
     }
+
+    public var code: String {
+           switch self {
+           case .invalidMTUSizeError( _):
+               return "TVW_CON_001"
+           case .responseTransferFailure:
+               return "TVW_REP_001"
+           }
+       }
 }
diff --git a/ios/Openid4vpBle/Error/ErrorHandler.swift b/ios/Openid4vpBle/Error/ErrorHandler.swift
diff --git a/ios/Openid4vpBle/Error/OpenId4vpError.swift b/ios/Openid4vpBle/Error/OpenId4vpError.swift
diff --git a/ios/Openid4vpBle/EventEmitter.swift b/ios/Openid4vpBle/EventEmitter.swift
@@ -31,10 +31,10 @@ class EventEmitter {
         dispatch(name: "EVENT_NEARBY", body: eventData)
     }
 
-    func emitNearbyErrorEvent(message: String, code: Int) {
+    func emitNearbyErrorEvent(message: String, code: String) {
         var eventData: [String: String] = [:]
         eventData["message"] = message
-        eventData["code"] = String(code)
+        eventData["code"] = code
         eventData["type"] = "onError"
 
         dispatch(name: "EVENT_NEARBY", body: eventData)

diff --git a/ios/Openid4vpBle/Openid4vpBle.swift b/ios/Openid4vpBle/Openid4vpBle.swift
@@ -112,7 +112,7 @@ class Openid4vpBle: RCTEventEmitter {
         return false
     }
 
-    fileprivate func handleError(_ message: String, _ code: Int) {
+    fileprivate func handleError(_ message: String, _ code: String) {
         wallet?.handleDestroyConnection(isSelfDisconnect: false)
         EventEmitter.sharedInstance.emitNearbyErrorEvent(message: message, code: code)
     }