Remove filter on alias length for identityID (INTENG-3725, #718)

* Remove filter on alias length for identityID in BranchShortUrlRequest and BranchShortUrlSyncRequest (INTENG-3725).

Author: jdee

Branch-SDK/Branch-SDK/Networking/Requests/BranchShortUrlRequest.m

@@ -56,7 +56,7 @@ - (void)makeRequest:(BNCServerInterface *)serverInterface key:(NSString *)key ca
     BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper preferenceHelper];
     params[BRANCH_REQUEST_KEY_DEVICE_FINGERPRINT_ID] = preferenceHelper.deviceFingerprintID;
 
-    if (!_isSpotlightRequest && _alias.length == 0) {
+    if (!_isSpotlightRequest) {
         params[BRANCH_REQUEST_KEY_BRANCH_IDENTITY] = preferenceHelper.identityID;
     }
     params[BRANCH_REQUEST_KEY_SESSION_ID] = preferenceHelper.sessionID;

Branch-SDK/Branch-SDK/Networking/Requests/BranchShortUrlSyncRequest.m

@@ -54,8 +54,7 @@ - (BNCServerResponse *)makeRequest:(BNCServerInterface *)serverInterface key:(NS
 
     BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper preferenceHelper];
     params[BRANCH_REQUEST_KEY_DEVICE_FINGERPRINT_ID] = preferenceHelper.deviceFingerprintID;
-    if (_alias.length == 0)
-        params[BRANCH_REQUEST_KEY_BRANCH_IDENTITY] = preferenceHelper.identityID;
+    params[BRANCH_REQUEST_KEY_BRANCH_IDENTITY] = preferenceHelper.identityID;
     params[BRANCH_REQUEST_KEY_SESSION_ID] = preferenceHelper.sessionID;
 
     return [serverInterface postRequestSynchronous:params

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

@@ -44,7 +44,7 @@ - (void)testRequestBody {
     BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper preferenceHelper];
     NSDictionary * const expectedParams = @{
         BRANCH_REQUEST_KEY_SESSION_ID: preferenceHelper.sessionID,
-    /*  BRANCH_REQUEST_KEY_BRANCH_IDENTITY: preferenceHelper.identityID, */     //  If we set an alias, don't set identity.
+        BRANCH_REQUEST_KEY_BRANCH_IDENTITY: preferenceHelper.identityID,
         BRANCH_REQUEST_KEY_DEVICE_FINGERPRINT_ID: preferenceHelper.deviceFingerprintID,
         BRANCH_REQUEST_KEY_URL_ALIAS: ALIAS,
         BRANCH_REQUEST_KEY_URL_CHANNEL: CHANNEL,

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

@@ -44,7 +44,7 @@ - (void)testRequestBody {
     BNCPreferenceHelper *preferenceHelper = [BNCPreferenceHelper preferenceHelper];
     NSDictionary * const expectedParams = @{
         BRANCH_REQUEST_KEY_SESSION_ID: preferenceHelper.sessionID,
-    /*  BRANCH_REQUEST_KEY_BRANCH_IDENTITY: preferenceHelper.identityID, */     // If we set an alias, don't set an identity.
+        BRANCH_REQUEST_KEY_BRANCH_IDENTITY: preferenceHelper.identityID,
         BRANCH_REQUEST_KEY_DEVICE_FINGERPRINT_ID: preferenceHelper.deviceFingerprintID,
         BRANCH_REQUEST_KEY_URL_ALIAS: ALIAS,
         BRANCH_REQUEST_KEY_URL_CHANNEL: CHANNEL,