Merge pull request #372 from contentful/fix_headers

mariuskatcontentful · web-flow · commit 147407e3700f · 2022-06-28T21:44:58.000+01:00
COCOA-138: Fix headers
diff --git a/Sources/Contentful/Client.swift b/Sources/Contentful/Client.swift
@@ -121,10 +121,13 @@ open class Client {
         }
 
         self.persistenceIntegration = persistenceIntegration
-        let contentfulHTTPHeaders = [
+        var contentfulHTTPHeaders: [AnyHashable: Any] = [
             "Authorization": "Bearer \(accessToken)",
             "X-Contentful-User-Agent": clientConfiguration.userAgentString(with: persistenceIntegration)
         ]
+        if let additionalHeaders = sessionConfiguration.httpAdditionalHeaders {
+            contentfulHTTPHeaders.merge(additionalHeaders) { (currentPair, _) in currentPair }
+        }
         sessionConfiguration.httpAdditionalHeaders = contentfulHTTPHeaders
         self.urlSession = URLSession(configuration: sessionConfiguration)
     }

Original file line number	Diff line number	Diff line change
`@@ -121,10 +121,13 @@ open class Client {`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`self.persistenceIntegration = persistenceIntegration`
`124`		`- let contentfulHTTPHeaders = [`
	`124`	`+ var contentfulHTTPHeaders: [AnyHashable: Any] = [`
`125`	`125`	`"Authorization": "Bearer \(accessToken)",`
`126`	`126`	`"X-Contentful-User-Agent": clientConfiguration.userAgentString(with: persistenceIntegration)`
`127`	`127`	`]`
	`128`	`+ if let additionalHeaders = sessionConfiguration.httpAdditionalHeaders {`
	`129`	`+ contentfulHTTPHeaders.merge(additionalHeaders) { (currentPair, _) in currentPair }`
	`130`	`+ }`
`128`	`131`	`sessionConfiguration.httpAdditionalHeaders = contentfulHTTPHeaders`
`129`	`132`	`self.urlSession = URLSession(configuration: sessionConfiguration)`
`130`	`133`	`}`