Fix support for setting custom anonymous IDs from React Native library. (#259)

* Support anon ID from the React Native library.

* Ensure Android RN module also parses the anon ID into traits.

* Support null trait

Author: carloskelly13

packages/core/android/src/main/java/com/segment/analytics/reactnative/core/RNAnalyticsModule.kt

@@ -228,12 +228,24 @@ class RNAnalyticsModule(context: ReactApplicationContext): ReactContextBaseJavaM
             )
 
     @ReactMethod
-    fun identify(userId: String?, traits: ReadableMap?, integrations: ReadableMap?, context: ReadableMap?) =
-            analytics.identify(
-                    userId,
-                    Traits() from traits,
-                    optionsFrom(context, integrations)
-            )
+    fun identify(userId: String?, traits: ReadableMap?, options: ReadableMap?, integrations: ReadableMap?, context: ReadableMap?) {
+
+        val mergedTraits = if (options?.hasKey("anonymousId") == true) {
+            val map = WritableNativeMap()
+            map.merge(traits)
+            map.putString("anonymousId", options.getString("anonymousId"))
+            map
+        } else {
+            traits
+        }
+
+        analytics.identify(
+                userId,
+                Traits() from mergedTraits,
+                optionsFrom(context, integrations)
+        )
+    }
+
 
     @ReactMethod
     fun group(groupId: String, traits: ReadableMap?, integrations: ReadableMap, context: ReadableMap) =

packages/core/ios/RNAnalytics/RNAnalytics.m

@@ -147,10 +147,16 @@ - (NSDictionary*)withContextAndIntegrations :(NSDictionary*)context :(NSDictiona
                                  options:[self withContextAndIntegrations :context :integrations]];
 }
 
-RCT_EXPORT_METHOD(identify:(NSString*)userId :(NSDictionary*)traits :(NSDictionary*)integrations :(NSDictionary*)context) {
-    [SEGAnalytics.sharedAnalytics identify:userId
-                                    traits:traits
-                                   options:[self withContextAndIntegrations :context :integrations]];
+RCT_EXPORT_METHOD(identify:(NSString*)userId
+                          :(NSDictionary * _Nullable)traits
+                          :(NSDictionary *)options
+                          :(NSDictionary *)integrations
+                          :(NSDictionary *)context) {
+    NSMutableDictionary *mergedOptions = [[self withContextAndIntegrations :context :integrations] mutableCopy];
+    [mergedOptions addEntriesFromDictionary: options ?: @{}];
+    [SEGAnalytics.sharedAnalytics identify: userId
+                                    traits: traits
+                                   options: mergedOptions];
 }
 
 RCT_EXPORT_METHOD(group:(NSString*)groupId :(NSDictionary*)traits :(NSDictionary*)integrations :(NSDictionary*)context) {

packages/core/src/__tests__/analytics.spec.ts

@@ -68,7 +68,7 @@ it('does .screen()', () =>
 	testCall('screen')('Shopping cart', { from: 'Product page' }, {}, ctx))
 
 it('does .identify()', () =>
-	testCall('identify')('sloth', { eats: 'leaves' }, {}, ctx))
+	testCall('identify')('sloth', { eats: 'leaves' }, {}, {}, ctx))
 
 it('does .group()', () => testCall('group')('bots', { humans: false }, {}, ctx))
 

packages/core/src/analytics.ts

@@ -302,7 +302,7 @@ export module Analytics {
 		 * @param options A dictionary of options, e.g. integrations (thigh analytics integration to forward the event to)
 		 */
 		public async identify(user: string, traits: JsonMap = {}, options: Options = {}) {
-			await this.middlewares.run('identify', { user, traits, integrations: options.integrations || {} }, options.context || {})
+			await this.middlewares.run('identify', { user, traits, options, integrations: options.integrations || {} }, options.context || {})
 		}
 
 		/**

packages/core/src/bridge.ts

@@ -43,10 +43,10 @@ export interface Context extends JsonMap {
 	}
 }
 
-export interface Options {
+export type Options = {
 	integrations?: Integrations
 	context?: Context
-}
+} & JsonMap
 
 export interface Bridge {
 	setup(configuration: Configuration): Promise<void>
@@ -58,8 +58,9 @@ export interface Bridge {
 	): Promise<void>
 	identify(
 		user: string,
-		traits: JsonMap,
+		traits: JsonMap | null,
 		options: Options,
+		integrations: Integrations,
 		context: JsonMap
 	): Promise<void>
 	screen(

packages/core/src/middleware.ts

@@ -36,7 +36,8 @@ export interface IdentifyPayload
 		'identify',
 		{
 			user: string
-			traits: JsonMap
+			traits: JsonMap | null
+			options: JsonMap
 			integrations: Integrations
 		}
 	> {}
@@ -113,6 +114,7 @@ export class MiddlewareChain {
 					identify(
 						payload.data.user,
 						payload.data.traits,
+						payload.data.options,
 						payload.data.integrations,
 						payload.context
 					)