diff --git a/Sources/Segment/Plugins/Context.swift b/Sources/Segment/Plugins/Context.swift index f7ddafb3..afc6502b 100644 --- a/Sources/Segment/Plugins/Context.swift +++ b/Sources/Segment/Plugins/Context.swift @@ -13,6 +13,7 @@ public class Context: PlatformPlugin { internal var staticContext = staticContextData() internal static var device = VendorSystem.current + internal let instanceId = UUID().uuidString public func execute(event: T?) -> T? { guard var workingEvent = event else { return event } @@ -21,6 +22,9 @@ public class Context: PlatformPlugin { insertDynamicPlatformContextData(context: &context) + // add instanceId to the context + context["instanceId"] = instanceId + // if this event came in with context data already // let it take precedence over our values. if let eventContext = workingEvent.context?.dictionaryValue { @@ -42,7 +46,7 @@ public class Context: PlatformPlugin { // library name staticContext["library"] = [ "name": "analytics-swift", - "version": __segment_version + "version": __segment_version, ] // app info diff --git a/Sources/Segment/Utilities/HTTPClient.swift b/Sources/Segment/Utilities/HTTPClient.swift index 19795c8a..004999cd 100644 --- a/Sources/Segment/Utilities/HTTPClient.swift +++ b/Sources/Segment/Utilities/HTTPClient.swift @@ -157,7 +157,6 @@ extension HTTPClient { var request = URLRequest(url: url, cachePolicy: .reloadIgnoringLocalCacheData, timeoutInterval: 60) request.httpMethod = method request.addValue("application/json; charset=utf-8", forHTTPHeaderField: "Content-Type") - request.addValue("Basic \(apiKey)", forHTTPHeaderField: "Authorization") request.addValue("analytics-ios/\(Analytics.version())", forHTTPHeaderField: "User-Agent") request.addValue("gzip", forHTTPHeaderField: "Accept-Encoding") diff --git a/Tests/Segment-Tests/Analytics_Tests.swift b/Tests/Segment-Tests/Analytics_Tests.swift index 64d257a2..f40404db 100644 --- a/Tests/Segment-Tests/Analytics_Tests.swift +++ b/Tests/Segment-Tests/Analytics_Tests.swift @@ -536,7 +536,6 @@ final class Analytics_Tests: XCTestCase { let config = Configuration(writeKey: "testSequential").requestFactory { request in XCTAssertEqual(request.value(forHTTPHeaderField: "Accept-Encoding"), "gzip") XCTAssertEqual(request.value(forHTTPHeaderField: "Content-Type"), "application/json; charset=utf-8") - XCTAssertEqual(request.value(forHTTPHeaderField: "Authorization"), "Basic testSequential") XCTAssertTrue(request.value(forHTTPHeaderField: "User-Agent")!.contains("analytics-ios/")) return request }.errorHandler { error in