Method createAlias should accept two parameters; Update Android SDK to 5.6.8; Check against potential NPE (davide-scalzo#207)

* Update Android SDK to 5.6.0

* Lock iOS podspec to 3.4.4

* Updater package

* Update Readme

* Change implementation to api within gradle build

* Update iOS Mixpanel to 3.4.5

* Lock iOS podspec to 3.4.5

* Update npm version

* Update gitignore - add prefs and vsc project

* Update index.d.ts - add clearSuperProperties

* Add support for clearing a single registration id on Android

* Udpate index.d.ts

* [iOS] Pass deviceToken as string to `removePushDeviceToken` as it's convinient way to de-register iOS device

* Update readme

* Update npm version

* Update README.md

* [Android] Retrieves current Firebase Cloud Messaging token

* Update readme.md and index.d.ts

* [Android] Add getPushRegistrationId

* Add missing definition

* Update README.md

* Update definitions and error messages

* Update Android SDK to 5.6.3

* Update iOS podspec to 3.4.7

* Update npm version

* Update dependencies version

* [iOS] Podspec should take velues from package.json

* Added support for tvOS

* Add append method; update readme.md

* Update Mixpanel.h

* Added fine grained in-app message control

* Add Opting Out / In

The later versions of Mixpanel have the ability to opt in/out of collecting data for GDPR purposes. This adds support for those as well as updating the Mixpanel library.

* Update version

* Update doc

* Add information about Autolinking

* Add missing Platform import

* Update readme; add changelog

* Expose iOS params that can be passed on Mixpanel instance initalization: trackCrashes, automaticPushTracking, launchOptions

* Fix typo

* [iOS] Add missing MixpanelType.h file

* Method createAlias should accept two parameters

* Update mixpanel-android to 5.6.8

* Update package.json

* Update CHANGELOG.md

* Update README.md

* Add check against potential NPE

* Update package.json

* Update CHANGELOG.md

Co-authored-by: Davide Scalzo <scalzodavide@yahoo.it>

Author: lorenc-tomasz

CHANGELOG.md

@@ -1,3 +1,20 @@
+# 1.1.14
+
+- [Android] Add check against potential NPE 
+- Update Readme
+
+# 1.1.13
+
+- [Android] Update mixpanel-android SDK to 5.6.8
+
+# 1.1.12
+
+- Method createAlias should accept two parameters (https://developer.mixpanel.com/docs/javascript-full-api-reference#section-mixpanel-alias). Second parameter is optional to keep backward compatabiluty. Will fallback to distinctID generated by mixpanel instance. 
+
+# 1.1.11
+
+- [iOS] Add missing file
+
 # 1.1.10
 
 - Fix typo
@@ -19,4 +36,4 @@
 - Add push / registration methods
 - Update README
 - Update Typescript defs
-- Fix crash on clearPushRegistrationId
+- Fix crash on clearPushRegistrationId

README.md

@@ -124,27 +124,41 @@ Mixpanel.sharedInstanceWithToken(YOUR_PROJECT_TOKEN, false, true, true, null);
 // Use this method to opt in an already opted out user from tracking. People updates and track calls will be sent to Mixpanel after using this method.
 Mixpanel.optInTracking();
 
-//  Opt out tracking.
+// Opt out tracking.
 
-//  This method is used to opt out tracking. This causes all events and people request no longer to be sent back to the Mixpanel server.
+// This method is used to opt out tracking. This causes all events and people request no longer to be sent back to the Mixpanel server.
 Mixpanel.optOutTracking();
 
-//Send and event name with no properties
+// Send and event name with no properties
 Mixpanel.track("Event name");
 
-//Track event with properties
+// Track event with properties
 Mixpanel.trackWithProperties('Click Button', {button_type: 'yellow button', button_text: 'magic button'});
 
-//Create Alias from unique id, i.e. create a new mixpanel profile: to call when a user signs up, with a unique id that is not used by another mixpanel profile as param
+// Create Alias from unique id, i.e. create a new mixpanel profile: to call when a user signs up, with a unique id that is not used by another mixpanel profile as param
 Mixpanel.createAlias(UNIQUE_ID)
 
-//Identify, i.e. associate to an existing mixpanel profile: to call when a user logs in and is already registered in Mixpanel with this unique id
+// OR: 
+
+// Create an alias, which Mixpanel will use to link two distinct_ids going forward (not retroactively). Multiple aliases can map to the same original ID, but not vice-versa.
+// Aliases can also be chained - the following is a valid scenario:
+Mixpanel.createAlias('new_id', 'existing_id');
+...
+Mixpanel.createAlias('newer_id', 'new_id');
+// If the original ID is not passed in, we will use the current distinct_id - probably the auto-generated GUID.
+// Notes: 
+// The best practice is to call createAlias() when a unique ID is first created for a user (e.g., when a user first registers for
+// an account and provides an email address). createAlias() should never be called more than once for a given user, except to chain
+// a newer ID to a previously new ID, as described above.
+// More info about createAlias: https://developer.mixpanel.com/docs/javascript-full-api-reference#section-mixpanel-alias
+
+// Identify, i.e. associate to an existing mixpanel profile: to call when a user logs in and is already registered in Mixpanel with this unique id
 Mixpanel.identify(UNIQUE_ID)
 
-//Set People properties (warning: if no mixpanel profile has been assigned to the current user when this method is called, it will automatically create a new mixpanel profile and the user will no longer be anonymous in Mixpanel)
+// Set People properties (warning: if no mixpanel profile has been assigned to the current user when this method is called, it will automatically create a new mixpanel profile and the user will no longer be anonymous in Mixpanel)
 Mixpanel.set({"$email": "elvis@email.com"});
 
-//Set People Properties Once (warning: if no mixpanel profile has been assigned to the current user when this method is called, it will automatically create a new mixpanel profile and the user will no longer be anonymous in Mixpanel)
+// Set People Properties Once (warning: if no mixpanel profile has been assigned to the current user when this method is called, it will automatically create a new mixpanel profile and the user will no longer be anonymous in Mixpanel)
 Mixpanel.setOnce({"$email": "elvis@email.com", "Created": new Date().toISOString()});
 
 // Timing Events
@@ -275,5 +289,7 @@ You can then call the following in your react native application:
 Mixpanel.showInAppMessageIfAvailable();
 ```
 
+More info: https://developer.mixpanel.com/docs/android-inapp-messages
+
 ## Notes ##
 For more info please have a look at the [official Mixpanel reference](https://mixpanel.com/help/reference/ios) for iOS

RNMixpanel.xcodeproj/project.pbxproj

@@ -38,6 +38,7 @@
 
 /* Begin PBXFileReference section */
 		5EAEEA411F0555B100C6FED8 /* libRNMixpanel-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libRNMixpanel-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		E7588479238556670081D7FF /* MixpanelType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MixpanelType.h; sourceTree = "<group>"; };
 		E78DD5BC2364BED0009197B6 /* MixpanelPeople.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MixpanelPeople.h; sourceTree = "<group>"; };
 		FDC64AF01BF1690D0044C1B4 /* libRNMixpanel.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNMixpanel.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		FDC64AF31BF1690D0044C1B4 /* RNMixpanel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNMixpanel.h; sourceTree = "<group>"; };
@@ -88,6 +89,7 @@
 			isa = PBXGroup;
 			children = (
 				E78DD5BC2364BED0009197B6 /* MixpanelPeople.h */,
+				E7588479238556670081D7FF /* MixpanelType.h */,
 				FDDAC2A11BF2B66500E70D3C /* Mixpanel.h */,
 				FDC64AF31BF1690D0044C1B4 /* RNMixpanel.h */,
 				FDC64AF51BF1690D0044C1B4 /* RNMixpanel.m */,

RNMixpanel/MixpanelType.h

@@ -0,0 +1,39 @@
+//
+//  MixpanelType.h
+//  Mixpanel
+//
+//  Created by Weizhe Yuan on 9/6/18.
+//  Copyright © 2018 Mixpanel. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@protocol MixpanelType <NSObject>
+
+- (BOOL)equalToMixpanelType:(id<MixpanelType>)rhs;
+
+@end
+
+@interface NSString (MixpanelTypeCategory) <MixpanelType>
+
+@end
+
+@interface NSNumber (MixpanelTypeCategory) <MixpanelType>
+
+@end
+
+@interface NSArray (MixpanelTypeCategory) <MixpanelType>
+
+@end
+
+@interface NSDictionary (MixpanelTypeCategory) <MixpanelType>
+
+@end
+
+@interface NSDate (MixpanelTypeCategory) <MixpanelType>
+
+@end
+
+@interface NSURL (MixpanelTypeCategory) <MixpanelType>
+
+@end

RNMixpanel/RNMixpanel.m

@@ -124,11 +124,13 @@ -(Mixpanel*) getInstance: (NSString *)name {
 }
 
 // create Alias
-RCT_EXPORT_METHOD(createAlias:(NSString *)old_id
+RCT_EXPORT_METHOD(createAlias:(NSString *)alias
+                  oldDistinctID:(nullable NSString *)oldDistinctID
                   apiToken:(NSString *)apiToken
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject) {
-    [[self getInstance:apiToken] createAlias:old_id forDistinctID:[self getInstance:apiToken].distinctId];
+    NSString *distinctId = oldDistinctID ? oldDistinctID : [self getInstance:apiToken].distinctId;
+    [[self getInstance:apiToken] createAlias:alias forDistinctID:distinctId];
     resolve(nil);
 }
 

android/build.gradle

@@ -17,5 +17,5 @@ android {
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    api "com.mixpanel.android:mixpanel-android:5.6.5"
+    api "com.mixpanel.android:mixpanel-android:5.6.8"
 }

android/src/main/java/com/kevinejohn/RNMixpanel/RNMixpanelModule.java

@@ -182,17 +182,20 @@ public void trackWithProperties(final String name, final ReadableMap properties,
 
         final MixpanelAPI instance = getInstance(apiToken);
         synchronized(instance) {
-            instance.track(name, obj);
+            if (obj != null) {
+                instance.track(name, obj);
+            }
         }
         promise.resolve(null);
     }
 
 
     @ReactMethod
-    public void createAlias(final String old_id, final String apiToken, Promise promise) {
+    public void createAlias(final String alias, final String oldDistinctID, final String apiToken, Promise promise) {
         final MixpanelAPI instance = getInstance(apiToken);
         synchronized(instance) {
-            instance.alias(old_id, instance.getDistinctId());
+            String distinctID = (oldDistinctID != null) ? oldDistinctID : instance.getDistinctId();
+            instance.alias(alias, distinctID);
         }
         promise.resolve(null);
     }
@@ -226,7 +229,9 @@ public void registerSuperProperties(final ReadableMap properties, final String a
         }
         final MixpanelAPI instance = getInstance(apiToken);
         synchronized(instance) {
-            instance.registerSuperProperties(obj);
+            if (obj != null) {
+                instance.registerSuperProperties(obj);
+            }
         }
         promise.resolve(null);
     }
@@ -241,7 +246,9 @@ public void registerSuperPropertiesOnce(final ReadableMap properties, final Stri
         }
         final MixpanelAPI instance = getInstance(apiToken);
         synchronized(instance) {
-            instance.registerSuperPropertiesOnce(obj);
+            if (obj != null) {
+                instance.registerSuperPropertiesOnce(obj);
+            }
         }
         promise.resolve(null);
     }
@@ -275,7 +282,9 @@ public void set(final ReadableMap properties, final String apiToken, Promise pro
 
         final MixpanelAPI instance = getInstance(apiToken);
         synchronized(instance) {
-            instance.getPeople().set(obj);
+            if (obj != null) {
+                instance.getPeople().set(obj);
+            }
         }
         promise.resolve(null);
     }
@@ -290,7 +299,9 @@ public void setOnce(final ReadableMap properties, final String apiToken, Promise
         }
         final MixpanelAPI instance = getInstance(apiToken);
         synchronized(instance) {
-            instance.getPeople().setOnce(obj);
+            if (obj != null) {
+                instance.getPeople().setOnce(obj);
+            }
         }
         promise.resolve(null);
     }
@@ -351,7 +362,9 @@ public void trackChargeWithProperties(final double charge, final ReadableMap pro
         }
         final MixpanelAPI instance = getInstance(apiToken);
         synchronized(instance) {
-            instance.getPeople().trackCharge(charge, obj);
+            if (obj != null) {
+                instance.getPeople().trackCharge(charge, obj);
+            }
         }
         promise.resolve(null);
     }
@@ -375,7 +388,9 @@ public void union(final String name, final ReadableArray properties, final Strin
         }
         final MixpanelAPI instance = getInstance(apiToken);
         synchronized(instance) {
-            instance.getPeople().union(name, obj);
+            if (obj != null) {
+                instance.getPeople().union(name, obj);
+            }
         }
         promise.resolve(null);
     }
@@ -390,7 +405,9 @@ public void append(final String name, final ReadableArray properties, final Stri
         }
         final MixpanelAPI instance = getInstance(apiToken);
         synchronized(instance) {
-            instance.getPeople().append(name, obj);
+            if (obj != null) {
+                instance.getPeople().append(name, obj);
+            }
         }
         promise.resolve(null);
     }

index.d.ts

@@ -8,7 +8,7 @@ declare module 'react-native-mixpanel' {
     track(event: string, properties?: Object): Promise<void>
     flush(): Promise<void>
     disableIpAddressGeolocalization(): Promise<void>
-    alias(alias: string): Promise<void>
+    alias(alias: string, oldDistinctID?: string): Promise<void>
     identify(userId: string): Promise<void>
     timeEvent(event: string): Promise<void>
     registerSuperProperties(properties: Object): Promise<void>
@@ -46,7 +46,7 @@ declare module 'react-native-mixpanel' {
     trackWithProperties(event: string, properties: Object): void;
     flush(): void;
     disableIpAddressGeolocalization(): void;
-    createAlias(alias: string): void;
+    createAlias(alias: string, oldDistinctID?: string): void;
     identify(userId: string): void;
     timeEvent(event: string): void;
     registerSuperProperties(properties: Object): void;

index.js

@@ -102,10 +102,10 @@ export class MixpanelInstance {
     return RNMixpanel.disableIpAddressGeolocalization(this.apiToken)
   }
 
-  alias(alias: string): Promise<void> {
+  alias(alias: string, oldDistinctID?: string): Promise<void> {
     if (!this.initialized) throw new Error(uninitializedError('createAlias'))
 
-    return RNMixpanel.createAlias(alias, this.apiToken)
+    return RNMixpanel.createAlias(alias, oldDistinctID, this.apiToken)
   }
 
   identify(userId: string): Promise<void> {
@@ -331,10 +331,10 @@ export default {
       defaultInstance.disableIpAddressGeolocalization()
   },
 
-  createAlias(alias: string) {
+  createAlias(alias: string, oldDistinctID: ?string = null) {
     if (!defaultInstance) throw new Error(NO_INSTANCE_ERROR)
 
-    defaultInstance.alias(alias)
+    defaultInstance.alias(alias, oldDistinctID)
   },
 
   identify(userId: string) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-mixpanel",
-  "version": "1.1.10",
+  "version": "1.1.14",
   "description": "A React Native wrapper for Mixpanel tracking",
   "main": "index.js",
   "repository": {
@@ -19,4 +19,4 @@
     "url": "https://github.com/davodesign84/react-native-mixpanel/issues"
   },
   "homepage": "https://github.com/davodesign84/react-native-mixpanel#readme"
-}
+}