Fix invalid mapping for connection info in CourierEvent

gojek · Dec 20, 2023 · cdf13df · cdf13df
1 parent 94b33ba
commit cdf13df
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/courier_dart_sdk/ios/Classes/EventHandler.swift b/courier_dart_sdk/ios/Classes/EventHandler.swift
@@ -211,19 +211,17 @@ final class EventHandler: ICourierEventHandler {
     }
 
     private func injectConnectionInfoAndSendEvent(eventMap: [String: Any], event: CourierEvent) {
-        if var props = eventMap["properties"] as? [String: Any],
-           let connectionInfo =
+        if let connectionInfo =
             event.connectionInfo {
-            props["connectionInfo"] = [
+            var _eventMap = eventMap
+            _eventMap["connectionInfo"] = [
                 "host": connectionInfo.host,
                 "port": Int(connectionInfo.port),
                 "keepAlive": Int(connectionInfo.keepAlive),
                 "clientId": connectionInfo.clientId,
                 "username": connectionInfo.username
             ]
-            var eventMap = eventMap
-            eventMap["properties"] = props
-            handler(eventMap)
+            handler(_eventMap)
         } else {
             handler(eventMap)
         }

diff --git a/courier_dart_sdk/lib/event/courier_event_handler.dart b/courier_dart_sdk/lib/event/courier_event_handler.dart
@@ -33,7 +33,7 @@ class CourierEventHandler implements ICourierEventHandler {
     }
     log('Event received: $eventName with properties: $eventProps');
 
-    final connectionInfoMap = eventProps["connectionInfo"];
+    final connectionInfoMap = arguments["connectionInfo"];
     ConnectionInfo? connectionInfo;
     if (connectionInfoMap != null) {
       connectionInfo = ConnectionInfo(