fix(analytics): improve logTransaction iOS implementation (#968)

Author: robingenz

packages/analytics/ios/Plugin/FirebaseAnalytics.swift

@@ -7,7 +7,11 @@ import FirebaseAnalytics
 
 @objc public class FirebaseAnalytics: NSObject {
 
-    override init() {
+    private let plugin: FirebaseAnalyticsPlugin
+
+    init(plugin: FirebaseAnalyticsPlugin) {
+        self.plugin = plugin
+        super.init()
         if FirebaseApp.app() == nil {
             FirebaseApp.configure()
         }
@@ -62,22 +66,23 @@ import FirebaseAnalytics
     }
 
     @available(iOS 15.0, *)
-    public func logTransaction(transactionId: String) async throws {
-        guard let id = UInt64(transactionId) else {
-            throw NSError(domain: "FirebaseAnalytics", code: 0, userInfo: [NSLocalizedDescriptionKey: "Invalid transaction identifier."])
-        }
-        var matchedTransaction: Transaction?
-        for await result in Transaction.all {
-            let transaction = FirebaseAnalyticsHelper.getTransaction(from: result)
-            if transaction.id == id {
-                matchedTransaction = transaction
-                break
+    public func logTransaction(transactionId: UInt64, completion: @escaping (String?) -> Void) {
+        Task {
+            var matchedTransaction: Transaction?
+            for await result in Transaction.all {
+                let transaction = FirebaseAnalyticsHelper.getTransaction(from: result)
+                if transaction.id == transactionId {
+                    matchedTransaction = transaction
+                    break
+                }
             }
+            guard let transaction = matchedTransaction else {
+                completion(self.plugin.errorTransactionNotFound)
+                return
+            }
+            Analytics.logTransaction(transaction)
+            completion(nil)
         }
-        guard let transaction = matchedTransaction else {
-            throw NSError(domain: "FirebaseAnalytics", code: 0, userInfo: [NSLocalizedDescriptionKey: "Transaction not found."])
-        }
-        Analytics.logTransaction(transaction)
     }
 
     @objc public func initiateOnDeviceConversionMeasurement(email: String) {

packages/analytics/ios/Plugin/FirebaseAnalyticsPlugin.swift

@@ -36,6 +36,8 @@ public class FirebaseAnalyticsPlugin: CAPPlugin, CAPBridgedPlugin {
     public let errorConsentTypeMissing = "consentType must be provided."
     public let errorConsentStatusMissing = "consentStatus must be provided."
     public let errorTransactionIdMissing = "transactionId must be provided."
+    public let errorInvalidTransactionId = "transactionId is not a valid numeric identifier."
+    public let errorTransactionNotFound = "Transaction not found."
     public let errorEmailAddressMissing = "emailAddress must be provided."
     public let errorInvalidEmailFormat = "Invalid email format. Please provide a valid email address."
     public let errorPhoneNumberMissing = "phoneNumber must be provided."
@@ -45,7 +47,7 @@ public class FirebaseAnalyticsPlugin: CAPPlugin, CAPBridgedPlugin {
     private var implementation: FirebaseAnalytics?
 
     override public func load() {
-        implementation = FirebaseAnalytics()
+        implementation = FirebaseAnalytics(plugin: self)
     }
 
     @objc func getAppInstanceId(_ call: CAPPluginCall) {
@@ -132,17 +134,20 @@ public class FirebaseAnalyticsPlugin: CAPPlugin, CAPBridgedPlugin {
             call.reject(errorTransactionIdMissing)
             return
         }
+        guard let transactionIdUInt64 = UInt64(transactionId) else {
+            call.reject(errorInvalidTransactionId)
+            return
+        }
         if #available(iOS 15.0, *) {
-            Task {
-                do {
-                    try await implementation?.logTransaction(transactionId: transactionId)
+            implementation?.logTransaction(transactionId: transactionIdUInt64) { errorMessage in
+                if let errorMessage = errorMessage {
+                    call.reject(errorMessage)
+                } else {
                     call.resolve()
-                } catch {
-                    call.reject(error.localizedDescription)
                 }
             }
         } else {
-            call.unimplemented("Not implemented on iOS < 15.0.")
+            call.unavailable("Not available on iOS < 15.0.")
         }
     }