Merge pull request #337 from BranchMetrics/npm-update

fix: updated node dependencies
BranchMetrics · Jul 11, 2017 · e80e7e3 · e80e7e3
2 parents 2eaff07 + edc5480
commit e80e7e3
Show file tree

Hide file tree

Showing 16 changed files with 558 additions and 262 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@ testbed/platforms
 testbed/plugins
 testbed/hooks
 testbed/build.json
+testbed/config.xml
 testbed/package.json
 node_modules
 .installed

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -90,6 +90,13 @@
     ./testbed/init -adc
     ```
 
+  - files
+  
+    - test `branch.js` with console logs to Safari and Chrome inspectors
+    - test `hooks` by changing to `before_prepare` and console logs with `cordova build`
+    - test `BranchSDK.m` with `NSLog()` with Xcode
+    - test `BranchSDK.java` with `system.out.println()` with Android Studio
+
 ## Submit
 
 - **[required]** Git [comment prefix](https://github.com/semantic-release/semantic-release): `feat`, `fix`, `docs`, `style`, `refactor`, `perf`, `test`, `chore`, `revert`

diff --git a/README.md b/README.md
@@ -248,7 +248,10 @@
     // for development and debugging only
     Branch.setDebug(true)
 
-    // sync with Mixpanel if installed
+    // for better Android matching
+    Branch.setCookieBasedMatching('cordova.app.link')
+
+    // to sync with Mixpanel if plugin is installed
     Branch.setMixpanelToken('your_mixpanel_token')
 
     // Branch initialization

diff --git a/build.gradle b/build.gradle
@@ -0,0 +1,18 @@
+android {
+    defaultConfig {
+        multiDexEnabled true
+    }
+}
+
+dependencies {
+  // multidex for frameworks
+  compile 'com.android.support:multidex:1.0.1'
+  // branch sdk
+  compile 'io.branch.sdk.android:library:2+'
+  // branch app indexing
+  compile 'com.google.android.gms:play-services-appindexing:9.+'
+  // branch chrome tabs for better matching
+  compile 'com.android.support:customtabs:23.3.0'
+  // branch gaid for better device matching
+  compile 'com.google.android.gms:play-services-ads:9+'
+}
diff --git a/package.json b/package.json
@@ -46,18 +46,18 @@
   "dependencies": {
     "mkpath": "^1.0.0",
     "node-version-compare": "^1.0.1",
-    "plist": "^2.0.1",
+    "plist": "^2.1.0",
     "xml2js": "^0.4.17"
   },
   "devDependencies": {
     "gulp": "^3.9.1",
-    "gulp-standard": "^9.0.0",
-    "husky": "^0.13.2",
+    "gulp-standard": "^10.0.0",
+    "husky": "^0.13.4",
     "mkpath": "^1.0.0",
     "node-version-compare": "^1.0.1",
     "plist": "^2.1.0",
     "semantic-release": "^6.3.6",
-    "validate-commit-msg": "^2.11.2",
+    "validate-commit-msg": "^2.12.2",
     "xml2js": "^0.4.17"
   }
 }
diff --git a/plugin.template.xml b/plugin.template.xml
@@ -61,7 +61,7 @@ SOFTWARE.
     </config-file>
 
     <source-file src="src/android/io/branch/BranchSDK.java" target-dir="src/io/branch" />
-    <framework src="io.branch.sdk.android:library:2+" />
+    <framework src="build.gradle" custom="true" type="gradleReference" />
   </platform>
 
   <!-- iOS -->

diff --git a/plugin.xml b/plugin.xml
@@ -61,7 +61,7 @@ SOFTWARE.
     </config-file>
 
     <source-file src="src/android/io/branch/BranchSDK.java" target-dir="src/io/branch" />
-    <framework src="io.branch.sdk.android:library:2+" />
+    <framework src="build.gradle" custom="true" type="gradleReference" />
   </platform>
 
   <!-- iOS -->

diff --git a/src/android/io/branch/BranchSDK.java b/src/android/io/branch/BranchSDK.java
@@ -532,6 +532,27 @@ private void generateShortUrl(int instanceIdx, JSONObject options, JSONObject co
 
     }
 
+    /**
+     * <p>Sets the cookie based matching for all incoming requests.</p>
+     * <p>If you want cookie based matching, call this <b>before</b> initUserSession</p>
+     *
+     * @param linkDomain A {@link String} value to of the link domain for cookie based matching.
+     * @param callbackContext   A callback to execute at the end of this method
+     */
+    private void setCookieBasedMatching(String linkDomain, CallbackContext callbackContext)
+    {
+
+        this.activity = this.cordova.getActivity();
+
+        Branch instance = Branch.getAutoInstance(this.activity.getApplicationContext());
+
+        if (linkDomain != null) {
+            instance.enableCookieBasedMatching(linkDomain);
+        }
+
+        callbackContext.success("Success");
+    }
+
     /**
      * <p>Sets the library to function in debug mode, enabling logging of all requests.</p>
      * <p>If you want to flag debug, call this <b>before</b> initUserSession</p>

diff --git a/src/branch.js b/src/branch.js
@@ -79,6 +79,12 @@ Branch.prototype.setDebug = function (isEnabled) {
   return execute('setDebug', [isEnabled])
 }
 
+Branch.prototype.setCookieBasedMatching = function (linkDomain) {
+  if (linkDomain && deviceVendor.indexOf('Apple') < 0) {
+    return execute('setCookieBasedMatching', [linkDomain])
+  }
+}
+
 Branch.prototype.getFirstReferringParams = function () {
   return execute('getFirstReferringParams')
 }

diff --git a/src/ios/AppDelegate+BranchSdk.m b/src/ios/AppDelegate+BranchSdk.m
@@ -16,7 +16,7 @@
     #import <Branch/Branch.h>
 #endif
 
-@interface AppDelegate (BranchSDK)
+@interface AppDelegate (BranchSdk)
 
 - (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray * _Nullable))restorationHandler;
 
@@ -48,4 +48,14 @@ - (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserAct
     return YES;
 }
 
+// Respond to Push Notifications
+- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo {
+    @try {
+        [[Branch getInstance] handlePushNotification:userInfo];
+    }
+    @catch (NSException *exception) {
+        [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:@"BSDKPostUnhandledURL" object:userInfo]];
+    }
+}
+
 @end
diff --git a/src/scripts/android/updateAndroidManifest.js b/src/scripts/android/updateAndroidManifest.js
@@ -16,6 +16,7 @@
     var mainActivityIndex = getMainLaunchActivityIndex(manifest['manifest']['application'][0]['activity'])
 
     // update manifest
+    manifest = updateMultidex(manifest)
     manifest = updateBranchMetaData(manifest, preferences)
     manifest = updateBranchReferrerTracking(manifest)
     manifest = updateLaunchOptionToSingleTask(manifest, mainActivityIndex, preferences)
@@ -56,6 +57,14 @@
     return manifest
   }
 
+  // adds to <application> for multidex (needed for all the frameworks)
+  //    <application android:name="android.support.multidex.MultiDexApplication" >
+  //    </application>
+  function updateMultidex (manifest) {
+    manifest['manifest']['application'][0]['$']['android:name'] = 'android.support.multidex.MultiDexApplication'
+    return manifest
+  }
+
   // adds to <application> for install referrer tracking (optional)
   //    <receiver android:name="io.branch.referral.InstallListener" android:exported="true">
   //       <intent-filter>

diff --git a/src/scripts/npm/downloadNpmDependencies.js b/src/scripts/npm/downloadNpmDependencies.js
@@ -27,15 +27,10 @@
     var modules = getNodeModulesToInstall(dependencies)
     if (modules.length === 0) return async.promise
 
-    installNodeModules(modules, function (err) {
-      if (err) {
-        // handle error
-        throw new Error('BRANCH SDK: Failed to install the Branch SDK. Docs https://goo.gl/GijGKP')
-      } else {
-        // only run once
-        setPackageInstalled(installFlagLocation)
-        removeEtcDirectory()
-      }
+    installNodeModules(modules, function () {
+      // only run once
+      setPackageInstalled(installFlagLocation)
+      removeEtcDirectory()
       async.resolve()
     })
 
@@ -47,7 +42,7 @@
   function installNodeModules (modules, callback) {
     // base case
     if (modules.length <= 0) {
-      return callback(false)
+      return callback()
     }
 
     // install one at a time
@@ -58,7 +53,6 @@
     exec(install, function (err, stdout, stderr) {
       // handle error
       if (err) {
-        callback(true)
         throw new Error('BRANCH SDK: Failed to install Branch node dependency ' + module + '. Docs https://goo.gl/GijGKP')
       } else {
         // next module

diff --git a/testbed/config.xml → testbed/config.template.xml b/testbed/config.xml → testbed/config.template.xml
diff --git a/testbed/init.sh b/testbed/init.sh
@@ -66,8 +66,12 @@ main() {
   rm -rf ./plugins
   rm -rf ./platforms
   rm -rf ./build.json
+  rm -rf ./config.xml
   rm -rf ./package.json
 
+  # config
+  yes | \cp -f config.template.xml config.xml
+
   # build (platforms added before plugin because before_plugin_install does not work on file reference)
   if [[ "$run_ios" == "true" ]]; then
     cordova platform add ios
@@ -76,6 +80,13 @@ main() {
     cordova platform add android
   fi
 
+  # TODO: remove this cordova error fix (https://stackoverflow.com/questions/42350505/error-cannot-read-property-replace-of-undefined-when-building-ios-cordova)
+  if [[ "$run_ios" == "true" ]]; then
+    cd ./platforms/ios/cordova/node_modules/
+    npm install ios-sim@latest
+    cd ../../../../
+  fi
+
   # plugin
   cordova plugin add ../
 

diff --git a/testbed/www/js/index.js b/testbed/www/js/index.js
@@ -27,6 +27,9 @@ function BranchInit (isDebug) {
   // for development and debugging only
   Branch.setDebug(isDebug)
 
+  // for better Android matching
+  Branch.setCookieBasedMatching('cordova.app.link')
+
   // sync with Mixpanel if installed
   Branch.setMixpanelToken('your_mixpanel_token')