Update executors to set offsets on consistency manager

Motivation: executors make the update or create requests and get back an offset which is saved in the consistency manager

Author: Rodrigo Gomez Palacio

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

@@ -245,7 +245,7 @@ class OSPropertyOperationExecutor: OSOperationExecutor {
             OSBackgroundTaskManager.beginBackgroundTask(backgroundTaskIdentifier)
         }
 
-        OneSignalCoreImpl.sharedClient().execute(request) { _ in
+        OneSignalCoreImpl.sharedClient().execute(request) { response in
             // On success, remove request from cache, and we do need to hydrate
             // TODO: We need to hydrate after all ? What why ?
             self.dispatchQueue.async {
@@ -255,6 +255,14 @@ class OSPropertyOperationExecutor: OSOperationExecutor {
                     OSBackgroundTaskManager.endBackgroundTask(backgroundTaskIdentifier)
                 }
             }
+            if let onesignalId = request.identityModel.onesignalId {
+                if let rywToken = response?["ryw_token"] as? String
+                {
+                    OSConsistencyManager.shared.setRywToken(id: onesignalId, key: OSIamFetchOffsetKey.userUpdate, value: rywToken)
+                } else {
+                    OSConsistencyManager.shared.resolveConditionsWithID(id: OSIamFetchReadyCondition.CONDITIONID)
+                }
+            }
         } onFailure: { error in
             OneSignalLog.onesignalLog(.LL_ERROR, message: "OSPropertyOperationExecutor update properties request failed with error: \(error.debugDescription)")
             self.dispatchQueue.async {

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

@@ -284,19 +284,30 @@ class OSSubscriptionOperationExecutor: OSOperationExecutor {
         }
 
         OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSSubscriptionOperationExecutor: executeCreateSubscriptionRequest making request: \(request)")
-        OneSignalCoreImpl.sharedClient().execute(request) { result in
+        OneSignalCoreImpl.sharedClient().execute(request) { response in
             // On success, remove request from cache (even if not hydrating model), and hydrate model
             self.dispatchQueue.async {
                 self.addRequestQueue.removeAll(where: { $0 == request})
                 OneSignalUserDefaults.initShared().saveCodeableData(forKey: OS_SUBSCRIPTION_EXECUTOR_ADD_REQUEST_QUEUE_KEY, withValue: self.addRequestQueue)
 
-                guard let response = result?["subscription"] as? [String: Any] else {
+                guard let response = response?["subscription"] as? [String: Any] else {
                     OneSignalLog.onesignalLog(.LL_ERROR, message: "Unabled to parse response to create subscription request")
                     if inBackground {
                         OSBackgroundTaskManager.endBackgroundTask(backgroundTaskIdentifier)
                     }
                     return
                 }
+                
+                let onesignalId = OneSignalUserManagerImpl.sharedInstance.onesignalId;
+                if let onesignalId = request.identityModel.onesignalId {
+                    if let rywToken = response["ryw_token"] as? String
+                    {
+                        OSConsistencyManager.shared.setRywToken(id: onesignalId, key: OSIamFetchOffsetKey.subscriptionUpdate, value: rywToken)
+                    } else {
+                        OSConsistencyManager.shared.resolveConditionsWithID(id: OSIamFetchReadyCondition.CONDITIONID)
+                    }
+                }
+                
                 request.subscriptionModel.hydrate(response)
                 if inBackground {
                     OSBackgroundTaskManager.endBackgroundTask(backgroundTaskIdentifier)
@@ -393,7 +404,7 @@ class OSSubscriptionOperationExecutor: OSOperationExecutor {
             OSBackgroundTaskManager.beginBackgroundTask(backgroundTaskIdentifier)
         }
 
-        OneSignalCoreImpl.sharedClient().execute(request) { _ in
+        OneSignalCoreImpl.sharedClient().execute(request) { response in
             // On success, remove request from cache. No model hydration occurs.
             // For example, if app restarts and we read in operations between sending this off and getting the response
             self.dispatchQueue.async {
@@ -403,6 +414,15 @@ class OSSubscriptionOperationExecutor: OSOperationExecutor {
                     OSBackgroundTaskManager.endBackgroundTask(backgroundTaskIdentifier)
                 }
             }
+            let onesignalId = OneSignalUserManagerImpl.sharedInstance.onesignalId;
+            if let onesignalId = onesignalId {
+                if let rywToken = response?["ryw_token"] as? String
+                {
+                    OSConsistencyManager.shared.setRywToken(id: onesignalId, key: OSIamFetchOffsetKey.subscriptionUpdate, value: rywToken)
+                } else {
+                    OSConsistencyManager.shared.resolveConditionsWithID(id: OSIamFetchReadyCondition.CONDITIONID)
+                }
+            }
         } onFailure: { error in
             OneSignalLog.onesignalLog(.LL_ERROR, message: "OSSubscriptionOperationExecutor update subscription request failed with error: \(error.debugDescription)")
             self.dispatchQueue.async {

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

@@ -258,6 +258,15 @@ extension OSUserExecutor {
                 } else {
                     self.executePendingRequests()
                 }
+                
+                if let onesignalId = request.identityModel.onesignalId {
+                    if let rywToken = response["ryw_token"] as? String
+                    {
+                        OSConsistencyManager.shared.setRywToken(id: onesignalId, key: OSIamFetchOffsetKey.userUpdate, value: rywToken)
+                    } else {
+                        OSConsistencyManager.shared.resolveConditionsWithID(id: OSIamFetchReadyCondition.CONDITIONID)
+                    }
+                }
             }
             OSOperationRepo.sharedInstance.paused = false
         } onFailure: { error in