kgess-mirror/proton-protoncore_ios
1
0
Fork 0
mirror of https://github.com/ProtonMail/protoncore_ios.git synced 2026-01-16 23:00:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(unauth): Remove X-Enforce-UnauthSession header used for testing.

Browse source 
Refs: https://gitlab.protontech.ch/apple/shared/protoncore/-/merge_requests/1721
This commit is contained in:
Erik Ackermann 2024-03-27 10:33:18 +00:00
commit f55d31d4e6
7 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Package.swift
View file

@ -60,7 +60,7 @@ func coreTarget(name: String,
publicHeadersPath: nil,
cSettings: nil,
cxxSettings: nil,
swiftSettings: .spm,
swiftSettings: [.spm],
linkerSettings: nil,
plugins: plugins)
}
@ -77,11 +77,15 @@ func coreTestTarget(name: String,
resources: resources,
cSettings: nil,
cxxSettings: nil,
swiftSettings: .spm,
swiftSettings: [.spm],
linkerSettings: nil,
plugins: plugins)
}
extension SwiftSetting {
static let spm: SwiftSetting = .define("SPM")
}
extension String {
// MARK: - Core module names
@ -311,10 +315,6 @@ extension Target.Dependency {
static var cryptoGoUsedInTests: Target.Dependency { .cryptoPatchedGoImplementation }
}
extension Array where Element == SwiftSetting {
static let spm: [SwiftSetting] = [.define("SPM")]
}
// MARK: - Module definitions
// MARK: AccountDeletion

2
libraries/Login/Tests/IntegrationTests/LoginIntegrationTests.swift
View file

@ -53,7 +53,7 @@ final class LoginIntegrationTests: IntegrationTestCase {
var appVersion: String { "ios-vpn@4.2.0-dev" }
var userAgent: String? { nil }
var locale: String { "en_US" }
var additionalHeaders: [String: String]? { nil }
var additionalHeaders: [String: String]? { ["X-Enforce-UnauthSession": "true"] }
func onUpdate(serverTime: Int64) { }
func isReachable() -> Bool { true }
func onDohTroubleshot() { }

2
libraries/LoginUI/Tests/IntegrationTests/LoginAndSignupIntegrationTests.swift
View file

@ -56,7 +56,7 @@ final class LoginAndSignupIntegrationTests: IntegrationTestCase {
var appVersion: String { "ios-mail@4.2.0-dev" }
var userAgent: String? { nil }
var locale: String { "en_US" }
var additionalHeaders: [String: String]? { nil }
var additionalHeaders: [String: String]? { ["X-Enforce-UnauthSession": "true"] }
func onUpdate(serverTime: Int64) { }
func isReachable() -> Bool { true }
func onDohTroubleshot() { }

2
libraries/Observability/IntegrationTests/ObservabilityEventTests.swift
View file

@ -41,7 +41,7 @@ final class ObservabilityEventTests: IntegrationTestCase {
var appVersion: String { "ios-mail@4.2.0-dev" }
var userAgent: String? { nil }
var locale: String { "en_US" }
var additionalHeaders: [String: String]? { nil }
var additionalHeaders: [String: String]? { ["X-Enforce-UnauthSession": "true"] }
func onUpdate(serverTime: Int64) { }
func isReachable() -> Bool { true }
func onDohTroubleshot() { }

2
libraries/Payments/Tests/IntegrationTests/PlansDataSourceE2ETests.swift
View file

@ -49,7 +49,7 @@ final class PlansDataSourceE2ETests: IntegrationTestCase {
var appVersion: String { "ios-mail@4.2.0-dev" }
var userAgent: String? { nil }
var locale: String { "en_US" }
var additionalHeaders: [String: String]? { nil }
var additionalHeaders: [String: String]? { ["X-Enforce-UnauthSession": "true"] }
func onUpdate(serverTime: Int64) { }
func isReachable() -> Bool { true }
func onDohTroubleshot() { }

2
libraries/Services/Sources/ProtonMailAPIService+Request.swift
View file

@ -697,8 +697,6 @@ extension PMAPIService {
request.setValue(header: "x-pm-uid", sessionUID)
}
request.setValue(header: "X-Enforce-UnauthSession", "true")
var appversion = "iOS_\(Bundle.main.majorVersion)"
if let delegateAppVersion = serviceDelegate?.appVersion, !delegateAppVersion.isEmpty {
appversion = delegateAppVersion

2
libraries/Services/Tests/Integration/UnauthSessionIntegrationTests.swift
View file

@ -48,7 +48,7 @@ final class UnauthSessionIntegrationTests: IntegrationTestCase {
var appVersion: String { "ios-mail@4.2.0-dev" }
var userAgent: String? { nil }
var locale: String { "en_US" }
var additionalHeaders: [String: String]? { nil }
var additionalHeaders: [String: String]? { ["X-Enforce-UnauthSession": "true"] }
func onUpdate(serverTime: Int64) { }
func isReachable() -> Bool { true }
func onDohTroubleshot() { }