react-native-mparticle 2.6.0 → 2.7.0

package/README.md

@@ -61,24 +61,23 @@ import mParticle_Apple_SDK
 
 func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
         
-       // Override point for customization after application launch.
+        //override point for customization after application launch.
         let mParticleOptions = MParticleOptions(key: "<<<App Key Here>>>", secret: "<<<App Secret Here>>>")
         
-       //Please see the Identity page for more information on building this object
+        //optional- Please see the Identity page for more information on building this object
         let request = MPIdentityApiRequest()
         request.email = "email@example.com"
         mParticleOptions.identifyRequest = request
+        //optional
         mParticleOptions.onIdentifyComplete = { (apiResult, error) in
             NSLog("Identify complete. userId = %@ error = %@", apiResult?.user.userId.stringValue ?? "Null User ID", error?.localizedDescription ?? "No Error Available")
         }
+        //optional
         mParticleOptions.onAttributionComplete = { (attributionResult, error) in
                     NSLog(@"Attribution Complete. attributionResults = %@", attributionResult.linkInfo)
         }
-        
-       //Start the SDK
-        MParticle.sharedInstance().start(with: mParticleOptions)
-        
-       return true
+        MParticle.sharedInstance().start(with: mParticleOptions)        
+        return true
 }
 ```
 
@@ -110,13 +109,15 @@ Next, you'll need to start the SDK:
     MParticleOptions *mParticleOptions = [MParticleOptions optionsWithKey:@"REPLACE ME"
                                                                    secret:@"REPLACE ME"];
     
-    //Please see the Identity page for more information on building this object
+    //optional - Please see the Identity page for more information on building this object
     MPIdentityApiRequest *request = [MPIdentityApiRequest requestWithEmptyUser];
     request.email = @"email@example.com";
     mParticleOptions.identifyRequest = request;
+    //optional
     mParticleOptions.onIdentifyComplete = ^(MPIdentityApiResult * _Nullable apiResult, NSError * _Nullable error) {
         NSLog(@"Identify complete. userId = %@ error = %@", apiResult.user.userId, error);
     };
+    //optional
     mParticleOptions.onAttributionComplete(MPAttributionResult * _Nullable attributionResult, NSError * _Nullable error) {
         NSLog(@"Attribution Complete. attributionResults = %@", attributionResult.linkInfo)
     }
@@ -138,29 +139,31 @@ See [Identity](http://docs.mparticle.com/developers/sdk/ios/identity/) for more
 
 For more help, see [the Android set up docs](https://docs.mparticle.com/developers/sdk/android/getting-started/#create-an-input).
 
-```java
+```kotlin
 package com.example.myapp;
 
 import android.app.Application;
 import com.mparticle.MParticle;
 
-public class MyApplication extends Application {
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        MParticleOptions options = MParticleOptions.builder(this)
-            .credentials("REPLACE ME WITH KEY","REPLACE ME WITH SECRET")
-            .setLogLevel(MParticle.LogLevel.VERBOSE)
+class MyApplication : Application() {
+    fun onCreate() {
+        super.onCreate()
+        val options: MParticleOptions = MParticleOptions.builder(this)
+            .credentials("REPLACE ME WITH KEY", "REPLACE ME WITH SECRET")
+            //optional
+            .logLevel(MParticle.LogLevel.VERBOSE)
+            //optional
             .identify(identifyRequest)
+            //optional
             .identifyTask(
-                new BaseIdentityTask()
-                        .addFailureListener(this)
-                        .addSuccessListener(this)
-                    )
+                BaseIdentityTask()
+                    .addFailureListener { errorResponse -> }
+                    .addSuccessListener{ result -> }
+            )
+            //optional
             .attributionListener(this)
-            .build();
-
-        MParticle.start(options);
+            .build()
+        MParticle.start(options)
     }
 }
 ```

package/android/build.gradle

