react-native-mparticle 2.8.0 → 2.8.1

package/android/src/main/java/com/mparticle/react/MParticleModule.kt

@@ -73,7 +73,7 @@ class MParticleModule(
 
         val event =
             MPEvent
-                .Builder(name, eventType)
+                .Builder(eventName, eventType)
                 .customAttributes(attributes)
                 .build()
         MParticle.getInstance()?.logEvent(event)

package/ios/RNMParticle/RNMParticle.mm

@@ -651,23 +651,21 @@ RCT_EXPORT_METHOD(setCCPAConsentState:(MPCCPAConsent *)consent)
     }
     MPIdentityApiRequest *request = [MPIdentityApiRequest requestWithEmptyUser];
 
-    if (dict[@"userIdentities"] && dict[@"userIdentities"] != [NSNull null]) {
-        NSDictionary *identities = dict[@"userIdentities"];
-        for (NSString *key in identities) {
+    for (NSString *key in dict) {
+        id value = dict[key];
+        if (value == [NSNull null]) {
+            continue;
+        }
+        
+        if ([key isEqualToString:@"email"]) {
+            request.email = (NSString *)value;
+        } else if ([key isEqualToString:@"customerId"]) {
+            request.customerId = (NSString *)value;
+        } else if ([RNMParticle isNumericIdentityKey:key]) {
             MPIdentity identityType = (MPIdentity)[key integerValue];
-            NSString *value = identities[key];
-            [request setIdentity:value identityType:identityType];
+            [request setIdentity:(NSString *)value identityType:identityType];
         }
     }
-
-    if (dict[@"customerId"] && dict[@"customerId"] != [NSNull null]) {
-        request.customerId = dict[@"customerId"];
-    }
-
-    if (dict[@"email"] && dict[@"email"] != [NSNull null]) {
-        request.email = dict[@"email"];
-    }
-
     return request;
 }
 
@@ -727,6 +725,17 @@ RCT_EXPORT_METHOD(setCCPAConsentState:(MPCCPAConsent *)consent)
 }
 #endif
 
++ (BOOL)isNumericIdentityKey:(NSString *)key {
+    static NSCharacterSet *numericSet = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        numericSet = [NSCharacterSet decimalDigitCharacterSet];
+    });
+    
+    NSCharacterSet *keyCharacterSet = [NSCharacterSet characterSetWithCharactersInString:key];
+    return [numericSet isSupersetOfSet:keyCharacterSet];
+}
+
 @end
 
 // RCTConvert category methods for mParticle types
@@ -1087,27 +1096,27 @@ typedef NS_ENUM(NSUInteger, MPReactCommerceEventAction) {
     return action;
 }
 
+
 + (MPIdentityApiRequest *)MPIdentityApiRequest:(id)json {
     NSDictionary *dict = json;
     MPIdentityApiRequest *request = [MPIdentityApiRequest requestWithEmptyUser];
 
-    if (dict[@"userIdentities"] && dict[@"userIdentities"] != [NSNull null]) {
-        NSDictionary *identities = dict[@"userIdentities"];
-        for (NSString *key in identities) {
+    for (NSString *key in dict) {
+        id value = dict[key];
+        if (value == [NSNull null]) {
+            continue;
+        }
+        
+        if ([key isEqualToString:@"email"]) {
+            request.email = (NSString *)value;
+        } else if ([key isEqualToString:@"customerId"]) {
+            request.customerId = (NSString *)value;
+        } else if ([RNMParticle isNumericIdentityKey:key]) {
             MPIdentity identityType = (MPIdentity)[key integerValue];
-            NSString *value = identities[key];
-            [request setIdentity:value identityType:identityType];
+            [request setIdentity:(NSString *)value identityType:identityType];
         }
     }
 
-    if (dict[@"customerId"] && dict[@"customerId"] != [NSNull null]) {
-        request.customerId = dict[@"customerId"];
-    }
-
-    if (dict[@"email"] && dict[@"email"] != [NSNull null]) {
-        request.email = dict[@"email"];
-    }
-
     return request;
 }
 

package/package.json

@@ -4,7 +4,7 @@
   "homepage": "https://www.mparticle.com",
   "license": "Apache-2.0",
   "repository": "mParticle/react-native-mparticle",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "react-native": "js/index",