fix: let additional headers take any type (#302)

* fix: let additional headers take any type

* don't test additionalHeaders as URLSession is ref type

* Update .codecov.yml

* Remove OS checks for < iOS 13 as those are unsupported

Author: cbaker6

.codecov.yml

@@ -6,7 +6,7 @@ coverage:
   status:
     patch:
       default:
-        target: auto
+        target: 56
     changes: false
     project:
       default:

Sources/ParseSwift/Extensions/URLCache.swift

@@ -16,30 +16,18 @@ internal extension URLCache {
         guard let cacheURL = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first else {
             return URLCache(memoryCapacity: ParseSwift.configuration.cacheMemoryCapacity,
                             diskCapacity: ParseSwift.configuration.cacheDiskCapacity,
-                            diskPath: "/")
+                            diskPath: nil)
         }
         let parseCacheDirectory = "ParseCache"
         let diskURL = cacheURL.appendingPathComponent(parseCacheDirectory, isDirectory: true)
-        if #available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *) {
-            #if !os(Linux) && !os(Android) && !os(Windows)
-            return URLCache(memoryCapacity: ParseSwift.configuration.cacheMemoryCapacity,
-                         diskCapacity: ParseSwift.configuration.cacheDiskCapacity,
-                         directory: diskURL)
-            #else
-            return URLCache(memoryCapacity: ParseSwift.configuration.cacheMemoryCapacity,
-                         diskCapacity: ParseSwift.configuration.cacheDiskCapacity,
-                         diskPath: diskURL.absoluteString)
-            #endif
-        } else {
-            #if os(macOS)
-            return URLCache(memoryCapacity: ParseSwift.configuration.cacheMemoryCapacity,
-                         diskCapacity: ParseSwift.configuration.cacheDiskCapacity,
-                         diskPath: diskURL.absoluteString)
-            #else
-            return URLCache(memoryCapacity: ParseSwift.configuration.cacheMemoryCapacity,
-                         diskCapacity: ParseSwift.configuration.cacheDiskCapacity,
-                         diskPath: parseCacheDirectory)
-            #endif
-        }
+        #if !os(Linux) && !os(Android) && !os(Windows)
+        return URLCache(memoryCapacity: ParseSwift.configuration.cacheMemoryCapacity,
+                        diskCapacity: ParseSwift.configuration.cacheDiskCapacity,
+                        directory: diskURL)
+        #else
+        return URLCache(memoryCapacity: ParseSwift.configuration.cacheMemoryCapacity,
+                        diskCapacity: ParseSwift.configuration.cacheDiskCapacity,
+                        diskPath: diskURL.absoluteString)
+        #endif
     }()
 }

Sources/ParseSwift/Objects/ParseUser.swift

