Merge pull request #12 from BranchMetrics/INTENG-9765-control-params-must-be-in-data

Inteng 9765 control params must be in data

Author: echo-branch

Branch/BranchLinkProperties.m

@@ -60,7 +60,7 @@ - (NSDictionary*) dictionary {
     addInteger(matchDuration, ~duration);
     addInteger(linkType, ~type);
 
-    [dictionary addEntriesFromDictionary:self.controlParams];
+    //[dictionary addEntriesFromDictionary:self.controlParams];
 
     return dictionary;
 }

Branch/BranchMainClass.m

@@ -700,7 +700,13 @@ - (void) branchShortLinkWithContent:(BranchUniversalObject*)content
 
     NSMutableDictionary*dictionary = [NSMutableDictionary new];
     [dictionary addEntriesFromDictionary:linkProperties.dictionary];
-    dictionary[@"data"] = content.dictionary;
+    
+    // Control params must also be at the data level
+    NSMutableDictionary *data = [NSMutableDictionary new];
+    [data addEntriesFromDictionary:linkProperties.controlParams];
+    [data addEntriesFromDictionary:content.dictionary];
+    dictionary[@"data"] = data;
+    
     [self.networkAPIService appendV1APIParametersWithDictionary:dictionary];
     [self.networkAPIService postOperationForAPIServiceName:@"v1/url"
         dictionary:dictionary

Examples/TestBed-macOS/TestBed-macOS/APPViewController.m

@@ -264,7 +264,7 @@ - (BranchUniversalObject*) createUniversalObject {
 - (BranchLinkProperties*) createLinkProperties {
     NSString *feature = @"Sharing Feature";
     NSString *channel = @"Distribution Channel";
-//    NSString *desktop_url = @"http://branch.io";
+    NSString *desktop_url = @"http://branch.io";
 //    NSString *ios_url = @"https://dev.branch.io/getting-started/sdk-integration-guide/guide/ios/";
 
     BranchLinkProperties *linkProperties = [[BranchLinkProperties alloc] init];
@@ -274,6 +274,9 @@ - (BranchLinkProperties*) createLinkProperties {
     linkProperties.stage = @"stage four";
     linkProperties.campaign = @"some campaign";
     linkProperties.matchDuration = 18000;
+    
+    linkProperties.controlParams[@"$desktop_url"] = desktop_url;
+    
     // TODO: Control params:
 //    [linkProperties addControlParam:@"$desktop_url" withValue: desktop_url];
 //    [linkProperties addControlParam:@"$ios_url" withValue: ios_url];