SDK-479 add optional developer provided id

Author: echo-branch

Branch-SDK-Tests/BranchCrossPlatformIDTests.m

@@ -30,6 +30,10 @@ - (void)testBuildFromJSON {
 
     BranchCrossPlatformID *cpid = [BranchCrossPlatformID buildFromJSON:json];
     XCTAssertNotNil(cpid);
+    XCTAssertNotNil(cpid.developerID);
+    XCTAssertNotNil(cpid.crossPlatformID);
+    XCTAssertNotNil(cpid.pastCrossPlatformIDs);
+    XCTAssertNotNil(cpid.probabiliticCrossPlatformIDs);
 }
 
 - (void)testBuildFromJSON_EmptyId {
@@ -59,6 +63,15 @@ - (void)testBuildFromJSON_EmptyProb {
     XCTAssertTrue(cpid.probabiliticCrossPlatformIDs.count == 0);
 }
 
+- (void)testBuildFromJSON_EmptyDevId {
+    NSDictionary *json = [BNCJsonLoader dictionaryFromJSONFileNamed:@"cpid_empty_dev_id"];
+    XCTAssertNotNil(json);
+    
+    BranchCrossPlatformID *cpid = [BranchCrossPlatformID buildFromJSON:json];
+    XCTAssertNotNil(cpid);
+    XCTAssertTrue([@"" isEqualToString:cpid.developerID]);
+}
+
 - (void)testBuildFromJSON_MissingId {
     NSDictionary *json = [BNCJsonLoader dictionaryFromJSONFileNamed:@"cpid_missing_id"];
     XCTAssertNotNil(json);
@@ -83,5 +96,13 @@ - (void)testBuildFromJSON_MissingProb {
     XCTAssertNil(cpid);
 }
 
+- (void)testBuildFromJSON_MissingDevId {
+    NSDictionary *json = [BNCJsonLoader dictionaryFromJSONFileNamed:@"cpid_missing_dev_id"];
+    XCTAssertNotNil(json);
+    
+    BranchCrossPlatformID *cpid = [BranchCrossPlatformID buildFromJSON:json];
+    XCTAssertNotNil(cpid);
+    XCTAssertNil(cpid.developerID);
+}
 
 @end

Branch-SDK/Branch-SDK/BranchCrossPlatformID.h

@@ -23,6 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface BranchCrossPlatformID : NSObject
 
 @property (nonatomic, copy, readonly) NSString *crossPlatformID;
+@property (nonatomic, copy, readonly) NSString *developerID;
 @property (nonatomic, strong, readonly) NSArray<NSString *> *pastCrossPlatformIDs;
 @property (nonatomic, strong, readonly) NSArray<BranchProbabilisticCrossPlatformID *> *probabiliticCrossPlatformIDs;
 

Branch-SDK/Branch-SDK/BranchCrossPlatformID.m

@@ -37,6 +37,7 @@ + (BranchCrossPlatformID *)buildFromJSON:(NSDictionary *)json {
 
     BranchCrossPlatformID *cpid = [BranchCrossPlatformID new];
     cpid->_crossPlatformID = [BNCJSONUtility stringForKey:@"cross_platform_id" json:userData];
+    cpid->_developerID = [BNCJSONUtility stringForKey:@"developer_identity" json:userData];
     cpid->_pastCrossPlatformIDs = [BNCJSONUtility stringArrayForKey:@"past_cross_platform_ids" json:userData];
 
     // parse probability pairs

cannedData/cpid.json

@@ -1,6 +1,7 @@
 {
     "user_data": {
         "cross_platform_id": "273e4c5da13b978ee2f78f8997abd972959c184aaffb8cad716721a00a08d32b",
+        "developer_identity": "[email protected]",
         "past_cross_platform_ids": [
             "a0bd175fd2c45b1cad81df45d5f1ddb117eadc98e61b85bb49f8f13e88ceff20",
             "z0bd175fd2c45b1cad81df45d5f1ddb117eadc98e61b85bb49f8f13e88ceff20"

cannedData/cpid_empty_dev_id.json

@@ -0,0 +1,20 @@
+{
+    "user_data": {
+        "cross_platform_id": "273e4c5da13b978ee2f78f8997abd972959c184aaffb8cad716721a00a08d32b",
+        "developer_identity": "",
+        "past_cross_platform_ids": [
+            "a0bd175fd2c45b1cad81df45d5f1ddb117eadc98e61b85bb49f8f13e88ceff20",
+            "z0bd175fd2c45b1cad81df45d5f1ddb117eadc98e61b85bb49f8f13e88ceff20"
+        ],
+        "prob_cross_platform_ids": [
+            {
+                "id": "88ce973fead4b23bca482725a7ac8d6e5198f0d2c70ec3c511472633c645de42",
+                "probability": 0.95
+            },
+            {
+                "id": "08ce973fead4b23bca482725a7ac8d6e5198f0d2c70ec3c511472633c645de42",
+                "probability": 0.91
+            }
+        ]
+    }
+}

cannedData/cpid_empty_id.json

@@ -1,6 +1,7 @@
 {
     "user_data": {
         "cross_platform_id": "",
+        "developer_identity": "[email protected]",
         "past_cross_platform_ids": [
             "a0bd175fd2c45b1cad81df45d5f1ddb117eadc98e61b85bb49f8f13e88ceff20",
             "z0bd175fd2c45b1cad81df45d5f1ddb117eadc98e61b85bb49f8f13e88ceff20"

cannedData/cpid_empty_past.json

@@ -1,6 +1,7 @@
 {
     "user_data": {
         "cross_platform_id": "273e4c5da13b978ee2f78f8997abd972959c184aaffb8cad716721a00a08d32b",
+        "developer_identity": "[email protected]",
         "past_cross_platform_ids": [ ],
         "prob_cross_platform_ids": [
             {

cannedData/cpid_empty_prob.json

@@ -1,5 +1,6 @@
 {
     "user_data": {
+        "developer_identity": "[email protected]",
         "cross_platform_id": "273e4c5da13b978ee2f78f8997abd972959c184aaffb8cad716721a00a08d32b",
         "past_cross_platform_ids": [
             "a0bd175fd2c45b1cad81df45d5f1ddb117eadc98e61b85bb49f8f13e88ceff20",

cannedData/cpid_missing_dev_id.json

@@ -0,0 +1,19 @@
+{
+    "user_data": {
+        "cross_platform_id": "273e4c5da13b978ee2f78f8997abd972959c184aaffb8cad716721a00a08d32b",
+        "past_cross_platform_ids": [
+            "a0bd175fd2c45b1cad81df45d5f1ddb117eadc98e61b85bb49f8f13e88ceff20",
+            "z0bd175fd2c45b1cad81df45d5f1ddb117eadc98e61b85bb49f8f13e88ceff20"
+        ],
+        "prob_cross_platform_ids": [
+            {
+                "id": "88ce973fead4b23bca482725a7ac8d6e5198f0d2c70ec3c511472633c645de42",
+                "probability": 0.95
+            },
+            {
+                "id": "08ce973fead4b23bca482725a7ac8d6e5198f0d2c70ec3c511472633c645de42",
+                "probability": 0.91
+            }
+        ]
+    }
+}

cannedData/cpid_missing_id.json

@@ -1,5 +1,6 @@
 {
     "user_data": {
+        "developer_identity": "[email protected]",
         "past_cross_platform_ids": [
             "a0bd175fd2c45b1cad81df45d5f1ddb117eadc98e61b85bb49f8f13e88ceff20"
         ],