adds reset function for manager

Evan Greer · Evan Greer · commit 2126aa91e648 · 2023-11-13T10:35:33.000-07:00
diff --git a/swift-sdk.xcodeproj/project.pbxproj b/swift-sdk.xcodeproj/project.pbxproj
@@ -185,7 +185,6 @@
 		5B5AA717284F1A6D0093FED4 /* MockNetworkSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B5AA710284F1A6D0093FED4 /* MockNetworkSession.swift */; };
 		5B6C3C1127CE871F00B9A753 /* NavInboxSessionUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B6C3C1027CE871F00B9A753 /* NavInboxSessionUITests.swift */; };
 		5B88BC482805D09D004016E5 /* NetworkSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B88BC472805D09D004016E5 /* NetworkSession.swift */; };
-		9FF05EB42B001D29005311F7 /* IterableActionRunner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FF05EB32B001D29005311F7 /* IterableActionRunner.swift */; };
 		AC02480822791E2100495FB9 /* IterableInboxNavigationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC02480722791E2100495FB9 /* IterableInboxNavigationViewController.swift */; };
 		AC02CAA6234E50B5006617E0 /* RegistrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC02CAA5234E50B5006617E0 /* RegistrationTests.swift */; };
 		AC03094B21E532470003A288 /* InAppPersistence.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC03094A21E532470003A288 /* InAppPersistence.swift */; };
@@ -595,7 +594,6 @@
 		5B6C3C1027CE871F00B9A753 /* NavInboxSessionUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavInboxSessionUITests.swift; sourceTree = "<group>"; };
 		5B88BC472805D09D004016E5 /* NetworkSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkSession.swift; sourceTree = "<group>"; };
 		5BFC7CED27FC9AF300E77479 /* inbox-ui-tests-app.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "inbox-ui-tests-app.entitlements"; sourceTree = "<group>"; };
-		9FF05EB32B001D29005311F7 /* IterableActionRunner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IterableActionRunner.swift; sourceTree = "<group>"; };
 		AC02480722791E2100495FB9 /* IterableInboxNavigationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IterableInboxNavigationViewController.swift; sourceTree = "<group>"; };
 		AC02CAA5234E50B5006617E0 /* RegistrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegistrationTests.swift; sourceTree = "<group>"; };
 		AC03094A21E532470003A288 /* InAppPersistence.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InAppPersistence.swift; sourceTree = "<group>"; };
@@ -1277,7 +1275,6 @@
 				AC2C668120D32F2800D46CC9 /* InternalIterableAppIntegration.swift */,
 				AC2B79F621E6A38900A59080 /* NotificationHelper.swift */,
 				ACEDF41C2183C2EC000B9BFE /* Pending.swift */,
-				9FF05EB32B001D29005311F7 /* IterableActionRunner.swift */,
 			);
 			path = Internal;
 			sourceTree = "<group>";
@@ -2057,7 +2054,6 @@
 				AC684A88222F4FDD00F29749 /* InAppDisplayer.swift in Sources */,
 				AC72A0D220CF4D12004D7997 /* IterableUtil.swift in Sources */,
 				AC32E16821DD55B900BD4F83 /* OrderedDictionary.swift in Sources */,
-				9FF05EB42B001D29005311F7 /* IterableActionRunner.swift in Sources */,
 				ACF406232507BC72005FD775 /* NetworkMonitor.swift in Sources */,
 				AC1712892416AEF400F2BB0E /* WebViewProtocol.swift in Sources */,
 				AC3C10F9213F46A900A9B839 /* IterableLogging.swift in Sources */,
diff --git a/swift-sdk/Internal/EmptyEmbeddedManager.swift b/swift-sdk/Internal/EmptyEmbeddedManager.swift
@@ -30,6 +30,10 @@ class EmptyEmbeddedManager: IterableEmbeddedManagerProtocol {
 
     }
     
+    func reset() {
+        
+    }
+    
     func track(click message: IterableEmbeddedMessage, buttonIdentifier: String?, clickedUrl: String) {
             
     }
diff --git a/swift-sdk/Internal/InternalIterableAPI.swift b/swift-sdk/Internal/InternalIterableAPI.swift
@@ -548,6 +548,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
         authManager.logoutUser()
                 
         _ = inAppManager.reset()
+        _ = embeddedManager.reset()
         
         try? requestHandler.handleLogout()
     }
