Updated migrateOldGbraid code

Author: nsingh-branch

Branch-TestBed/Branch-SDK-Tests/BNCReferringURLUtilityTests.m

@@ -20,6 +20,7 @@ - (BNCUrlQueryParameter *)findUrlQueryParam:(NSString *)paramName;
 - (NSTimeInterval)defaultValidityWindowForParam:(NSString *)paramName;
 - (NSMutableDictionary *)serializeToJson:(NSMutableDictionary<NSString *, BNCUrlQueryParameter *> *)urlQueryParameters;
 - (NSMutableDictionary<NSString *, BNCUrlQueryParameter *> *)deserializeFromJson:(NSDictionary *)json;
+- (void)checkForAndMigrateOldGbraid;
 
 @end
 
@@ -82,7 +83,7 @@ - (void)testParseURL {
     XCTAssertEqualObjects(savedParams, expectedParams);
 }
 
--(void)testGetEventURLQueryParams {
+- (void)testGetEventURLQueryParams {
 
     NSDictionary *params = [utility getURLQueryParamsForRequest:eventEndpoint];
     NSDictionary *expectedParams = @{@"gbraid": gbraidValue,
@@ -92,7 +93,7 @@ -(void)testGetEventURLQueryParams {
     XCTAssertEqualObjects(params, expectedParams);
 }
 
--(void)testGetOpenURLQueryParams {
+- (void)testGetOpenURLQueryParams {
 
     NSDictionary *params = [utility getURLQueryParamsForRequest:openEndpoint];
     NSDictionary *expectedParams = @{@"gbraid": gbraidValue,
@@ -103,15 +104,15 @@ -(void)testGetOpenURLQueryParams {
     XCTAssertEqualObjects(params, expectedParams);
 }
 
--(void)testAddGclidValueFor {
+- (void)testAddGclidValueFor {
     NSString *eventGclidValue = [utility addGclidValueFor:eventEndpoint];
     XCTAssertEqualObjects(eventGclidValue, gclidValue);
 
     NSString *openGclidValue = [utility addGclidValueFor:openEndpoint];
     XCTAssertEqualObjects(openGclidValue, gclidValue);
 }
 
--(void)testAddGbraidValuesFor {
+- (void)testAddGbraidValuesFor {
     NSDictionary *eventGbraidValue = [utility addGbraidValuesFor:eventEndpoint];
 
     NSDictionary *expectedEventGraidValue = @{
@@ -131,7 +132,7 @@ -(void)testAddGbraidValuesFor {
     XCTAssertEqualObjects(openGbraidValue, expectedOpenGraidValue);
 }
 
--(void)testIsSupportedQueryParameter {
+- (void)testIsSupportedQueryParameter {
     NSArray *validURLQueryParameters = @[@"gbraid", @"gclid"];
 
     for (NSString *param in validURLQueryParameters) {
@@ -140,7 +141,7 @@ -(void)testIsSupportedQueryParameter {
 
 }
 
--(void)testFindUrlQueryParam {
+- (void)testFindUrlQueryParam {
     BNCUrlQueryParameter *gbraid = [utility findUrlQueryParam:@"gbraid"];
 
     BNCUrlQueryParameter *expectedGbraid = [BNCUrlQueryParameter new];
@@ -164,13 +165,13 @@ -(void)testFindUrlQueryParam {
     XCTAssertEqualObjects(gclid, expectedGclid);
 }
 
--(void)testDefaultValidityWindowForParam {
+- (void)testDefaultValidityWindowForParam {
 
     XCTAssertEqual(2592000, [utility defaultValidityWindowForParam:@"gbraid"]);
     XCTAssertEqual(0, [utility defaultValidityWindowForParam:@"gclid"]);
 }
 
--(void)testSerializeToJson {
+- (void)testSerializeToJson {
 
     NSDate *currentDate = [NSDate date];
     NSMutableDictionary<NSString *, BNCUrlQueryParameter *> * params = [NSMutableDictionary new];
@@ -216,7 +217,7 @@ -(void)testSerializeToJson {
     XCTAssertEqualObjects(params, deserializedParams);
 }
 
--(void)testDeserializeFromJson {
+- (void)testDeserializeFromJson {
     NSDate *currentDate = [NSDate date];
 
     NSMutableDictionary<NSString *, BNCUrlQueryParameter *> * params = [NSMutableDictionary new];

Branch-TestBed/Branch-TestBed/AppDelegate.m

@@ -31,11 +31,10 @@ - (BOOL)application:(UIApplication *)application
        Info.plist file. This makes Branch test against your test environment (As shown in the Branch
        Dashboard) instead of the live environment.
     */
-    [Branch setReferrerGbraidValidityWindow: 1000000000];
 
     // Branch.useTestBranchKey = YES;  // Make sure to comment this line out for production apps!!!
     Branch *branch = [Branch getInstance];
-    
+        
     // test pre init support
     //[self testDispatchToIsolationQueue:branch]
 

BranchSDK/BNCReferringURLUtility.m

@@ -25,8 +25,8 @@ - (instancetype)init {
     self = [super init];
 
     if (self) {        
-        [self checkForAndMigrateOldGbraid];
         self.urlQueryParameters = [self deserializeFromJson:[BNCPreferenceHelper sharedInstance].referringURLQueryParameters];
+        [self checkForAndMigrateOldGbraid];
     }
 
     return self;
@@ -180,24 +180,29 @@ - (NSMutableDictionary *)serializeToJson:(NSMutableDictionary<NSString *, BNCUrl
     return result;
 }
 
-//Turns an old gbraid into a new BNCUrlQueryParameter and saves it for use, then clears it.
+//Turns an old gbraid into a new BNCUrlQueryParameter and saves it for use, then clears the old gbraid.
 -(void)checkForAndMigrateOldGbraid {
-    if ([BNCPreferenceHelper sharedInstance].referrerGBRAID) {
-        
-        NSString *existingGbraidValue = [BNCPreferenceHelper sharedInstance].referrerGBRAID;
-        NSTimeInterval existingGbraidValidityWindow = [BNCPreferenceHelper sharedInstance].referrerGBRAIDValidityWindow;
-        NSDate *existingGbraidInitDate = [BNCPreferenceHelper sharedInstance].referrerGBRAIDInitDate;
-        
-        BNCUrlQueryParameter *gbraid = [BNCUrlQueryParameter new];
-        gbraid.name = BRANCH_REQUEST_KEY_REFERRER_GBRAID;
-        gbraid.value = existingGbraidValue;
-        gbraid.timestamp = existingGbraidInitDate;
-        gbraid.validityWindow = existingGbraidValidityWindow;
-        gbraid.isDeepLink = NO;
 
-        if (self.urlQueryParameters[BRANCH_REQUEST_KEY_REFERRER_GBRAID].value == nil) {
+    if (self.urlQueryParameters[BRANCH_REQUEST_KEY_REFERRER_GBRAID] != nil) {
+        if ([BNCPreferenceHelper sharedInstance].referrerGBRAID) {
+            NSString *existingGbraidValue = [BNCPreferenceHelper sharedInstance].referrerGBRAID;
+            NSTimeInterval existingGbraidValidityWindow = [BNCPreferenceHelper sharedInstance].referrerGBRAIDValidityWindow;
+            NSDate *existingGbraidInitDate = [BNCPreferenceHelper sharedInstance].referrerGBRAIDInitDate;
+            
+            BNCUrlQueryParameter *gbraid = [BNCUrlQueryParameter new];
+            gbraid.name = BRANCH_REQUEST_KEY_REFERRER_GBRAID;
+            gbraid.value = existingGbraidValue;
+            gbraid.timestamp = existingGbraidInitDate;
+            gbraid.validityWindow = existingGbraidValidityWindow;
+            gbraid.isDeepLink = NO;
+            
             [self.urlQueryParameters setValue:gbraid forKey:BRANCH_REQUEST_KEY_REFERRER_GBRAID];
+            
             [BNCPreferenceHelper sharedInstance].referringURLQueryParameters = [self serializeToJson:self.urlQueryParameters];
+                
+            [BNCPreferenceHelper sharedInstance].referrerGBRAID = nil;
+            [BNCPreferenceHelper sharedInstance].referrerGBRAIDValidityWindow = 0;
+            [BNCPreferenceHelper sharedInstance].referrerGBRAIDInitDate = nil;
         }
     }
 }