@@ -124,9 +124,7 @@ public extension ParseUser {
     internal static func deleteCurrentContainerFromKeychain() {
         try? ParseStorage.shared.delete(valueFor: ParseStorage.Keys.currentUser)
         #if !os(Linux) && !os(Android) && !os(Windows)
-        if #available(macOS 10.15, iOS 13.0, macCatalyst 13.0, watchOS 6.0, tvOS 13.0, *) {
-            URLSession.liveQuery.closeAll()
-        }
+        URLSession.liveQuery.closeAll()
         try? KeychainStore.shared.delete(valueFor: ParseStorage.Keys.currentUser)
         #endif
         Self.currentContainer = nil

Sources/ParseSwift/Parse.swift

@@ -39,7 +39,7 @@ public struct ParseConfiguration {
     /// A dictionary of additional headers to send with requests. See Apple's
     /// [documentation](https://developer.apple.com/documentation/foundation/urlsessionconfiguration/1411532-httpadditionalheaders)
     /// for more info.
-    public internal(set) var httpAdditionalHeaders: [String: String]?
+    public internal(set) var httpAdditionalHeaders: [AnyHashable: Any]?
 
     /// The memory capacity of the cache, in bytes. Defaults to 512KB.
     public internal(set) var cacheMemoryCapacity = 512_000
@@ -114,7 +114,7 @@ public struct ParseConfiguration {
                 cacheDiskCapacity: Int = 10_000_000,
                 migrateFromObjcSDK: Bool = false,
                 deleteKeychainIfNeeded: Bool = false,
-                httpAdditionalHeaders: [String: String]? = nil,
+                httpAdditionalHeaders: [AnyHashable: Any]? = nil,
                 maxConnectionAttempts: Int = 5,
                 authentication: ((URLAuthenticationChallenge,
                                   (URLSession.AuthChallengeDisposition,
@@ -274,7 +274,7 @@ public struct ParseSwift {
         cacheDiskCapacity: Int = 10_000_000,
         migrateFromObjcSDK: Bool = false,
         deleteKeychainIfNeeded: Bool = false,
-        httpAdditionalHeaders: [String: String]? = nil,
+        httpAdditionalHeaders: [AnyHashable: Any]? = nil,
         maxConnectionAttempts: Int = 5,
         authentication: ((URLAuthenticationChallenge,
                           (URLSession.AuthChallengeDisposition,
@@ -311,7 +311,7 @@ public struct ParseSwift {
                                     cacheDiskCapacity: Int = 10_000_000,
                                     migrateFromObjcSDK: Bool = false,
                                     deleteKeychainIfNeeded: Bool = false,
-                                    httpAdditionalHeaders: [String: String]? = nil,
+                                    httpAdditionalHeaders: [AnyHashable: Any]? = nil,
                                     maxConnectionAttempts: Int = 5,
                                     testing: Bool = false,
                                     authentication: ((URLAuthenticationChallenge,

Tests/ParseSwiftTests/ExtensionsTests.swift

@@ -21,7 +21,7 @@ class ExtensionsTests: XCTestCase {
                               clientKey: "clientKey",
                               masterKey: "masterKey",
                               serverURL: url,
-                              testing: true)
+                              testing: false)
     }
 
     override func tearDownWithError() throws {
@@ -34,11 +34,19 @@ class ExtensionsTests: XCTestCase {
     }
 
     #if !os(Linux) && !os(Android) && !os(Windows)
-    func testURLSession() throws {
-        ParseSwift.configuration.isTestingSDK = false
+    func testURLSessionTesting() throws {
         XCTAssertNotNil(URLSession.parse.configuration.urlCache)
     }
 
+    func testURLSession() throws {
+        let headerKey = "User-Agent"
+        let headerValue = "ParseSwift/\(ParseConstants.version) (\(ParseConstants.deviceType)"
+        ParseSwift.configuration.httpAdditionalHeaders = [headerKey: headerValue]
+        let session = URLSession.parse
+        XCTAssertNotNil(session.configuration.urlCache)
+        XCTAssertEqual(session.configuration.requestCachePolicy, ParseSwift.configuration.requestCachePolicy)
+    }
+
     func testReconnectInterval() throws {
         for index in 1 ..< 50 {
             let time = URLSession.reconnectInterval(index)

Tests/ParseSwiftTests/ParseEncoderTests/TestParseEncoder.swift

@@ -858,15 +858,13 @@ class TestParseEncoder: XCTestCase {
   }
 /*
   func testInterceptURLWithoutEscapingOption() {
-    if #available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *) {
       // Want to make sure JSONEncoder writes out single-value URLs, not the keyed encoding.
       let expectedJSON = "\"http://swift.org\"".data(using: .utf8)!
       let url = URL(string: "http://swift.org")!
       _testRoundTrip(of: url, expectedJSON: expectedJSON, outputFormatting: [.withoutEscapingSlashes])
 
       // Optional URLs should encode the same way.
       _testRoundTrip(of: Optional(url), expectedJSON: expectedJSON, outputFormatting: [.withoutEscapingSlashes])
-    }
   }*/
 
   // MARK: - Type coercion

Tests/ParseSwiftTests/ParseSessionTests.swift

@@ -99,17 +99,4 @@ class ParseSessionTests: XCTestCase {
         session.objectId = "me"
         XCTAssertEqual(session.endpoint.urlComponent, "/sessions/me")
     }
-
-#if !os(Linux) && !os(Android) && !os(Windows)
-    func testURLSession() throws {
-        let session = URLSession.parse
-        XCTAssertNotNil(session.configuration.urlCache)
-        XCTAssertEqual(session.configuration.requestCachePolicy, ParseSwift.configuration.requestCachePolicy)
-        guard let headers = session.configuration.httpAdditionalHeaders as? [String: String]? else {
-            XCTFail("Should have casted")
-            return
-        }
-        XCTAssertEqual(headers, ParseSwift.configuration.httpAdditionalHeaders)
-    }
-#endif
 }