Merge pull request #1151 from BranchMetrics/CORE-2463-workaround-server-side-issue

CORE-2463 fallback to the old name. this mitigates a server issue

Author: echo-branch

Branch-SDK/BranchOpenRequest.m

@@ -163,6 +163,11 @@ - (void)processResponse:(BNCServerResponse *)response error:(NSError *)error {
     }
 
     preferenceHelper.randomizedDeviceToken = data[BRANCH_RESPONSE_KEY_RANDOMIZED_DEVICE_TOKEN];
+    if (!preferenceHelper.randomizedDeviceToken) {
+        // fallback to deprecated name. Fingerprinting was removed long ago, hence the name change.
+        preferenceHelper.randomizedDeviceToken = data[@"device_fingerprint_id"];
+    }
+    
     preferenceHelper.userUrl = data[BRANCH_RESPONSE_KEY_USER_URL];
     preferenceHelper.userIdentity = userIdentity;
     preferenceHelper.sessionID = data[BRANCH_RESPONSE_KEY_SESSION_ID];
@@ -253,9 +258,17 @@ - (void)processResponse:(BNCServerResponse *)response error:(NSError *)error {
     preferenceHelper.referringURL = referringURL;
     preferenceHelper.dropURLOpen = NO;
 
+    
     NSString *string = BNCStringFromWireFormat(data[BRANCH_RESPONSE_KEY_RANDOMIZED_BUNDLE_TOKEN]);
-    if (string) preferenceHelper.randomizedBundleToken = string;
-
+    if (!string) {
+        // fallback to deprecated name. The old name was easily confused with the setIdentity, hence the name change.
+        string = BNCStringFromWireFormat(data[@"identity_id"]);
+    }
+    
+    if (string) {
+        preferenceHelper.randomizedBundleToken = string;
+    }
+    
     [BranchOpenRequest releaseOpenResponseLock];
 
     BranchContentDiscoveryManifest *cdManifest = [BranchContentDiscoveryManifest getInstance];