Merge pull request #1311 from BranchMetrics/integration-validator-uri-scheme-fix

iOS Integration Validator Bugfix (for client<>server URI scheme check)

Author: rob-gioia-branch

Sources/BranchSDK/BNCSystemObserver.m

@@ -148,6 +148,23 @@ + (NSString *)defaultURIScheme {
     return nil;
 }
 
++ (BOOL)compareUriSchemes : (NSString *) serverUriScheme {
+    NSArray *urlTypes = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleURLTypes"];
+
+    for (NSDictionary *urlType in urlTypes) {
+
+        NSArray *urlSchemes = [urlType objectForKey:@"CFBundleURLSchemes"];
+        for (NSString *uriScheme in urlSchemes) {
+            NSString * serverUriSchemeWithoutSuffix = [serverUriScheme substringToIndex:[serverUriScheme length] - 3];
+            if ([uriScheme isEqualToString:serverUriSchemeWithoutSuffix]) {
+                return true; }
+        }
+        // If no Uri schemes match the one set on the dashboard
+        return false;
+    }
+    return false;
+}
+
 + (NSString *)bundleIdentifier {
     return [[NSBundle mainBundle] bundleIdentifier];
 }

Sources/BranchSDK/Branch+Validator.m

@@ -69,16 +69,13 @@ - (void) validateIntegrationWithServerResponse:(BNCServerResponse*)response {
 
     NSLog(@"------ Checking for URI scheme correctness ------");
     NSString *clientUriScheme = [NSString stringWithFormat:@"%@%@", [BNCSystemObserver defaultURIScheme], @"://"];
-    NSString *uriScheme = [serverUriScheme isEqualToString:clientUriScheme] ? passString : errorString;
-    NSString *uriSchemeMessage =
-        [NSString stringWithFormat:@"%@: Dashboard Link Settings page '%@' compared to client side '%@'",
-            uriScheme, serverUriScheme, clientUriScheme];
-    NSLog(@"%@",uriSchemeMessage);
+    NSString *uriScheme = [BNCSystemObserver compareUriSchemes:serverUriScheme] ? passString : errorString;
     NSLog(@"-------------------------------------------------");
 
     NSLog(@"-- Checking for bundle identifier correctness ---");
     NSString *clientBundleIdentifier = [[NSBundle mainBundle] bundleIdentifier] ?: @"";
-    NSString *bundleIdentifier = [serverBundleID isEqualToString:clientBundleIdentifier] ? passString : errorString;
+    bool doUriSchemesMatch = [serverBundleID isEqualToString:clientBundleIdentifier];
+    NSString *bundleIdentifier = doUriSchemesMatch ? passString : errorString;
     NSString *bundleIdentifierMessage =
         [NSString stringWithFormat:@"%@: Dashboard Link Settings page '%@' compared to client side '%@'",
             bundleIdentifier, serverBundleID, clientBundleIdentifier];
@@ -113,7 +110,7 @@ - (void) validateIntegrationWithServerResponse:(BNCServerResponse*)response {
 
     // Build an alert string:
     NSString *alertString = @"\n";
-    if (serverUriScheme.length && [serverUriScheme isEqualToString:clientUriScheme]) {
+    if (serverUriScheme.length && doUriSchemesMatch) {
         alertString = [alertString stringByAppendingFormat:@"%@URI Scheme matches:\n\t'%@'\n",
             kPassMark,  serverUriScheme];
     } else {

Sources/BranchSDK/Private/BNCSystemObserver.h

@@ -33,5 +33,6 @@
 + (NSString *)appleAttributionToken;
 + (NSString *)environment;
 + (BOOL)isAppClip;
++ (BOOL)compareUriSchemes:(NSString *) serverUriScheme;
 
 @end