Refactor create user to make the alias explicit

* The 2nd use of create user is passing an external ID to hydrate the OSID. Let's make it explicit by using the alias as a parameter and creating an additional initializer for the Create User Request.
* Here I also removed encoding and decoding of the `path` property. This should not be decoded as it may not be encoded yet. The `prepareForExecution` will always generate the path. Other requests follow this pattern already.

Author: nan-li

iOS_SDK/OneSignalSDK/OneSignalUser/Source/Executors/OSUserExecutor.swift

@@ -191,15 +191,10 @@ extension OSUserExecutor {
     }
 
     /**
-     This Create User call expects an Identity Model with external ID to hydrate the OneSignal ID
+     This Create User call expects an external ID and the Identity Model to hydrate with the OneSignal ID
      */
-    static func createUser(identityModel: OSIdentityModel) {
-        guard identityModel.externalId != nil else {
-            OneSignalLog.onesignalLog(.LL_ERROR, message: "createUser(identityModel) called with missing external ID")
-            return
-        }
-
-        let request = OSRequestCreateUser(identityModel: identityModel, propertiesModel: nil, pushSubscriptionModel: nil, originalPushToken: nil)
+    static func createUser(aliasLabel: String, aliasId: String, identityModel: OSIdentityModel) {
+        let request = OSRequestCreateUser(aliasLabel: aliasLabel, aliasId: aliasId, identityModel: identityModel)
         appendToQueue(request)
         executePendingRequests()
     }
@@ -209,7 +204,7 @@ extension OSUserExecutor {
             return
         }
         guard request.prepareForExecution() else {
-            // Currently there are no requirements needed before sending this request
+            // Currently there are no requirements needed before sending this request, so this will set the path
             return
         }
         request.sentToClient = true
@@ -369,7 +364,7 @@ extension OSUserExecutor {
                         createUser(OneSignalUserManagerImpl.sharedInstance.user)
                     } else {
                         // This will hydrate the OneSignal ID for any pending requests
-                        createUser(identityModel: request.identityModelToUpdate)
+                        createUser(aliasLabel: request.aliasLabel, aliasId: request.aliasId, identityModel: request.identityModelToUpdate)
                     }
                 } else if responseType == .invalid || responseType == .unauthorized {
                     // Failed, no retry

iOS_SDK/OneSignalSDK/OneSignalUser/Source/Requests/OSRequestCreateUser.swift

@@ -66,7 +66,7 @@ class OSRequestCreateUser: OneSignalRequest, OSUserRequest {
         self.originalPushToken = pushSubscriptionModel.address
     }
 
-    init(identityModel: OSIdentityModel, propertiesModel: OSPropertiesModel?, pushSubscriptionModel: OSSubscriptionModel?, originalPushToken: String?) {
+    init(identityModel: OSIdentityModel, propertiesModel: OSPropertiesModel, pushSubscriptionModel: OSSubscriptionModel, originalPushToken: String?) {
         self.identityModel = identityModel
         self.pushSubscriptionModel = pushSubscriptionModel
         self.originalPushToken = originalPushToken
@@ -82,18 +82,25 @@ class OSRequestCreateUser: OneSignalRequest, OSUserRequest {
         }
 
         // Properties Object
-        if let propertiesModel = propertiesModel {
-            var propertiesObject: [String: Any] = [:]
-            propertiesObject["language"] = propertiesModel.language
-            propertiesObject["timezone_id"] = propertiesModel.timezoneId
-            params["properties"] = propertiesObject
-        }
+        var propertiesObject: [String: Any] = [:]
+        propertiesObject["language"] = propertiesModel.language
+        propertiesObject["timezone_id"] = propertiesModel.timezoneId
+        params["properties"] = propertiesObject
 
         params["refresh_device_metadata"] = true
         self.parameters = params
-        if let pushSub = pushSubscriptionModel {
-            self.updatePushSubscriptionModel(pushSub)
-        }
+        self.updatePushSubscriptionModel(pushSubscriptionModel)
+        self.method = POST
+    }
+
+    init(aliasLabel: String, aliasId: String, identityModel: OSIdentityModel) {
+        self.identityModel = identityModel
+        self.stringDescription = "<OSRequestCreateUser with alias \(aliasLabel): \(aliasId)>"
+        super.init()
+        self.parameters = [
+            "identity": [aliasLabel: aliasId],
+            "refresh_device_metadata": true,
+        ]
         self.method = POST
     }
 
@@ -103,7 +110,6 @@ class OSRequestCreateUser: OneSignalRequest, OSUserRequest {
         coder.encode(originalPushToken, forKey: "originalPushToken")
         coder.encode(parameters, forKey: "parameters")
         coder.encode(method.rawValue, forKey: "method") // Encodes as String
-        coder.encode(path, forKey: "path")
         coder.encode(timestamp, forKey: "timestamp")
     }
 
@@ -112,7 +118,6 @@ class OSRequestCreateUser: OneSignalRequest, OSUserRequest {
             let identityModel = coder.decodeObject(forKey: "identityModel") as? OSIdentityModel,
             let parameters = coder.decodeObject(forKey: "parameters") as? [String: Any],
             let rawMethod = coder.decodeObject(forKey: "method") as? UInt32,
-            let path = coder.decodeObject(forKey: "path") as? String,
             let timestamp = coder.decodeObject(forKey: "timestamp") as? Date
         else {
             // Log error
@@ -125,7 +130,6 @@ class OSRequestCreateUser: OneSignalRequest, OSUserRequest {
         super.init()
         self.parameters = parameters
         self.method = HTTPMethod(rawValue: rawMethod)
-        self.path = path
         self.timestamp = timestamp
     }
 }