fix: sample app issues (#551)

Sources/Common/Service/HttpRequestRunner.swift

@@ -56,10 +56,11 @@ public class UrlRequestHttpRequestRunner: HttpRequestRunner {
         let directoryURL = fileType.directoryToSaveFiles(fileManager: FileManager.default)
 
         session.downloadTask(with: url) { tempLocation, response, _ in
-            guard let tempLocation = tempLocation, let uniqueFileName = response?.suggestedFilename else {
+            guard let tempLocation = tempLocation, let suggestedFileName = response?.suggestedFilename else {
                 return onComplete(nil)
             }
-
+            // create a unique file name so when trying to move temp file to destination it doesn't give an exception
+            let uniqueFileName = UUID().uuidString + "_" + suggestedFileName
             let destinationURL = directoryURL
                 .appendingPathComponent(uniqueFileName)
 
@@ -70,6 +71,8 @@ public class UrlRequestHttpRequestRunner: HttpRequestRunner {
                     withIntermediateDirectories: true,
                     attributes: nil
                 )
+
+                // Now attempt the move
                 try FileManager.default.moveItem(at: tempLocation, to: destinationURL)
             } catch {
                 // XXX: log error when error handling for the customer enabled

Sources/MessagingPush/RichPush/MessagingPush+RichPush.swift

@@ -73,30 +73,14 @@ extension MessagingPushImplementation {
 
             // This conditional will only work in production and not in automated tests. But this file cannot be in automated tests so this conditional is OK for now.
             if let composedRichPush = composedRichPush as? UNNotificationWrapper {
-                self.finishTasksThenReturn(contentHandler: contentHandler, notificationContent: composedRichPush.notificationContent)
+                self.logger.info("Customer.io push processing is done!")
+                contentHandler(composedRichPush.notificationContent)
             }
         }
 
         return true
     }
 
-    private func finishTasksThenReturn(
-        contentHandler: @escaping (UNNotificationContent) -> Void,
-        notificationContent: UNNotificationContent
-    ) {
-        logger
-            .debug(
-                "running all background queue tasks and waiting until complete to prevent OS from killing notification service extension before all HTTP requests have been performed"
-            )
-        // FIXME: [CDP] Request to Journey
-        // backgroundQueue.run {
-        //     self.logger.debug("all background queue tasks done running.")
-        //     self.logger.info("Customer.io push processing is done!")
-        //
-        //     contentHandler(notificationContent)
-        // }
-    }
-
     /**
      iOS telling the notification service to hurry up and stop modifying the push notifications.
      Stop all network requests and modifying and show the push for what it looks like now.

Sources/MessagingPush/RichPush/RichPushHttpClient.swift

@@ -140,8 +140,8 @@ extension RichPushHttpClient {
     public static let defaultAPIHost = "https://cdp.customer.io/v1"
 
     static func authorizationHeaderForWriteKey(_ key: String) -> String {
-        var returnHeader = ""
-        if let encodedRawHeader = key.data(using: .utf8) {
+        var returnHeader = "\(key):"
+        if let encodedRawHeader = returnHeader.data(using: .utf8) {
             returnHeader = encodedRawHeader.base64EncodedString(options: NSData.Base64EncodingOptions(rawValue: 0))
         }
         return returnHeader
@@ -160,8 +160,10 @@ extension RichPushHttpClient {
 
     static func getBasicSession() -> URLSession {
         let configuration = URLSessionConfiguration.ephemeral
-        configuration.httpMaximumConnectionsPerHost = 2
         configuration.allowsCellularAccess = true
+        configuration.timeoutIntervalForResource = 30
+        configuration.timeoutIntervalForRequest = 60
+        configuration.httpAdditionalHeaders = [:]
         let session = URLSession(configuration: configuration, delegate: nil, delegateQueue: nil)
         return session
     }

Tests/MessagingPush/HttpClientTest.swift

@@ -137,7 +137,7 @@ class HttpClientTest: UnitTest {
     func test_getBasicAuthHeaderString_givenHardCodedCredentials_expectCorrectString() {
         let givenWriteKey = "oofjwo88283899c9jend"
 
-        let expected = "b29mandvODgyODM4OTljOWplbmQ="
+        let expected = "b29mandvODgyODM4OTljOWplbmQ6"
         let actual = RichPushHttpClient.authorizationHeaderForWriteKey(givenWriteKey)
 
         XCTAssertEqual(actual, expected)

Tests/MessagingPush/HttpRequestRunnerTest.swift

@@ -14,7 +14,7 @@ import XCTest
  */
 class HttpRequestRunnerTest: HttpTest {
     func test_getAccountRegion() throws {
-        guard let runner = runner, let session = session else { return try XCTSkipIf(true) }
+        guard let runner = runner, let session = cioSession else { return try XCTSkipIf(true) }
 
         let endpoint = CIOApiEndpoint.trackPushMetricsCdp
 

Tests/MessagingPush/HttpTest.swift

@@ -13,33 +13,81 @@ import XCTest
 
  In order to *run* tests on your local machine, follow these setup steps:
  1. In XCode, go to: Edit Scheme > Run
- 2. Create 2 environment variables: `SITE_ID` and `API_KEY`. Populate those values with a set
- of test credentials from a Workspace that you control.
+ 2. Create an environment variables: `WRITE_KEY`. Populate the values with  test credentials from a source that you control.
  3. Manually run the tests below. Use the XCode debug console to see the log output for debugging.
  */
 open class HttpTest: UnitTest {
     public var runner: HttpRequestRunner?
     public var deviceInfo: DeviceInfo!
-    public var session: URLSession?
+    public var cioSession: URLSession?
+    public var session: URLSession = RichPushHttpClient.getBasicSession()
 
     override open func setUp() {
         super.setUp()
 
         deviceInfo = diGraph.deviceInfo
+        session = RichPushHttpClient.getBasicSession()
+        runner = UrlRequestHttpRequestRunner()
 
         /*
          We don't want to run these tests on a CI server (flaky!) so, only populate the runner if
          we see environment variables set in XCode.
          */
         if let writeKey = getEnvironmentVariable("WRITE_KEY") {
-            runner = UrlRequestHttpRequestRunner()
-            session = RichPushHttpClient.getCIOApiSession(
+            cioSession = RichPushHttpClient.getCIOApiSession(
                 key: writeKey,
                 userAgentHeaderValue: deviceInfo.getUserAgentHeaderValue()
             )
         }
     }
 
+    func testParallelDownloadFileCreatesUniquePaths() {
+        let expectation1 = expectation(description: "Parallel download file 1")
+        let expectation2 = expectation(description: "Parallel download file 2")
+
+        let url = URL(string: "https://thumbs.dreamstime.com/b/bee-flower-27533578.jpg")!
+        var path1: URL?
+        var path2: URL?
+
+        XCTAssertNotNil(runner)
+
+        // Initiate the first download
+        runner?.downloadFile(
+            url: url,
+            fileType: .richPushImage,
+            session: session,
+            onComplete: { path in
+                XCTAssertNotNil(path)
+                path1 = path
+                expectation1.fulfill()
+            }
+        )
+
+        // Initiate the second download in parallel
+        runner?.downloadFile(
+            url: url,
+            fileType: .richPushImage,
+            session: session,
+            onComplete: { path in
+                XCTAssertNotNil(path)
+                path2 = path
+                expectation2.fulfill()
+            }
+        )
+
+        // Wait for both downloads to complete
+        waitForExpectations(timeout: 20.0) { error in
+            if let error = error {
+                XCTFail("Test failed with error: \(error)")
+            }
+
+            // Verify that both paths are not nil and unique
+            XCTAssertNotNil(path1, "First path should not be nil")
+            XCTAssertNotNil(path2, "Second path should not be nil")
+            XCTAssertNotEqual(path1, path2, "Expected unique path for each parallel download")
+        }
+    }
+
     override open func tearDown() {
         runner = nil
         // assert there isn't a memory leak and the runner can be deconstructed.