diff --git a/swift-sdk/Internal/IterableActionRunner.swift b/swift-sdk/Internal/IterableActionRunner.swift
diff --git a/swift-sdk/Internal/IterableEmbeddedManager.swift b/swift-sdk/Internal/IterableEmbeddedManager.swift
@@ -60,6 +60,11 @@ class IterableEmbeddedManager: NSObject, IterableEmbeddedManagerProtocol {
         }
     }
     
+    public func reset() {
+        let processor = EmbeddedMessagingProcessor(currentMessages: self.messages, fetchedMessages: [])
+        self.setMessages(processor)
+        self.notifyUpdateDelegates(processor)
+    }
     
     private func createAction(fromUrlOrAction url: String) -> IterableAction? {
         if let parsedUrl = URL(string: url), let _ = parsedUrl.scheme {
diff --git a/swift-sdk/IterableEmbeddedManagerProtocol.swift b/swift-sdk/IterableEmbeddedManagerProtocol.swift
@@ -13,4 +13,5 @@ import Foundation
     
     func syncMessages(completion: @escaping () -> Void)
     func handleEmbeddedClick(message: IterableEmbeddedMessage, buttonIdentifier: String?, clickedUrl: String)
+    func reset()
 }
diff --git a/tests/unit-tests/EmbeddedManagerTests.swift b/tests/unit-tests/EmbeddedManagerTests.swift
@@ -96,6 +96,33 @@ final class EmbeddedManagerTests: XCTestCase {
         
         wait(for: [syncMessagesExpectation, delegateExpectation], timeout: 2)
     }
+    
+    func testManagerReset() {
+        let syncMessagesExpectation = expectation(description: "syncMessages should complete")
+        
+        let mockApiClient = MockApiClient()
+        
+        mockApiClient.populateMessages([
+            IterableEmbeddedMessage(messageId: "1", placementId: 1),
+            IterableEmbeddedMessage(messageId: "2", placementId: 1),
+        ])
+        
+        let manager = IterableEmbeddedManager(apiClient: mockApiClient,
+                                              urlDelegate: nil,
+                                              urlOpener: MockUrlOpener(),
+                                              allowedProtocols: [])
+        
+        manager.syncMessages {
+            syncMessagesExpectation.fulfill()
+        }
+        
+        wait(for: [syncMessagesExpectation], timeout: 2)
+        
+        manager.reset()
+        
+        XCTAssertEqual(manager.getMessages().count, 0)
+    }
+    
     func testSyncMessagesFailedDueToInvalidAPIKey() {
         let condition = expectation(description: "syncMessages should notify of disabled messaging due to invalid API Key")
         

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,10 @@ class EmptyEmbeddedManager: IterableEmbeddedManagerProtocol {`
`30`	`30`
`31`	`31`	`}`
`32`	`32`
	`33`	`+ func reset() {`
	`34`	`+`
	`35`	`+ }`
	`36`	`+`
`33`	`37`	`func track(click message: IterableEmbeddedMessage, buttonIdentifier: String?, clickedUrl: String) {`
`34`	`38`
`35`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -548,6 +548,7 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {`
`548`	`548`	`authManager.logoutUser()`
`549`	`549`
`550`	`550`	`_ = inAppManager.reset()`
	`551`	`+ _ = embeddedManager.reset()`
`551`	`552`
`552`	`553`	`try? requestHandler.handleLogout()`
`553`	`554`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,11 @@ class IterableEmbeddedManager: NSObject, IterableEmbeddedManagerProtocol {`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
	`63`	`+ public func reset() {`
	`64`	`+ let processor = EmbeddedMessagingProcessor(currentMessages: self.messages, fetchedMessages: [])`
	`65`	`+ self.setMessages(processor)`
	`66`	`+ self.notifyUpdateDelegates(processor)`
	`67`	`+ }`
`63`	`68`
`64`	`69`	`private func createAction(fromUrlOrAction url: String) -> IterableAction? {`
`65`	`70`	`if let parsedUrl = URL(string: url), let _ = parsedUrl.scheme {`
Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,5 @@ import Foundation`
`13`	`13`
`14`	`14`	`func syncMessages(completion: @escaping () -> Void)`
`15`	`15`	`func handleEmbeddedClick(message: IterableEmbeddedMessage, buttonIdentifier: String?, clickedUrl: String)`
	`16`	`+ func reset()`
`16`	`17`	`}`