INTENG-9765 move control params to the data level

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