react-native-userleap 2.9.0 → 2.10.0

package/android/.project

@@ -22,12 +22,12 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>0</id>
+			<id>1666118852606</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
 				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>

package/android/.settings/org.eclipse.buildship.core.prefs

@@ -1,11 +1,11 @@
-arguments=
+arguments=--init-script /var/folders/sh/j278yjh97h71m1cnsl5kcwh00000gq/T/init7898332991690331628.gradle --init-script /var/folders/sh/j278yjh97h71m1cnsl5kcwh00000gq/T/init85421648644725063.gradle
 auto.sync=false
 build.scans.enabled=false
 connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
 connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=
-java.home=/Users/ghostr/.sdkman/candidates/java/8.0.312-zulu/zulu-8.jdk/Contents/Home
+java.home=/Users/ghostr/.sdkman/candidates/java/11.0.13.8.1-amzn
 jvm.arguments=
 offline.mode=false
 override.workspace.settings=true

package/android/build.gradle

@@ -80,5 +80,5 @@ repositories {
 dependencies {
     //noinspection GradleDynamicVersion
     implementation 'com.facebook.react:react-native:+'  // From node_modules
-    implementation ("com.userleap:userleap-android-sdk:2.7.0") // update this version on android updates
+    implementation ("com.userleap:userleap-android-sdk:2.8.0") // update this version on android updates
 }

package/android/src/main/java/com/userleap/reactnative/UserLeapModule.java

@@ -66,28 +66,39 @@ public class UserLeapModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void track(String event, final Callback surveyStateCallback) {
-        UserLeap.INSTANCE.track(event, new Function1<SurveyState, Unit>() {
-            @Override
-            public Unit invoke(SurveyState surveyState) {
-                if (surveyStateCallback!=null) {
-                    surveyStateCallback.invoke(surveyState.name());
+        trackAndIdentify(event, null, null, surveyStateCallback);
+    }
+
+    @ReactMethod
+    public void trackWithProperties(String event, String userId, String partnerAnonymousId, ReadableMap properties, final Callback surveyStateCallback) {
+         if (surveyStateCallback == null) {
+            UserLeap.INSTANCE.track(event, userId, partnerAnonymousId, stringifyMap(properties));
+         } else {
+            UserLeap.INSTANCE.track(event, userId, partnerAnonymousId, stringifyMap(properties), new Function1<SurveyState, Unit>() {
+                @Override
+                public Unit invoke(SurveyState surveyState) {
+                    if (surveyStateCallback!=null) {
+                        surveyStateCallback.invoke(surveyState.name());
+                    }
+                    return null;
                 }
-                return null;
-            }
-        });
+            }); 
+         }
     }
 
     @ReactMethod
     public void trackAndIdentify(String event, String userId, String partnerAnonymousId, final Callback surveyStateCallback) {
-        UserLeap.INSTANCE.track(event, userId, partnerAnonymousId, new Function1<SurveyState, Unit>() {
-            @Override
-            public Unit invoke(SurveyState surveyState) {
-                if (surveyStateCallback!=null) {
+        if (surveyStateCallback == null) {
+            UserLeap.INSTANCE.track(event, userId, partnerAnonymousId);
+        } else {
+            UserLeap.INSTANCE.track(event, userId, partnerAnonymousId, new Function1<SurveyState, Unit>() {
+                @Override
+                public Unit invoke(SurveyState surveyState) {
                     surveyStateCallback.invoke(surveyState.name());
+                    return null;
                 }
-                return null;
-            }
-        });
+            });
+        }
     }
 
     @ReactMethod
@@ -156,7 +167,7 @@ public class UserLeapModule extends ReactContextBaseJavaModule {
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
             stringifiedMap = map.toHashMap().entrySet().stream()
                  .filter(m -> m.getKey() != null && m.getValue() !=null)
-                 .collect(Collectors.toMap(Map.Entry::getKey, e -> (String)e.getValue()));
+                 .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().toString()));
         }
         return stringifiedMap;
     }

