feat(integrations): allow setting integration options

* feat(integrations): pass integrationOptions down to Android

* feat(integrations): pass integrationOptions down in iOS

* feat(integrations): pass integrations in an options parameter

* feat(integrations): fix test

* feat(integrations): remove a rogue .only

* feat(ios): fix typo

* feat(integrations): update middleware to pass in integrations directly

* feat(integrations): fix linting

* feat(integrations): add test for middleware integrations

* feat(integrations): fix linting

* feat(integrations): add integrations to screen and alias

* feat(integrations): code style fixes

Author: Kadi Kraman

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

@@ -29,10 +29,14 @@ import android.content.pm.PackageManager
 import com.facebook.react.bridge.*
 import com.segment.analytics.Analytics
 import com.segment.analytics.Properties
+import com.segment.analytics.Options
 import com.segment.analytics.Traits
 import com.segment.analytics.ValueMap
 import com.segment.analytics.internal.Utils.getSegmentSharedPreferences
 import java.util.concurrent.TimeUnit
+import com.facebook.react.bridge.ReadableMap
+
+
 
 class RNAnalyticsModule(context: ReactApplicationContext): ReactContextBaseJavaModule(context) {
     override fun getName() = "RNAnalytics"
@@ -42,7 +46,6 @@ class RNAnalyticsModule(context: ReactApplicationContext): ReactContextBaseJavaM
 
     companion object {
         private var singletonJsonConfig: String? = null
-        private var key: String? = null
         private var versionKey = "version"
         private var buildKey = "build"
     }
@@ -56,18 +59,41 @@ class RNAnalyticsModule(context: ReactApplicationContext): ReactContextBaseJavaM
         }
     }
 
+    /**
+     * Builds Options with integrations
+     * The format for the integrations variable is { String: Boolean | Map }
+     */
+    private fun getOptions(integrations: ReadableMap?): Options {
+        var options = Options()
+
+        if (integrations !== null) {
+            val iterator = integrations.keySetIterator()
+            while (iterator.hasNextKey()) {
+                val nextKey = iterator.nextKey()
+                when (integrations.getType(nextKey)) {
+                    ReadableType.Boolean -> options.setIntegration(nextKey, integrations.getBoolean(nextKey))
+                    ReadableType.Map -> {
+                        options.setIntegration(nextKey, true)
+                        options.setIntegrationOptions(nextKey, integrations.getMap(nextKey)?.toHashMap())
+                    }
+                }
+            }
+        }
+        return options
+    }
+
     /**
      * Tracks application lifecycle events - Application Installed, Application Updated and Application Opened
      * This is built to exactly mirror the application lifecycle tracking in analytics-android
      */
-    private fun trackApplicationLifecycleEvents() {
+    private fun trackApplicationLifecycleEvents(writeKey: String?) {
         // Get the current version.
         var packageInfo = this.getPackageInfo()
         val currentVersion = packageInfo.versionName
         val currentBuild = packageInfo.versionCode
 
         // Get the previous recorded version.
-        val sharedPreferences = getSegmentSharedPreferences(reactApplicationContext, key)
+        val sharedPreferences = getSegmentSharedPreferences(reactApplicationContext, writeKey)
         val previousVersion = sharedPreferences.getString(versionKey, null)
         val previousBuild = sharedPreferences.getInt(buildKey, -1)
 
@@ -145,35 +171,33 @@ class RNAnalyticsModule(context: ReactApplicationContext): ReactContextBaseJavaM
             return promise.reject("E_SEGMENT_ERROR", e)
         }
 
-        singletonJsonConfig = json
-        key = writeKey
-
         if(options.getBoolean("trackAppLifecycleEvents")) {
-            this.trackApplicationLifecycleEvents()
+            this.trackApplicationLifecycleEvents(writeKey)
         }
 
+        singletonJsonConfig = json
         promise.resolve(null)
     }
 
     @ReactMethod
