Merge pull request #913 from BranchMetrics/SDK-270-allow-shortlink-creation-when-tracking-is-disabled

Sdk 270 allow shortlink creation when tracking is disabled

Author: echo-branch

Branch-SDK/Branch-SDK/Branch.m

@@ -1802,7 +1802,7 @@ - (NSString *)generateShortUrl:(NSArray *)tags
                 linkData:linkData
                 linkCache:self.linkCache];
 
-        if ((self.initializationStatus == BNCInitStatusInitialized) && !self.preferenceHelper.trackingDisabled) {
+        if (self.initializationStatus == BNCInitStatusInitialized) {
             BNCLogDebug(@"Creating a custom URL synchronously.");
             BNCServerResponse *serverResponse = [req makeRequest:self.serverInterface key:self.class.branchKey];
             shortURL = [req processResponse:serverResponse];
@@ -2064,23 +2064,21 @@ - (void)processNextQueueItem {
 
         if (req) {
 
-            if (Branch.trackingDisabled) {
-                // If tracking is disabled keep failing everything in the queue.
-            }
-            else if (![req isKindOfClass:[BranchInstallRequest class]] && !self.preferenceHelper.identityID) {
+            if (![req isKindOfClass:[BranchInstallRequest class]] && !self.preferenceHelper.identityID) {
                 BNCLogError(@"User session has not been initialized!");
                 BNCPerformBlockOnMainThreadSync(^{
                     [req processResponse:nil error:[NSError branchErrorWithCode:BNCInitError]];
                 });
                 return;
-            }
-            else if (![req isKindOfClass:[BranchOpenRequest class]] &&
+                
+            } else if (![req isKindOfClass:[BranchOpenRequest class]] &&
                 (!self.preferenceHelper.deviceFingerprintID || !self.preferenceHelper.sessionID)) {
                 BNCLogError(@"Missing session items!");
                 BNCPerformBlockOnMainThreadSync(^{
                     [req processResponse:nil error:[NSError branchErrorWithCode:BNCInitError]];
                 });
                 return;
+                
             }
 
             dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0);

Branch-SDK/Branch-SDK/Networking/BNCServerInterface.m

@@ -609,14 +609,9 @@ - (void)genericHTTPRequest:(NSURLRequest *)request
 
     if (Branch.trackingDisabled) {
         NSString *endpoint = request.URL.absoluteString;
-        BNCPreferenceHelper *prefs = [BNCPreferenceHelper preferenceHelper];
-        if (([endpoint bnc_containsString:@"/v1/install"] ||
-             [endpoint bnc_containsString:@"/v1/open"]) &&
-             ((prefs.linkClickIdentifier.length > 0 ) ||
-              (prefs.spotlightIdentifier.length > 0 ) ||
-              (prefs.universalLinkUrl.length > 0))) {
-            // Allow this network operation since it's an open/install to resolve a link.
-        } else {
+        
+        // if endpoint is not on the whitelist, fail it.
+        if (![self whiteListContainsEndpoint:endpoint]) {
             [[BNCPreferenceHelper preferenceHelper] clearTrackingInformation];
             NSError *error = [NSError branchErrorWithCode:BNCTrackingDisabledError];
             BNCLogError(@"Network service error: %@.", error);
@@ -626,6 +621,7 @@ - (void)genericHTTPRequest:(NSURLRequest *)request
             return;
         }
     }
+    
     id<BNCNetworkOperationProtocol> operation =
         [self.networkService networkOperationWithURLRequest:request.copy completion:completionHandler];
     [operation start];
@@ -639,6 +635,28 @@ - (void)genericHTTPRequest:(NSURLRequest *)request
     }
 }
 
+- (BOOL)whiteListContainsEndpoint:(NSString *)endpoint {
+    BNCPreferenceHelper *prefs = [BNCPreferenceHelper preferenceHelper];
+    BOOL hasIdentifier = (prefs.linkClickIdentifier.length > 0 ) || (prefs.spotlightIdentifier.length > 0 ) || (prefs.universalLinkUrl.length > 0);
+    
+    // Allow install to resolve a link.
+    if ([endpoint bnc_containsString:@"/v1/install"] && hasIdentifier) {
+        return YES;
+    }
+    
+    // Allow open to resolve a link.
+    if ([endpoint bnc_containsString:@"/v1/open"] && hasIdentifier) {
+        return YES;
+    }
+    
+    // Allow short url creation requests
+    if ([endpoint bnc_containsString:@"/v1/url"]) {
+        return YES;
+    }
+    
+    return NO;
+}
+
 - (NSError*) verifyNetworkOperation:(id<BNCNetworkOperationProtocol>)operation {
 
     if (!operation) {