Merge pull request #1353 from OneSignal/add_to_all_OneSignal-Subscription-Id

Add `OneSignal-Subscription-Id` to all Update User requests

Author: nan-li

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

@@ -44,7 +44,7 @@ class OSRequestUpdateProperties: OneSignalRequest, OSUserRequest {
     func prepareForExecution() -> Bool {
         if let onesignalId = identityModel.onesignalId,
             let appId = OneSignalConfigManager.getAppId(),
-           addPushSubscriptionIdToAdditionalHeadersIfNeeded() {
+           addPushSubscriptionIdToAdditionalHeaders() {
             self.addJWTHeader(identityModel: identityModel)
             self.path = "apps/\(appId)/users/by/\(OS_ONESIGNAL_ID)/\(onesignalId)"
             return true
@@ -55,21 +55,15 @@ class OSRequestUpdateProperties: OneSignalRequest, OSUserRequest {
         }
     }
 
-    func addPushSubscriptionIdToAdditionalHeadersIfNeeded() -> Bool {
-        guard let parameters = self.parameters else {
+    func addPushSubscriptionIdToAdditionalHeaders() -> Bool {
+        if let pushSubscriptionId = OneSignalUserManagerImpl.sharedInstance.pushSubscriptionId {
+            var additionalHeaders = self.additionalHeaders ?? [String: String]()
+            additionalHeaders["OneSignal-Subscription-Id"] = pushSubscriptionId
+            self.additionalHeaders = additionalHeaders
             return true
+        } else {
+            return false
         }
-        if parameters["deltas"] != nil { // , !parameters["deltas"].isEmpty
-            if let pushSubscriptionId = OneSignalUserManagerImpl.sharedInstance.pushSubscriptionId {
-                var additionalHeaders = self.additionalHeaders ?? [String: String]()
-                additionalHeaders["OneSignal-Subscription-Id"] = pushSubscriptionId
-                self.additionalHeaders = additionalHeaders
-                return true
-            } else {
-                return false
-            }
-        }
-        return true
     }
 
     init(properties: [String: Any], deltas: [String: Any]?, refreshDeviceMetadata: Bool?, modelToUpdate: OSPropertiesModel, identityModel: OSIdentityModel) {