updated files with the changes on gist

Sources/MessagingInApp/Gist/Gist.swift

@@ -72,8 +72,9 @@ public class Gist: GistDelegate {
     }
 
     public func dismissMessage(instanceId: String? = nil, completionHandler: (() -> Void)? = nil) {
-        if let id = instanceId {
-            messageManager(instanceId: id)?.dismissMessage(completionHandler: completionHandler)
+        if let id = instanceId, let messageManager = messageManager(instanceId: id) {
+            messageManager.removePersistentMessage()
+            messageManager.dismissMessage(completionHandler: completionHandler)
         } else {
             getModalMessageManager()?.dismissMessage(completionHandler: completionHandler)
         }
@@ -83,15 +84,11 @@ public class Gist: GistDelegate {
 
     public func messageShown(message: Message) {
         Logger.instance.debug(message: "Message with route: \(message.messageId) shown")
-        messageQueueManager.removeMessageFromLocalStore(message: message)
-        let userToken = UserManager().getUserToken()
-        LogManager(siteId: siteId, dataCenter: dataCenter)
-            .logView(message: message, userToken: userToken) { response in
-                if case .failure(let error) = response {
-                    Logger.instance.error(message:
-                        "Failed to log view for message: \(message.messageId) with error: \(error)")
-                }
-            }
+        if message.gistProperties.persistent != true {
+            logMessageView(message: message)
+        } else {
+            Logger.instance.debug(message: "Persistent message shown, skipping logging view")
+        }
         delegate?.messageShown(message: message)
     }
 
@@ -114,6 +111,17 @@ public class Gist: GistDelegate {
         delegate?.embedMessage(message: message, elementId: elementId)
     }
 
+    func logMessageView(message: Message) {
+        messageQueueManager.removeMessageFromLocalStore(message: message)
+        let userToken = UserManager().getUserToken()
+        LogManager(siteId: siteId, dataCenter: dataCenter)
+            .logView(message: message, userToken: userToken) { response in
+                if case .failure(let error) = response {
+                    Logger.instance.error(message: "Failed to log view for message: \(message.messageId) with error: \(error)")
+                }
+            }
+    }
+
     // Message Manager
 
     private func createMessageManager(siteId: String, message: Message) -> MessageManager {

Sources/MessagingInApp/Gist/Managers/MessageManager.swift

@@ -70,6 +70,13 @@ class MessageManager: EngineWebDelegate {
         }
     }
 
+    func removePersistentMessage() {
+        if currentMessage.gistProperties.persistent == true {
+            Logger.instance.debug(message: "Persistent message dismissed, logging view")
+            Gist.shared.logMessageView(message: currentMessage)
+        }
+    }
+
     func bootstrapped() {
         Logger.instance.debug(message: "Bourbon Engine bootstrapped")
 
@@ -89,6 +96,7 @@ class MessageManager: EngineWebDelegate {
             switch url.host {
             case "close":
                 Logger.instance.info(message: "Dismissing from action: \(action)")
+                removePersistentMessage()
                 dismissMessage()
             case "loadPage":
                 if let page = url.queryParameters?["url"],

Sources/MessagingInApp/Gist/Managers/MessageQueueManager.swift

@@ -56,6 +56,8 @@ class MessageQueueManager {
                     .fetchUserQueue(userToken: userToken, completionHandler: { response in
                         switch response {
                         case .success(let responses):
+                            // To prevent us from showing expired / revoked messages, clear user messages from local queue.
+                            self.clearUserMessagesFromLocalStore()
                             Logger.instance.info(message: "Gist queue service found \(responses.count) new messages")
                             for queueMessage in responses {
                                 let message = queueMessage.toMessage()

Sources/MessagingInApp/Gist/Managers/Models/Message.swift

@@ -5,12 +5,14 @@ public class GistProperties {
     public let elementId: String?
     public let campaignId: String?
     public let position: MessagePosition
+    public let persistent: Bool?
 
-    init(routeRule: String?, elementId: String?, campaignId: String?, position: MessagePosition) {
+    init(routeRule: String?, elementId: String?, campaignId: String?, position: MessagePosition, persistent: Bool?) {
         self.routeRule = routeRule
         self.elementId = elementId
         self.position = position
         self.campaignId = campaignId
+        self.persistent = persistent
     }
 }
 
@@ -28,27 +30,46 @@ public class Message {
 
     public init(messageId: String) {
         self.queueId = nil
-        self.gistProperties = GistProperties(routeRule: nil, elementId: nil, campaignId: nil, position: .center)
+        self.gistProperties = GistProperties(routeRule: nil, elementId: nil, campaignId: nil, position: .center, persistent: false)
         self.messageId = messageId
     }
 
     init(queueId: String? = nil, messageId: String, properties: [String: Any]?) {
         self.queueId = queueId
-        self.gistProperties = GistProperties(routeRule: nil, elementId: nil, campaignId: nil, position: .center)
+        self.gistProperties = GistProperties(routeRule: nil, elementId: nil, campaignId: nil, position: .center, persistent: false)
         self.messageId = messageId
 
         if let properties = properties {
             self.properties = properties
-            if let gist = self.properties["gist"] as? [String: String] {
+            if let gist = self.properties["gist"] as? [String: Any] {
                 var messagePosition = MessagePosition.center
-                if let position = gist["position"], let positionValue = MessagePosition(rawValue: position) {
+                if let position = gist["position"] as? String,
+                   let positionValue = MessagePosition(rawValue: position) {
                     messagePosition = positionValue
                 }
+                var routeRule: String?
+                if let routeRuleApple = gist["routeRuleApple"] as? String {
+                    routeRule = routeRuleApple
+                }
+                var elementId: String?
+                if let elementIdValue = gist["elementId"] as? String {
+                    elementId = elementIdValue
+                }
+                var campaignId: String?
+                if let campaignIdValue = gist["campaignId"] as? String {
+                    campaignId = campaignIdValue
+                }
+                var persistent = false
+                if let persistentValue = gist["persistent"] as? Bool {
+                    persistent = persistentValue
+                }
+
                 self.gistProperties = GistProperties(
-                    routeRule: gist["routeRuleApple"],
-                    elementId: gist["elementId"],
-                    campaignId: gist["campaignId"],
-                    position: messagePosition
+                    routeRule: routeRule,
+                    elementId: elementId,
+                    campaignId: campaignId,
+                    position: messagePosition,
+                    persistent: persistent
                 )
             }
         }