push changes

Author: devcsomnicg

swift-sdk/Internal/InternalIterableAPI.swift

@@ -7,13 +7,7 @@ import UIKit
 
 final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
     var apiKey: String
-    var lastPushPayload: [AnyHashable: Any]? {
-        get {
-            _payloadData
-        } set {
-            setPayloadData(newValue)
-        }
-    }
+    
     var email: String? {
         get {
             _email
@@ -30,12 +24,6 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
         }
     }
 
-    var authToken: String? {
-        get {
-            authManager.getAuthToken()
-        }
-    }
-    
     var deviceId: String {
         if let value = localStorage.deviceId {
             return value
@@ -52,6 +40,10 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
                        appPackageName: Bundle.main.appPackageName ?? "")
     }
 
+    var lastPushPayload: [AnyHashable: Any]? {
+        localStorage.getLastPushPayload(dateProvider.currentDate)
+    }
+    
     var attributionInfo: IterableAttributionInfo? {
         get {
             localStorage.getAttributionInfo(currentDate: dateProvider.currentDate)
@@ -103,19 +95,9 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
         deviceAttributes.removeValue(forKey: name)
     }
 
-    func setPayloadData(_ data: [AnyHashable: Any]?){
-        ITBInfo()
-        _payloadData = data
-    }
-    
     func setEmail(_ email: String?, authToken: String? = nil) {
         ITBInfo()
 
-        if _email == email && email != nil && authToken != nil {
-            checkAndUpdateAuthToken(authToken)
-            return
-        }
-        
         if _email == email {
             return
         }
@@ -133,11 +115,6 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
     func setUserId(_ userId: String?, authToken: String? = nil) {
         ITBInfo()
 
-        if _userId == userId && userId != nil && authToken != nil {
-            checkAndUpdateAuthToken(authToken)
-            return
-        }
-        
         if _userId == userId {
             return
         }
@@ -423,7 +400,6 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
     private var deepLinkManager: DeepLinkManager
 
     private var _email: String?
-    private var _payloadData: [AnyHashable: Any]?
     private var _userId: String?
 
     /// the hex representation of this device token
@@ -516,8 +492,6 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
     }
 
     private func requestNewAuthToken() {
-        ITBInfo()
-        
         authManager.requestNewAuthToken(hasFailedPriorAuth: false, onSuccess: { [weak self] token in
             if token != nil {
                 self?.completeUserLogin()
@@ -545,20 +519,15 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
     }
 
     private func save(pushPayload payload: [AnyHashable: Any]) {
+        let expiration = Calendar.current.date(byAdding: .hour,
+                                               value: Const.UserDefault.payloadExpiration,
+                                               to: dateProvider.currentDate)
+        localStorage.saveLastPushPayload(payload, withExpiration: expiration)
+        
         if let metadata = IterablePushNotificationMetadata.metadata(fromLaunchOptions: payload) {
             if let templateId = metadata.templateId {
                 attributionInfo = IterableAttributionInfo(campaignId: metadata.campaignId, templateId: templateId, messageId: metadata.messageId)
             }
-            
-            if !metadata.isGhostPush {
-                lastPushPayload = payload
-            }
-        }
-    }
-    
-    private func checkAndUpdateAuthToken(_ authToken: String? = nil) {
-        if config.authDelegate != nil && authToken != authManager.getAuthToken() {
-            onLogin(authToken)
         }
     }