-    fun track(event: String, properties: ReadableMap, context: ReadableMap) = 
-        analytics.track(event, Properties() from properties)
+    fun track(event: String, properties: ReadableMap, integrations: ReadableMap, context: ReadableMap) =
+        analytics.track(event, Properties() from properties, this.getOptions(integrations))
 
     @ReactMethod
-    fun screen(name: String, properties: ReadableMap, context: ReadableMap) =
-        analytics.screen(name, Properties() from properties)
+    fun screen(name: String, properties: ReadableMap, integrations: ReadableMap, context: ReadableMap) =
+        analytics.screen(null, name, Properties() from properties, this.getOptions(integrations))
 
     @ReactMethod
-    fun identify(userId: String, traits: ReadableMap, context: ReadableMap) =
-        analytics.identify(userId, Traits() from traits, null)
+    fun identify(userId: String, traits: ReadableMap, integrations: ReadableMap, context: ReadableMap) =
+        analytics.identify(userId, Traits() from traits, this.getOptions(integrations))
 
     @ReactMethod
-    fun group(groupId: String, traits: ReadableMap, context: ReadableMap) =
-        analytics.group(groupId, Traits() from traits)
+    fun group(groupId: String, traits: ReadableMap, integrations: ReadableMap, context: ReadableMap) =
+        analytics.group(groupId, Traits() from traits, this.getOptions(integrations))
 
     @ReactMethod
-    fun alias(newId: String, context: ReadableMap) =
-        analytics.alias(newId)
+    fun alias(newId: String, context: ReadableMap, integrations: ReadableMap) =
+        analytics.alias(newId, this.getOptions(integrations))
 
     @ReactMethod
     fun reset() =

packages/core/docs/classes/analytics.client.md

@@ -53,19 +53,20 @@ ___
 
 ###  alias
 
-▸ **alias**(newId: *`string`*): `Promise`<`void`>
+▸ **alias**(newId: *`string`*, options?: *[Options]()*): `Promise`<`void`>
 
