Merge pull request #160 from mixpanel/jared-serverURL

add serverURL to init params

Author: zihejia

MixpanelReactNative.podspec

@@ -19,5 +19,5 @@ Pod::Spec.new do |s|
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }  
 
   s.dependency "React-Core"
-  s.dependency "Mixpanel-swift", '4.0.1'
+  s.dependency "Mixpanel-swift", '4.0.2'
 end

__tests__/index.test.js

@@ -15,7 +15,7 @@ test(`it calls MixpanelReactNative initialize`, async () => {
 test(`it calls MixpanelReactNative initialize with optOut and superProperties`, async () => {
   const mixpanel = new Mixpanel("token", true);
   mixpanel.init(true, {"super": "property"})
-  expect(NativeModules.MixpanelReactNative.initialize).toBeCalledWith("token", true, true, {"$lib_version": "2.0.1", "mp_lib": "react-native", "super": "property"});
+  expect(NativeModules.MixpanelReactNative.initialize).toBeCalledWith("token", true, true, {"$lib_version": "2.0.1", "mp_lib": "react-native", "super": "property"}, "https://api.mixpanel.com");
 });
 
 test(`it calls MixpanelReactNative setServerURL`, async () => {

android/src/main/java/com/mixpanel/reactnative/MixpanelReactNativeModule.java

@@ -4,7 +4,7 @@ type MixpanelProperties = { [key: string]: MixpanelType };
 export class Mixpanel {
     constructor(token: string, trackAutomaticEvents: boolean);
     static init(token: string, trackAutomaticEvents: boolean, optOutTrackingDefault?: boolean): Promise<Mixpanel>;
-    init(optOutTrackingDefault?: boolean, superProperties?: MixpanelProperties): Promise<void>;
+    init(optOutTrackingDefault?: boolean, superProperties?: MixpanelProperties, serverURL?: String): Promise<void>;
     setServerURL(serverURL: string): void;
     setLoggingEnabled(loggingEnabled: boolean): void;
     setFlushOnBackground(flushOnBackground: boolean): void;

index.d.ts

@@ -61,16 +61,17 @@ export class Mixpanel {
      * @param {object} superProperties  Optional A Map containing the key value pairs of the super properties to register
      *
      */
-    async init(optOutTrackingDefault = DEFAULT_OPT_OUT, superProperties = {}) {
+    async init(optOutTrackingDefault = DEFAULT_OPT_OUT, superProperties = {}, serverURL = "https://api.mixpanel.com") {
         let metadata = Helper.getMetaData();
-        await MixpanelReactNative.initialize(this.token, this.trackAutomaticEvents, optOutTrackingDefault, {...metadata, ...superProperties});
+        await MixpanelReactNative.initialize(this.token, this.trackAutomaticEvents, optOutTrackingDefault, {...metadata, ...superProperties}, serverURL);
     }
 
     /**
      * @deprecated since version 1.3.0. To initialize Mixpanel, please use the instance method `init` instead. See the example below:
      *
      * <pre><code>
-     * const mixpanel = new Mixpanel('your project token');
+     * const trackAutomaticEvents = true;
+     * const mixpanel = new Mixpanel('your project token', trackAutomaticEvents);
      * mixpanel.init();
      * </code></pre>
      *

index.js

@@ -5,7 +5,7 @@ @interface RCT_EXTERN_MODULE(MixpanelReactNative, NSObject)
 
 // MARK: - Mixpanel Instance
 
-RCT_EXTERN_METHOD(initialize:(NSString *)token trackAutomaticEvents:(BOOL)trackAutomaticEvents optOutTrackingByDefault:(BOOL)optOutTrackingByDefault properties:(NSDictionary *)properties resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(initialize:(NSString *)token trackAutomaticEvents:(BOOL)trackAutomaticEvents optOutTrackingByDefault:(BOOL)optOutTrackingByDefault properties:(NSDictionary *)properties serverURL:(NSString *)serverURL resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 
 // Mark: - Settings
 RCT_EXTERN_METHOD(setServerURL:(NSString *)token serverURL:(NSString *)serverURL resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)

ios/MixpanelReactNative.m

@@ -16,12 +16,14 @@ open class MixpanelReactNative: NSObject {
                     trackAutomaticEvents: Bool,
                     optOutTrackingByDefault: Bool = false,
                     properties: [String: Any],
+                    serverURL: String,
                     resolver resolve: RCTPromiseResolveBlock,
                     rejecter reject: RCTPromiseRejectBlock) -> Void {
         AutomaticProperties.setAutomaticProperties(properties)
         Mixpanel.initialize(token: token, trackAutomaticEvents: trackAutomaticEvents, flushInterval: Constants.DEFAULT_FLUSH_INTERVAL,
                             instanceName: token, optOutTrackingByDefault: optOutTrackingByDefault,
-                            superProperties: MixpanelTypeHandler.processProperties(properties: properties, includeLibInfo: true))
+                            superProperties: MixpanelTypeHandler.processProperties(properties: properties, includeLibInfo: true),
+                            serverURL: serverURL)
         resolve(true)
     }