Skip to content

Removed auth header w/ writekey; Added context.instanceId #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 7, 2022
Merged

Removed auth header w/ writekey; Added context.instanceId #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e673036
Removed auth header w/ writekey; Added context.instanceId
bsneed Dec 5, 2022
05783f7
Fixed test.
bsneed Dec 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Sources/Segment/Plugins/Context.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<T: RawEvent>(event: T?) -> T? {
guard var workingEvent = event else { return event }
Expand All @@ -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 {
Expand All @@ -42,7 +46,7 @@ public class Context: PlatformPlugin {
// library name
staticContext["library"] = [
"name": "analytics-swift",
"version": __segment_version
"version": __segment_version,
]

// app info
Expand Down
1 change: 0 additions & 1 deletion Sources/Segment/Utilities/HTTPClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
1 change: 0 additions & 1 deletion Tests/Segment-Tests/Analytics_Tests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down