-*Defined in [analytics.ts:263](https://github.com/segmentio/analytics-react-native/blob/master/packages/core/src/analytics.ts#L263)*
+*Defined in [analytics.ts:266](https://github.com/segmentio/analytics-react-native/blob/master/packages/core/src/analytics.ts#L266)*
 
 Merge two user identities, effectively connecting two sets of user data as one. This may not be supported by all integrations.
 
 When you learn more about who the group is, you can record that information with group.
 
 **Parameters:**
 
-| Name | Type | Description |
-| ------ | ------ | ------ |
-| newId | `string` |  The new ID you want to alias the existing ID to. The existing ID will be either the previousId if you have called identify, or the anonymous ID. |
+| Name | Type | Default value | Description |
+| ------ | ------ | ------ | ------ |
+| newId | `string` | - |  The new ID you want to alias the existing ID to. The existing ID will be either the previousId if you have called identify, or the anonymous ID. |
+| `Default value` options | [Options]() |  {} |
 
 **Returns:** `Promise`<`void`>
 
@@ -97,7 +98,7 @@ ___
 
 ▸ **disable**(): `Promise`<`void`>
 
-*Defined in [analytics.ts:302](https://github.com/segmentio/analytics-react-native/blob/master/packages/core/src/analytics.ts#L302)*
+*Defined in [analytics.ts:305](https://github.com/segmentio/analytics-react-native/blob/master/packages/core/src/analytics.ts#L305)*
 
 Completely disable the sending of any analytics data.
 
@@ -112,7 +113,7 @@ ___
 
 ▸ **enable**(): `Promise`<`void`>
 
-*Defined in [analytics.ts:292](https://github.com/segmentio/analytics-react-native/blob/master/packages/core/src/analytics.ts#L292)*
+*Defined in [analytics.ts:295](https://github.com/segmentio/analytics-react-native/blob/master/packages/core/src/analytics.ts#L295)*
 
 Enable the sending of analytics data. Enabled by default.
 
@@ -127,7 +128,7 @@ ___
 
 ▸ **flush**(): `Promise`<`void`>
 
-*Defined in [analytics.ts:283](https://github.com/segmentio/analytics-react-native/blob/master/packages/core/src/analytics.ts#L283)*
+*Defined in [analytics.ts:286](https://github.com/segmentio/analytics-react-native/blob/master/packages/core/src/analytics.ts#L286)*
 
 Trigger an upload of all queued events.
 
@@ -142,7 +143,7 @@ ___
 
 ▸ **getAnonymousId**(): `Promise`<`string`>
 
-*Defined in [analytics.ts:307](https://github.com/segmentio/analytics-react-native/blob/master/packages/core/src/analytics.ts#L307)*
+*Defined in [analytics.ts:310](https://github.com/segmentio/analytics-react-native/blob/master/packages/core/src/analytics.ts#L310)*
 
 Retrieve the anonymousId.
 
@@ -153,9 +154,9 @@ ___
 
 ###  group
 
-▸ **group**(groupId: *`string`*, traits?: *[JsonMap]()*): `Promise`<`void`>
+▸ **group**(groupId: *`string`*, traits?: *[JsonMap]()*, options?: *[Options]()*): `Promise`<`void`>
 
-*Defined in [analytics.ts:250](https://github.com/segmentio/analytics-react-native/blob/master/packages/core/src/analytics.ts#L250)*
+*Defined in [analytics.ts:253](https://github.com/segmentio/analytics-react-native/blob/master/packages/core/src/analytics.ts#L253)*
 
 Associate a user with a group, organization, company, project, or w/e _you_ call them.
 
@@ -167,6 +168,7 @@ When you learn more about who the group is, you can record that information with
 | ------ | ------ | ------ | ------ |
 | groupId | `string` | - |  A database ID for this group. |
 | `Default value` traits | [JsonMap]() |  {} |  A dictionary of traits you know about the group. Things like: name, employees, etc. |
+| `Default value` options | [Options]() |  {} |  A dictionary of options, e.g. integrations (thigh analytics integration to forward the event to) |
 
 **Returns:** `Promise`<`void`>
 
@@ -175,9 +177,9 @@ ___
 
 ###  identify
 
-▸ **identify**(user: *`string`*, traits?: *[JsonMap]()*): `Promise`<`void`>
+▸ **identify**(user: *`string`*, traits?: *[JsonMap]()*, options?: *[Options]()*): `Promise`<`void`>
 
-*Defined in [analytics.ts:238](https://github.com/segmentio/analytics-react-native/blob/master/packages/core/src/analytics.ts#L238)*
+*Defined in [analytics.ts:240](https://github.com/segmentio/analytics-react-native/blob/master/packages/core/src/analytics.ts#L240)*
 
 Associate a user with their unique ID and record traits about them.
 
@@ -189,6 +191,7 @@ When you learn more about who your user is, you can record that information with
 | ------ | ------ | ------ | ------ |
 | user | `string` | - |  database ID (or email address) for this user. If you don't have a userId but want to record traits, you should pass nil. For more information on how we generate the UUID and Apple's policies on IDs, see [https://segment.io/libraries/ios#ids](https://segment.io/libraries/ios#ids) |
 | `Default value` traits | [JsonMap]() |  {} |  A dictionary of traits you know about the user. Things like: email, name, plan, etc. |
+| `Default value` options | [Options]() |  {} |  A dictionary of options, e.g. integrations (thigh analytics integration to forward the event to) |
 
 **Returns:** `Promise`<`void`>
 
@@ -237,7 +240,7 @@ ___
 
 ▸ **reset**(): `Promise`<`void`>
 
-*Defined in [analytics.ts:273](https://github.com/segmentio/analytics-react-native/blob/master/packages/core/src/analytics.ts#L273)*
+*Defined in [analytics.ts:276](https://github.com/segmentio/analytics-react-native/blob/master/packages/core/src/analytics.ts#L276)*
 
 Reset any user state that is cached on the device.
 
@@ -250,9 +253,9 @@ ___
 
 ###  screen
 
-▸ **screen**(name: *`string`*, properties?: *[JsonMap]()*): `Promise`<`void`>
+▸ **screen**(name: *`string`*, properties?: *[JsonMap]()*, options?: *[Options]()*): `Promise`<`void`>
 
-*Defined in [analytics.ts:224](https://github.com/segmentio/analytics-react-native/blob/master/packages/core/src/analytics.ts#L224)*
+*Defined in [analytics.ts:225](https://github.com/segmentio/analytics-react-native/blob/master/packages/core/src/analytics.ts#L225)*
 
 Record the screens or views your users see.
 
@@ -264,6 +267,7 @@ When a user views a screen in your app, you'll want to record that here. For som
 | ------ | ------ | ------ | ------ |
 | name | `string` | - |  The title of the screen being viewed. We recommend using human-readable names like 'Photo Feed' or 'Completed Purchase Screen'. |
 | `Default value` properties | [JsonMap]() |  {} |  A dictionary of properties for the screen view event. If the event was 'Added to Shopping Cart', it might have properties like price, productType, etc. |
+| `Default value` options | [Options]() |  {} |
 
 **Returns:** `Promise`<`void`>
 
@@ -302,9 +306,9 @@ ___
 
 ###  track
 
-▸ **track**(event: *`string`*, properties?: *[JsonMap]()*): `Promise`<`void`>
+▸ **track**(event: *`string`*, properties?: *[JsonMap]()*, options?: *[Options]()*): `Promise`<`void`>
 
-*Defined in [analytics.ts:206](https://github.com/segmentio/analytics-react-native/blob/master/packages/core/src/analytics.ts#L206)*
+*Defined in [analytics.ts:207](https://github.com/segmentio/analytics-react-native/blob/master/packages/core/src/analytics.ts#L207)*
 
 Record the actions your users perform.
 
@@ -316,6 +320,7 @@ When a user performs an action in your app, you'll want to track that action for
 | ------ | ------ | ------ | ------ |
 | event | `string` | - |  The name of the event you're tracking. We recommend using human-readable names like \`Played a Song\` or \`Updated Status\`. |
 | `Default value` properties | [JsonMap]() |  {} |  A dictionary of properties for the event. If the event was 'Added to Shopping Cart', it might have properties like price, productType, etc. |
+| `Default value` options | [Options]() |  {} |  A dictionary of options, e.g. integrations (thigh analytics integration to forward the event to) |
 
 **Returns:** `Promise`<`void`>
 

packages/core/ios/RNAnalytics/RNAnalytics.m

@@ -88,39 +88,40 @@ +(void)initialize {
     resolver(nil);
 }
 
-#define withContext(context) @{@"context": context}
+- (NSDictionary*)withContextAndIntegrations :(NSDictionary*)context :(NSDictionary*)integrations {
+    return @{ @"context": context, @"integrations": integrations ?: @{}};
+}
+
 
-RCT_EXPORT_METHOD(track:(NSString*)name :(NSDictionary*)properties :(NSDictionary*)context) {
+RCT_EXPORT_METHOD(track:(NSString*)name :(NSDictionary*)properties :(NSDictionary*)integrations :(NSDictionary*)context) {
     [SEGAnalytics.sharedAnalytics track:name
                              properties:properties
-                                options:withContext(context)];
+                                options:[self withContextAndIntegrations :context :integrations]];
 }
 
-RCT_EXPORT_METHOD(screen:(NSString*)name :(NSDictionary*)properties :(NSDictionary*)context) {
+RCT_EXPORT_METHOD(screen:(NSString*)name :(NSDictionary*)properties :(NSDictionary*)integrations :(NSDictionary*)context) {
     [SEGAnalytics.sharedAnalytics screen:name
                               properties:properties
-                                 options:withContext(context)];
+                                 options:[self withContextAndIntegrations :context :integrations]];
 }
 
-RCT_EXPORT_METHOD(identify:(NSString*)userId :(NSDictionary*)traits :(NSDictionary*)context) {
+RCT_EXPORT_METHOD(identify:(NSString*)userId :(NSDictionary*)traits :(NSDictionary*)integrations :(NSDictionary*)context) {
     [SEGAnalytics.sharedAnalytics identify:userId
                                     traits:traits
-                                   options:withContext(context)];
+                                   options:[self withContextAndIntegrations :context :integrations]];
 }
 
-RCT_EXPORT_METHOD(group:(NSString*)groupId :(NSDictionary*)traits :(NSDictionary*)context) {
+RCT_EXPORT_METHOD(group:(NSString*)groupId :(NSDictionary*)traits :(NSDictionary*)integrations :(NSDictionary*)context) {
     [SEGAnalytics.sharedAnalytics group:groupId
                                  traits:traits
-                                options:withContext(context)];
+                                options:[self withContextAndIntegrations :context :integrations]];
 }
 
-RCT_EXPORT_METHOD(alias:(NSString*)newId :(NSDictionary*)context) {
+RCT_EXPORT_METHOD(alias:(NSString*)newId :(NSDictionary*)integrations :(NSDictionary*)context) {
     [SEGAnalytics.sharedAnalytics alias:newId
-                                options:withContext(context)];
+                                options:[self withContextAndIntegrations :context :integrations]];
 }
 
-#undef withContext
-
 RCT_EXPORT_METHOD(reset) {
     [SEGAnalytics.sharedAnalytics reset];
 }

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

@@ -57,22 +57,22 @@ it('waits for .setup()', async () => {
 	expect(Bridge.track).not.toHaveBeenCalled()
 	await client.setup('key')
 
-	expect(Bridge.track).toHaveBeenNthCalledWith(1, 'test 1', {}, ctx)
-	expect(Bridge.track).toHaveBeenNthCalledWith(2, 'test 2', {}, ctx)
+	expect(Bridge.track).toHaveBeenNthCalledWith(1, 'test 1', {}, {}, ctx)
+	expect(Bridge.track).toHaveBeenNthCalledWith(2, 'test 2', {}, {}, ctx)
 })
 
 it('does .track()', () =>
-	testCall('track')('Added to cart', { productId: 'azertyuiop' }, ctx))
+	testCall('track')('Added to cart', { productId: 'azertyuiop' }, {}, ctx))
 
 it('does .screen()', () =>
-	testCall('screen')('Shopping cart', { from: 'Product page' }, ctx))
+	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))
+it('does .group()', () => testCall('group')('bots', { humans: false }, {}, ctx))
 
-it('does .alias()', () => testCall('alias')('new alias', ctx))
+it('does .alias()', () => testCall('alias')('new alias', {}, ctx))
 
 it('does .reset()', testCall('reset'))
 it('does .flush()', testCall('flush'))
@@ -103,3 +103,24 @@ function testCall<K extends keyof typeof Bridge>(name: K) {
 		expect(Bridge[name]).toHaveBeenNthCalledWith(1, ...args)
 	}) as (typeof Bridge)[K]
 }
+
+it('enables setting integrations from the middleware', async () => {
+	const integrations = {
+		'Google Analytics': false,
+		Mixpanel: { foo: 'bar' }
+	}
+
+	analytics.middleware(async ({ next, context, data }) =>
+		// @ts-ignore ts is expecting newId for some reasons
+		next(context, { ...data, integrations })
+	)
+
+	const trackSpy = jest.fn()
+	getBridgeStub('track').mockImplementationOnce(trackSpy)
+	analytics.track('test')
+	await nextTick()
+
+	expect(trackSpy).toBeCalledWith('test', {}, integrations, {
+		library: ctx.library
+	})
+})