Skip to content
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

Jump to bottom

[NT-88] Send client_id in request headers #839

Merged
merged 2 commits into from
Sep 13, 2019
Merged

[NT-88] Send client_id in request headers #839

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
a03b39c
Send clientId in request headers
ifbarrera Sep 13, 2019
f2ef1c2
Merge branch 'master' into graph-requests-client-id
ifbarrera Sep 13, 2019
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
1 change: 1 addition & 0 deletions KsApi/ServiceType.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,7 @@ extension ServiceType {
headers["Kickstarter-App-Id"] = self.appId
headers["Kickstarter-iOS-App"] = self.buildVersion
headers["User-Agent"] = Self.userAgent
headers["X-KICKSTARTER-CLIENT"] = self.serverConfig.apiClientAuth.clientId

return headers
}
Expand Down
40 changes: 31 additions & 9 deletions KsApi/ServiceTypeTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,11 @@ final class ServiceTypeTests: XCTestCase {
)
XCTAssertEqual(
[
"Kickstarter-iOS-App": "1234567890", "Authorization": "token cafebeef", "Accept-Language": "ksr",
"Kickstarter-iOS-App": "1234567890",
"Authorization": "token cafebeef",
"Accept-Language": "ksr",
"Kickstarter-App-Id": "com.kickstarter.test",
"X-KICKSTARTER-CLIENT": "deadbeef",
"User-Agent": userAgent()
],
request.allHTTPHeaderFields!
Expand All @@ -110,8 +113,11 @@ final class ServiceTypeTests: XCTestCase {
)
XCTAssertEqual(
[
"Kickstarter-iOS-App": "1234567890", "Authorization": "token cafebeef", "Accept-Language": "ksr",
"Kickstarter-iOS-App": "1234567890",
"Authorization": "token cafebeef",
"Accept-Language": "ksr",
"Kickstarter-App-Id": "com.kickstarter.test",
"X-KICKSTARTER-CLIENT": "deadbeef",
"User-Agent": userAgent()
],
request.allHTTPHeaderFields!
Expand All @@ -129,8 +135,11 @@ final class ServiceTypeTests: XCTestCase {
)
XCTAssertEqual(
[
"Kickstarter-iOS-App": "1234567890", "Authorization": "token cafebeef", "Accept-Language": "ksr",
"Kickstarter-iOS-App": "1234567890",
"Authorization": "token cafebeef",
"Accept-Language": "ksr",
"Kickstarter-App-Id": "com.kickstarter.test",
"X-KICKSTARTER-CLIENT": "deadbeef",
"User-Agent": userAgent()
],
request.allHTTPHeaderFields!
Expand All @@ -148,9 +157,12 @@ final class ServiceTypeTests: XCTestCase {
)
XCTAssertEqual(
[
"Kickstarter-iOS-App": "1234567890", "Authorization": "token cafebeef", "Accept-Language": "ksr",
"Kickstarter-iOS-App": "1234567890",
"Authorization": "token cafebeef",
"Accept-Language": "ksr",
"Kickstarter-App-Id": "com.kickstarter.test",
"Content-Type": "application/json; charset=utf-8",
"X-KICKSTARTER-CLIENT": "deadbeef",
"User-Agent": userAgent()
],
request.allHTTPHeaderFields!
Expand All @@ -176,8 +188,11 @@ final class ServiceTypeTests: XCTestCase {
)
XCTAssertEqual(
[
"Kickstarter-iOS-App": "1234567890", "Authorization": "token cafebeef", "Accept-Language": "ksr",
"Kickstarter-iOS-App": "1234567890",
"Authorization": "token cafebeef",
"Accept-Language": "ksr",
"Kickstarter-App-Id": "com.kickstarter.test",
"X-KICKSTARTER-CLIENT": "deadbeef",
"User-Agent": userAgent()
],
request.allHTTPHeaderFields!
Expand All @@ -196,8 +211,11 @@ final class ServiceTypeTests: XCTestCase {
)
XCTAssertEqual(
[
"Kickstarter-iOS-App": "\(testToolBuildNumber())", "Authorization": "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
"Accept-Language": "en", "Kickstarter-App-Id": "com.kickstarter.test",
"Kickstarter-iOS-App": "\(testToolBuildNumber())",
"Authorization": "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
"Accept-Language": "en",
"Kickstarter-App-Id": "com.kickstarter.test",
"X-KICKSTARTER-CLIENT": "deadbeef",
"User-Agent": userAgent()
],
request.allHTTPHeaderFields!
Expand Down Expand Up @@ -230,8 +248,11 @@ final class ServiceTypeTests: XCTestCase {
)
XCTAssertEqual(
[
"Kickstarter-iOS-App": "\(testToolBuildNumber())", "Authorization": "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
"Accept-Language": "en", "Kickstarter-App-Id": "com.kickstarter.test",
"Kickstarter-iOS-App": "\(testToolBuildNumber())",
"Authorization": "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
"Accept-Language": "en",
"Kickstarter-App-Id": "com.kickstarter.test",
"X-KICKSTARTER-CLIENT": "deadbeef",
"User-Agent": userAgent()
],
request.allHTTPHeaderFields!
Expand Down Expand Up @@ -259,6 +280,7 @@ final class ServiceTypeTests: XCTestCase {
XCTAssertEqual(request?.allHTTPHeaderFields?["Authorization"], "token cafebeef")
XCTAssertEqual(request?.allHTTPHeaderFields?["Kickstarter-App-Id"], self.service.appId)
XCTAssertEqual(request?.allHTTPHeaderFields?["Kickstarter-iOS-App"], self.service.buildVersion)
XCTAssertEqual(request?.allHTTPHeaderFields?["X-KICKSTARTER-CLIENT"], "deadbeef")
XCTAssertEqual(request?.allHTTPHeaderFields?["User-Agent"], userAgent())
}

Expand Down