Skip to content

Commit

Permalink
[NT-88] Send clientId in request headers (#839)
Browse files Browse the repository at this point in the history
  • Loading branch information
Isabel Barrera committed Sep 13, 2019
1 parent e5deb3e commit daf3ede
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 9 deletions.
1 change: 1 addition & 0 deletions KsApi/ServiceType.swift
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
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

0 comments on commit daf3ede

Please sign in to comment.