@@ -47,7 +47,7 @@ dependencies {
     //
     // (See https://github.com/mparticle/mparticle-android-sdk for the latest version)
     //
-    compileOnly 'com.mparticle:android-core:[5.9.3, )'
+    compileOnly 'com.mparticle:android-core:[5.9.3, 5.38.2]'
 
     //
     // And, if you want to include kits, you can do so as follows:

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

@@ -13,6 +13,8 @@ import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReadableType;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.bridge.WritableNativeMap;
+import com.facebook.react.bridge.WritableArray;
+import com.facebook.react.bridge.WritableNativeArray;
 import com.mparticle.AttributionResult;
 import com.mparticle.MParticle;
 import com.mparticle.MPEvent;
@@ -86,9 +88,9 @@ public class MParticleModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void logScreenEvent(final String event, final ReadableMap attributesMap) {
+    public void logScreenEvent(final String event, final ReadableMap attributesMap, final boolean shouldUploadEvent) {
         Map<String, String> attributes = ConvertStringMap(attributesMap);
-        MParticle.getInstance().logScreen(event, attributes);
+        MParticle.getInstance().logScreen(event, attributes, shouldUploadEvent);
     }
 
     @ReactMethod
@@ -121,7 +123,19 @@ public class MParticleModule extends ReactContextBaseJavaModule {
             selectedUser.getUserAttributes(new UserAttributeListener() {
                 @Override
                 public void onUserAttributesReceived(Map<String, String> userAttributes, Map<String, List<String>> userAttributeLists, Long mpid) {
-                    completion.invoke(null, userAttributes);
+                    WritableMap resultMap = new WritableNativeMap();
+                    for (Map.Entry<String, String> entry : userAttributes.entrySet()) {
+                        resultMap.putString(entry.getKey(), entry.getValue());
+                    }
+                    for (Map.Entry<String, List<String>> entry : userAttributeLists.entrySet()) {
+                        WritableArray resultArray = new WritableNativeArray();
+                        List<String> valueList = entry.getValue();
+                        for (String arrayVal : valueList) {
+                            resultArray.pushString(arrayVal);
+                        }
+                        resultMap.putArray(entry.getKey(), resultArray);
+                    }
+                    completion.invoke(null, resultMap);
                 }
             });
         } else {
@@ -595,6 +609,19 @@ public class MParticleModule extends ReactContextBaseJavaModule {
         if (map.hasKey("shouldUploadEvent")) {
             builder.shouldUploadEvent(map.getBoolean("shouldUploadEvent"));
         }
+        if (map.hasKey("customAttributes")) {
+            builder.customAttributes(ConvertStringMap(map.getMap("customAttributes")));
+        }
+        if (map.hasKey("currency")) {
+            builder.currency(map.getString("currency"));
+        }
+        if (map.hasKey("checkoutStep")) {
+            builder.checkoutStep(map.getInt("checkoutStep"));
+        }
+        if (map.hasKey("checkoutOptions")) {
+            builder.checkoutOptions(map.getString("checkoutOptions"));
+        }
+
 
         return builder.build();
     }

package/ios/RNMParticle/RNMParticle.m

@@ -34,9 +34,9 @@ RCT_EXPORT_METHOD(logCommerceEvent:(MPCommerceEvent *)commerceEvent)
     [[MParticle sharedInstance] logCommerceEvent:commerceEvent];
 }
 
-RCT_EXPORT_METHOD(logScreenEvent:(NSString *)screenName attributes:(NSDictionary *)attributes)
+RCT_EXPORT_METHOD(logScreenEvent:(NSString *)screenName attributes:(NSDictionary *)attributes shouldUploadEvent:(BOOL)shouldUploadEvent)
 {
-    [[MParticle sharedInstance] logScreen:screenName eventInfo:attributes];
+    [[MParticle sharedInstance] logScreen:screenName eventInfo:attributes shouldUploadEvent:shouldUploadEvent];
 }
 
 RCT_EXPORT_METHOD(setATTStatus:(NSInteger)status withATTStatusTimestampMillis:(nonnull NSNumber *)timestamp)
@@ -413,12 +413,14 @@ typedef NS_ENUM(NSUInteger, MPReactCommerceEventAction) {
     commerceEvent.productListSource = json[@"productActionListSource"];
     commerceEvent.screenName = json[@"screenName"];
     commerceEvent.transactionAttributes = [RCTConvert MPTransactionAttributes:json[@"transactionAttributes"]];
-    commerceEvent.action = [RCTConvert MPCommerceEventAction:json[@"productActionType"]];
     commerceEvent.checkoutStep = [json[@"checkoutStep"] intValue];
     commerceEvent.nonInteractive = [json[@"nonInteractive"] boolValue];
     if (json[@"shouldUploadEvent"] != nil) {
         commerceEvent.shouldUploadEvent = [json[@"shouldUploadEvent"] boolValue];
     }
+    if (json[@"customAttributes"] != nil) {
+        commerceEvent.customAttributes = json[@"customAttributes"];
+    }
 
     NSMutableArray *products = [NSMutableArray array];
     NSArray *jsonProducts = json[@"products"];

package/js/index.js

@@ -96,8 +96,8 @@ const logCommerceEvent = (commerceEvent) => {
   NativeModules.MParticle.logCommerceEvent(commerceEvent)
 }
 
-const logScreenEvent = (screenName, attributes = null) => {
-  NativeModules.MParticle.logScreenEvent(screenName, attributes)
+const logScreenEvent = (screenName, attributes = null, shouldUploadEvent = true) => {
+  NativeModules.MParticle.logScreenEvent(screenName, attributes, shouldUploadEvent)
 }
 
 // Use ATTAuthStatus constants for status

package/package.json

@@ -4,7 +4,7 @@
   "homepage": "https://www.mparticle.com",
   "license": "Apache-2.0",
   "repository": "mParticle/react-native-mparticle",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "main": "js/index.js",
   "scripts": {
     "test": "./node_modules/standard/bin/cmd.js",