package/index.d.ts

@@ -9,6 +9,7 @@ declare namespace UserLeap {
     function configure(environment: string): void;
     function presentSurvey(): void;
     function track(event: string, surveyStateCallback: ((surveyState: string) => void)): void;
+    function trackWithProperties(event: string, userId: string | undefined, partnerAnonymousId: string | undefined, properties: {[key: string]: any}, surveyStateCallback: ((surveyState: string) => void)): void;
     function trackAndIdentify(event: string, userId: string | undefined, partnerAnonymousId: string | undefined, surveyStateCallback: ((surveyState: string) => void)): void;
     function setEmailAddress(emailAddress: string): void;
     function setVisitorAttribute(key: string, value: string): void;

package/index.js

@@ -4,104 +4,117 @@ const SurveyState = {
   READY: 'READY',
   DISABLED: 'DISABLED',
   NO_SURVEY: 'NO_SURVEY'
+};
+
+const stringifyAttributes = ( attributes ) => {
+  if (!(attributes instanceof Object && attributes.constructor === Object)) return {};
+  Object.keys(attributes).forEach(function(key, index) {
+    attributes[key] = String(attributes[key]);
+  });
 }
 
 const isValidPlatform = () => {
   //Platform.Version is a number for android and string for ios
-  return (Platform.OS === 'android' && String(Platform.Version) >= '21') || (Platform.OS === 'ios' && String(Platform.Version) >= '10.3')
+  return (Platform.OS === 'android' && String(Platform.Version) >= '21') || (Platform.OS === 'ios' && String(Platform.Version) >= '10.3');
 }
 
 const visitorIdentifier = () => {
   if (isValidPlatform()) {
-    return NativeModules.UserLeapBindings.visitorIdentifier()
+    return NativeModules.UserLeapBindings.visitorIdentifier();
   } else {
-    return 0
+    return 0;
   }
 }
 
 const visitorIdentifierString = () => {
   if (isValidPlatform()) {
-    return NativeModules.UserLeapBindings.visitorIdentifierString()
+    return NativeModules.UserLeapBindings.visitorIdentifierString();
   } else {
-    return ""
+    return "";
   }
 }
 
 const configure = (environment) => {
   if (isValidPlatform()) {
-    NativeModules.UserLeapBindings.configure(environment)
+    NativeModules.UserLeapBindings.configure(environment);
   }
 }
 
 const presentSurvey = () => {
   if (isValidPlatform()) {
-    NativeModules.UserLeapBindings.presentSurvey()
+    NativeModules.UserLeapBindings.presentSurvey();
   }
 }
 
 const track = (event, surveyStateCallback) => {
   if (isValidPlatform()) {
-    NativeModules.UserLeapBindings.track(event, surveyStateCallback)
+    NativeModules.UserLeapBindings.track(event, surveyStateCallback);
+  }
+}
+
+const trackWithProperties = (event, userId, partnerAnonymousId, properties, surveyStateCallback) => {
+  if (isValidPlatform()) {
+    NativeModules.UserLeapBindings.trackWithProperties(event, userId, partnerAnonymousId,  properties, surveyStateCallback);
   }
 }
 
 const trackAndIdentify = (event, userId, partnerAnonynmousId, surveyStateCallback) => {
   if (isValidPlatform()) {
-    NativeModules.UserLeapBindings.trackAndIdentify(event, userId, partnerAnonynmousId, surveyStateCallback)
+    NativeModules.UserLeapBindings.trackAndIdentify(event, userId, partnerAnonynmousId, surveyStateCallback);
   }
 }
 
 const setEmailAddress = (emailAddress) => {
   if (isValidPlatform()) {
-    NativeModules.UserLeapBindings.setEmailAddress(emailAddress)
+    NativeModules.UserLeapBindings.setEmailAddress(emailAddress);
   }
 }
 
 const setVisitorAttribute = (key, value) => {
   if (isValidPlatform()) {
-    NativeModules.UserLeapBindings.setVisitorAttribute(key, value)
+    NativeModules.UserLeapBindings.setVisitorAttribute(key, value);
   }
 }
 
 const setVisitorAttributes = (attributes) => {
   if (isValidPlatform()) {
-    NativeModules.UserLeapBindings.setVisitorAttributes(attributes)
+    NativeModules.UserLeapBindings.setVisitorAttributes(stringifyAttributes(attributes));
   }
 }
 
 const removeVisitorAttributes = (keys) => {
   if (isValidPlatform()) {
-    NativeModules.UserLeapBindings.removeVisitorAttributes(keys)
+    NativeModules.UserLeapBindings.removeVisitorAttributes(keys);
   }
 }
 
 const setVisitorAttributesAndIdentify = (attributes, userId, partnerAnonynmousId) => {
   if (isValidPlatform()) {
-    NativeModules.UserLeapBindings.setVisitorAttributesAndIdentify(attributes, userId, partnerAnonynmousId)
+    NativeModules.UserLeapBindings.setVisitorAttributesAndIdentify(stringifyAttributes(attributes), userId, partnerAnonynmousId);
   }
 }
 
 const setUserIdentifier = (identifier) => {
   if (isValidPlatform()) {
-    NativeModules.UserLeapBindings.setUserIdentifier(identifier)
+    NativeModules.UserLeapBindings.setUserIdentifier(identifier);
   }
 }
 
 const logout = () => {
   if (isValidPlatform()) {
-    NativeModules.UserLeapBindings.logout()
+    NativeModules.UserLeapBindings.logout();
   }
 }
 
 const trackAndPresent = (event) => {
   if (isValidPlatform()) {
-    NativeModules.UserLeapBindings.trackAndPresent(event)
+    NativeModules.UserLeapBindings.trackAndPresent(event);
   }
 }
 
 const trackIdentifyAndPresent = (event, userId, partnerAnonynmousId) => {
   if (isValidPlatform()) {
-    NativeModules.UserLeapBindings.trackIdentifyAndPresent(event, userId, partnerAnonynmousId)
+    NativeModules.UserLeapBindings.trackIdentifyAndPresent(event, userId, partnerAnonynmousId);
   }
 }
 
@@ -112,6 +125,7 @@ const UserLeap = {
     configure,
     presentSurvey,
     track,
+    trackWithProperties,
     trackAndIdentify,
     setEmailAddress,
     setVisitorAttribute,

package/ios/UserLeapBindings.m

@@ -9,6 +9,23 @@
     return dispatch_get_main_queue();
 }
 
+- (NSString *)getSurveyState:(SurveyState)surveyState
+{
+    NSString *surveyStateBinding = @"NO_SURVEY";
+        switch(surveyState) {
+            case SurveyStateDisabled:
+                surveyStateBinding = @"DISABLED";
+                break;
+            case SurveyStateReady:
+                surveyStateBinding = @"READY";
+                break;
+            case SurveyStateNoSurvey:
+                surveyStateBinding = @"NO_SURVEY";
+                break;
+        }
+    return surveyStateBinding;
+}
+
 RCT_EXPORT_MODULE()
 
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(visitorIdentifier)
@@ -34,22 +51,40 @@ RCT_EXPORT_METHOD(presentSurvey)
 RCT_EXPORT_METHOD(track:(NSString *)eventName
                   surveyStateCallback:(RCTResponseSenderBlock)callback)
 {
-    [[UserLeap shared] trackWithEventName:eventName handler:^(enum SurveyState surveyState) {
-        NSString *surveyStateBinding = @"NO_SURVEY";
+    if (callback != nil) {
+        [[UserLeap shared] trackWithEventName:eventName handler:^(enum SurveyState surveyState) {
+            callback(@[[self getSurveyState:surveyState]]);
+        }];
+    } else {
+        [[UserLeap shared] trackWithEventName:eventName handler:nil];
+    }
+}
 
-        switch(surveyState) {
-            case SurveyStateDisabled:
-                surveyStateBinding = @"DISABLED";
-                break;
-            case SurveyStateReady:
-                surveyStateBinding = @"READY";
-                break;
-            case SurveyStateNoSurvey:
-                surveyStateBinding = @"NO_SURVEY";
-                break;
-        }
-        callback(@[surveyStateBinding]);
-    }];
+RCT_EXPORT_METHOD(trackWithProperties:(NSString *)eventName
+                  userId:(NSString * _Nullable)userId
+                  partnerAnonymousId:(NSString * _Nullable)partnerAnonymousId
+                  properties: (NSDictionary *)properties
+                  surveyStateCallback:(RCTResponseSenderBlock)callback)
+{
+    if (callback != nil) {
+        [[UserLeap shared] trackWithEventName:eventName userId:userId partnerAnonymousId:partnerAnonymousId properties:properties handler:^(enum SurveyState surveyState) {
+            NSString *surveyStateBinding = @"NO_SURVEY";
+            switch(surveyState) {
+                case SurveyStateDisabled:
+                    surveyStateBinding = @"DISABLED";
+                    break;
+                case SurveyStateReady:
+                    surveyStateBinding = @"READY";
+                    break;
+                case SurveyStateNoSurvey:
+                    surveyStateBinding = @"NO_SURVEY";
+                    break;
+            }
+            callback(@[surveyStateBinding]);
+        }];
+    } else {
+        [[UserLeap shared] trackWithEventName:eventName userId:userId partnerAnonymousId:partnerAnonymousId properties:properties handler:nil];
+    }
 }
 
 RCT_EXPORT_METHOD(trackAndIdentify:(NSString *)eventName
@@ -57,22 +92,14 @@ RCT_EXPORT_METHOD(trackAndIdentify:(NSString *)eventName
                   partnerAnonymousId:(NSString *)partnerAnonymousId
                   handler:(RCTResponseSenderBlock)callback)
 {
-    [[UserLeap shared] trackWithEventName:eventName userId:userId partnerAnonymousId:partnerAnonymousId handler:^(enum SurveyState surveyState) {
-        NSString *surveyStateBinding = @"NO_SURVEY";
-
-        switch(surveyState) {
-            case SurveyStateDisabled:
-                surveyStateBinding = @"DISABLED";
-                break;
-            case SurveyStateReady:
-                surveyStateBinding = @"READY";
-                break;
-            case SurveyStateNoSurvey:
-                surveyStateBinding = @"NO_SURVEY";
-                break;
-        }
-        callback(@[surveyStateBinding]);
-    }];
+    if (callback != nil) {
+        [[UserLeap shared] trackWithEventName:eventName userId:userId partnerAnonymousId:partnerAnonymousId handler:^(enum SurveyState surveyState) {
+            callback(@[[self getSurveyState:surveyState]]);
+        }];
+    } else {
+        [[UserLeap shared] trackWithEventName:eventName userId:userId partnerAnonymousId:partnerAnonymousId handler:nil];
+    }
+    
 }
 
 RCT_EXPORT_METHOD(setEmailAddress:(NSString *)emailAddress)

package/ios/UserLeapBindings.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>

package/ios/UserLeapBindings.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

package/ios/UserLeapBindings.xcodeproj/xcuserdata/ghostr.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>UserLeapBindings.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-userleap",
-  "version": "2.9.0",
+  "version": "2.10.0",
   "description": "React Native module for UserLeap",
   "main": "index.js",
   "types": "index.d.ts",

package/react-native-userleap.podspec

@@ -19,6 +19,6 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   s.dependency "React"
-  s.dependency "UserLeapKit", "4.9.0"
+  s.dependency "UserLeapKit", "4.10.0"
 end