Remove any occurrences of -alternate links. (#810)

* Remove any occurances of -alterante links

* Android parity.

* Fixed the teamID issue.  Fixed some verbage.

Author: grim

Branch-SDK-Tests/Branch-SDK-Tests/BNCKeyChain.Test.m

@@ -82,4 +82,9 @@ - (void)testKeyChain {
     XCTAssertTrue([array isEqualToArray:@[ @"3xyz123" ]] && error == errSecSuccess);
 }
 
+- (void) testSecurityAccessGroup {
+    NSString *group = [BNCKeyChain securityAccessGroup];
+    XCTAssert(group.length > 0);
+}
+
 @end

Branch-SDK/Branch-SDK/BNCApplication.h

@@ -49,4 +49,6 @@
 /// Returns a dictionary of device / identity pairs.
 @property (atomic, readonly) NSDictionary<NSString*, NSString*>*_Nonnull deviceKeyIdentityValueDictionary;
 
+/// The team identifier for the app.
+@property (atomic, readonly) NSString* teamID;
 @end

Branch-SDK/Branch-SDK/BNCApplication.m

@@ -48,6 +48,14 @@ + (BNCApplication*) createCurrentApplication {
     application->_firstInstallDate = [BNCApplication firstInstallDate];
     application->_currentInstallDate = [BNCApplication currentInstallDate];
 
+    NSString*group =  [BNCKeyChain securityAccessGroup];
+    if (group) {
+        NSRange range = [group rangeOfString:@"."];
+        if (range.location != NSNotFound) {
+            application->_teamID = [[group substringToIndex:range.location] copy];
+        }
+    }
+
     return application;
 }
 

Branch-SDK/Branch-SDK/BNCKeyChain.h

@@ -39,7 +39,7 @@
                                    error:(NSError*_Nullable __autoreleasing *_Nullable)error;
 
 /**
- @brief Returns an array of all items found in the keychain.
+ @brief Returns an array of all items found in the keychain for an app.
 
  @param error       If an error occurs, the error is returned in `error` if it is not `NULL`.
  @return            Returns an array of the items stored in the keychain or `nil`.
@@ -58,4 +58,7 @@
                       forService:(NSString*_Nonnull)service
                              key:(NSString*_Nonnull)key
                 cloudAccessGroup:(NSString*_Nullable)accessGroup;
+
+/// The default security access group for the app.
++ (NSString*_Nullable) securityAccessGroup;
 @end

Branch-SDK/Branch-SDK/BNCKeyChain.m

@@ -215,4 +215,32 @@ + (NSError*) removeValuesForService:(NSString*)service key:(NSString*)key {
     return nil;
 }
 
++ (NSString*_Nullable) securityAccessGroup {
+    // https://stackoverflow.com/questions/11726672/access-app-identifier-prefix-programmatically
+    @synchronized(self) {
+        static NSString*_securityAccessGroup = nil;
+        if (_securityAccessGroup) return _securityAccessGroup;
+
+        NSDictionary* dictionary = @{
+            (__bridge id)kSecClass:                 (__bridge id)kSecClassGenericPassword,
+            (__bridge id)kSecReturnAttributes:      (__bridge id)kCFBooleanTrue,
+            (__bridge id)kSecAttrSynchronizable:    (__bridge id)kSecAttrSynchronizableAny,
+            (__bridge id)kSecMatchLimit:            (__bridge id)kSecMatchLimitOne
+        };
+        CFDictionaryRef resultDictionary = NULL;
+        OSStatus status = SecItemCopyMatching((__bridge CFDictionaryRef)dictionary, (CFTypeRef*)&resultDictionary);
+        if (status == errSecItemNotFound) return nil;
+        if (status != errSecSuccess) {
+            BNCLogDebugSDK(@"Get securityAccessGroup returned(%ld): %@.",
+                status, [self errorWithKey:nil OSStatus:status]);
+            return nil;
+        }
+        NSString*group =
+            [(__bridge NSDictionary *)resultDictionary objectForKey:(__bridge NSString *)kSecAttrAccessGroup];
+        if (group.length > 0) _securityAccessGroup = [group copy];
+        CFRelease(resultDictionary);
+        return _securityAccessGroup;
+    }
+}
+
 @end

Branch-SDK/Branch-SDK/Branch+Validator.m

@@ -9,6 +9,7 @@
 #import "Branch+Validator.h"
 #import "BNCSystemObserver.h"
 #import "BranchConstants.h"
+#import "BNCApplication.h"
 
 void BNCForceBranchValidatorCategoryToLoad(void) {
     // Empty body but forces loader to load the category.
@@ -38,14 +39,15 @@ - (void)validateSDKIntegrationCore {
 
 - (void) startValidation {
     BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper preferenceHelper];
-    NSString *endpoint = [BRANCH_REQUEST_ENDPOINT_APP_LINK_SETTINGS stringByAppendingPathComponent:preferenceHelper.lastRunBranchKey];
+    NSString *endpoint =
+        [BRANCH_REQUEST_ENDPOINT_APP_LINK_SETTINGS stringByAppendingPathComponent:preferenceHelper.lastRunBranchKey];
     [[[BNCServerInterface alloc] init]
         getRequest:nil
         url:[preferenceHelper getAPIURL:endpoint]
         key:nil
-        callback:^(BNCServerResponse *response, NSError *error) {
+        callback:^ (BNCServerResponse *response, NSError *error) {
             if (error) {
-                [self showAlertWithTitle:@"" message:@""];
+                [self showAlertWithTitle:@"Error" message:error.localizedDescription];
             } else {
                 [self validateIntegrationWithServerResponse:response];
             }
@@ -59,25 +61,25 @@ - (void) validateIntegrationWithServerResponse:(BNCServerResponse*)response {
     NSLog(@"** Initiating Branch integration verification **");
     NSLog(@"-------------------------------------------------");
 
-    NSLog(@"------ checking for URI scheme correctness ------");
+    NSLog(@"------ Checking for URI scheme correctness ------");
     NSString *serverUriScheme = response.data[@"ios_uri_scheme"];
     NSString *clientUriScheme = [NSString stringWithFormat:@"%@%@", [BNCSystemObserver getDefaultUriScheme], @"://"];
     NSString *uriScheme = [serverUriScheme isEqualToString:clientUriScheme] ? passString : errorString;
     NSString *uriSchemeMessage = [NSString stringWithFormat:@"%@: Dashboard Link Settings page '%@' compared to client side '%@'", uriScheme, serverUriScheme, clientUriScheme];
     NSLog(@"%@",uriSchemeMessage);
     NSLog(@"-------------------------------------------------");
 
-    NSLog(@"-- checking for bundle identifier correctness ---");
+    NSLog(@"-- Checking for bundle identifier correctness ---");
     NSString *serverBundleIdentifier = response.data[@"ios_bundle_id"];
     NSString *clientBundleIdentifier = [[NSBundle mainBundle] bundleIdentifier];
     NSString *bundleIdentifier = [serverBundleIdentifier isEqualToString:clientBundleIdentifier] ? passString : errorString;
     NSString *bundleIdentifierMessage = [NSString stringWithFormat:@"%@: Dashboard Link Settings page '%@' compared to client side '%@'", bundleIdentifier, serverBundleIdentifier, clientBundleIdentifier];
     NSLog(@"%@",bundleIdentifierMessage);
     NSLog(@"-------------------------------------------------");
 
-    NSLog(@"----- checking for iOS Team ID correctness ------");
+    NSLog(@"----- Checking for iOS Team ID correctness ------");
     NSString *serverTeamId = response.data[@"ios_team_id"];
-    NSString *clientTeamId = [BNCSystemObserver getTeamIdentifier];
+    NSString *clientTeamId = [BNCApplication currentApplication].teamID;
     NSString *teamID = [serverTeamId isEqualToString:clientTeamId] ? passString : errorString;
     NSString *teamIDMessage = [NSString stringWithFormat:@"%@: Dashboard Link Settings page '%@' compared to client side '%@'", teamID, serverTeamId, clientTeamId];
     NSLog(@"%@",teamIDMessage);
@@ -93,7 +95,7 @@ - (void) validateIntegrationWithServerResponse:(BNCServerResponse*)response {
     }
 
     NSLog(@"-------------------------------------------------------------------------------------------------------------------");
-    NSLog(@"-----To test your deeplink routing append ?validate=true to any branch link and click it on your mobile device-----");
+    NSLog(@"-----To test your deeplink routing append ?bnc_validate=true to any branch link and click it on your mobile device-----");
     NSLog(@"-------------------------------------------------------------------------------------------------------------------");
 
     BOOL testsFailed = NO;
@@ -170,14 +172,20 @@ - (void) validateIntegrationWithServerResponse:(BNCServerResponse*)response {
 
 - (void) showNextStep {
     NSString *message =
-        @"\nGreat! Comment out the 'validateSDKIntegration' line in your app.\n\n"
+        @"\nGreat! Remove the 'validateSDKIntegration' line in your app.\n\n"
          "Next check your deep link routing.\n\n"
-         "Append '?validate=true' to any of your app's Branch links and "
-         "click it on your mobile device (not the Simulator!) to start the test.\n\n"
+         "Append '?bnc_validate=true' to any of your app's Branch links and "
+         "click on it on your mobile device (not the Simulator!) to start the test.\n\n"
          "For instance, to validate a link like:\n"
          "https://<yourapp>.app.link/NdJ6nFzRbK\n\n"
          "click on:\n"
-         "https://<yourapp>.app.link/NdJ6nFzRbK?validate=true";
+         "https://<yourapp>.app.link/NdJ6nFzRbK?bnc_validate=true";
+    NSLog(
+        @"\n----------------------------------------------------------------------------"
+         "\nBranch Integration Next Steps\n"
+         "\n"
+         "%@"
+         "\n----------------------------------------------------------------------------", message);
     [self showAlertWithTitle:@"Next Step" message:message];
 }
 
@@ -283,6 +291,7 @@ + (NSString *) returnNonUniversalLink:(NSString *) referringLink {
             referringLink = [referringLink stringByAppendingString:@"/e/"];
         }
     }
+    referringLink = [referringLink stringByReplacingOccurrencesOfString:@"-alternate" withString:@""];
     return referringLink;
 }
 

Branch-SDK/Branch-SDK/Branch.m

@@ -2197,7 +2197,7 @@ - (void)handleInitSuccess {
     if ([latestReferringParams[@"_branch_validate"] isEqualToString:@"060514"]) {
         [self validateDeeplinkRouting:latestReferringParams];
     }
-    else if (([latestReferringParams[@"validate"] isEqualToString:@"true"])) {
+    else if (([latestReferringParams[@"bnc_validate"] isEqualToString:@"true"])) {
         NSString* referringLink = [self.class returnNonUniversalLink:latestReferringParams[@"~referring_link"] ];
         NSURLComponents *comp = [NSURLComponents componentsWithURL:[NSURL URLWithString:referringLink]
                                            resolvingAgainstBaseURL:NO];

Examples/UITestBed/README.md

@@ -0,0 +1,9 @@
+#  UITestBed
+
+This is a small app for testing all the Branch features and is easy to automate with automated Xcode UITests. 
+
+##  Test Links
+Some links for tests: 
+
+https://branch-uitestbed.app.link/MAzO7DEW6M
+

Examples/UITestBed/UITestBed.xcodeproj/project.pbxproj

@@ -136,6 +136,7 @@
 /* Begin PBXFileReference section */
 		4D0E07D01FCDF7810074E026 /* SafariServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SafariServices.framework; path = System/Library/Frameworks/SafariServices.framework; sourceTree = SDKROOT; };
 		4D0E07D11FCDF7920074E026 /* iAd.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = iAd.framework; path = System/Library/Frameworks/iAd.framework; sourceTree = SDKROOT; };
+		4D0F56B720B38394003D6607 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		4D12B9F720A100EB00E5B1DB /* UITestBed.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = UITestBed.strings; sourceTree = "<group>"; };
 		4D1683262098BD3E008819E3 /* BranchSetIdentityRequestTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchSetIdentityRequestTests.m; sourceTree = "<group>"; };
 		4D1683272098BD3E008819E3 /* BranchCloseRequestTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchCloseRequestTests.m; sourceTree = "<group>"; };
@@ -350,6 +351,7 @@
 		4DFF2B601EEF3B150043F840 = {
 			isa = PBXGroup;
 			children = (
+				4D0F56B720B38394003D6607 /* README.md */,
 				4D5ACEEC1FB382040099A56F /* BranchSDK.xcodeproj */,
 				4D1683242098BD3E008819E3 /* Branch-SDK-Tests */,
 				4DFF2B6B1EEF3B150043F840 /* UITestBed */,

Examples/UITestBed/UITestBed/TBAppDelegate.m

@@ -32,16 +32,19 @@ - (BOOL)application:(UIApplication *)application
     // Set to YES for testing GDPR compliance.
     // [Branch setTrackingDisabled:YES];
 
-#if 0
-    // This simulates opt-in tracking.
+    #if 0
+    // This simulates tracking opt-in, rather than tracking opt-out.
     if (![[NSUserDefaults standardUserDefaults] boolForKey:@"hasRunBefore"]) {
         [[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"hasRunBefore"];
         [Branch setTrackingDisabled:YES];
     }
-#endif
+    #endif
 
     // Initialize Branch
     Branch *branch = [Branch getInstance];
+
+    // This starts the Branch integration validation.  Remove for normal use.
+    // [branch validateSDKIntegration];
 
     // Comment / un-comment to toggle debugging
     [branch setDebug];