Skip to content

Commit a0fcfc1

Browse files
netbenetbe
committed
rename BackendEnvironment2 to WireNetwork.BackendEnvironment
1 parent 437b33f commit a0fcfc1

27 files changed

+72
-207
lines changed

‎WireDebug/Sources/WireViewsDebugUI/WireAuthenticationUIDebugView.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@ public struct WireAuthenticationUIDebugView: View {
120120
}
121121
}
122122

123-
private extension BackendEnvironment2 {
123+
private extension WireNetwork.BackendEnvironment {
124124

125-
static let preview = BackendEnvironment2(
125+
static let preview = WireNetwork.BackendEnvironment(
126126
title: "Example backend",
127127
environmentType: .default,
128128
config: .init(

WireDomain/Sources/WireDomain/Helpers/BackendEnvironmment2+Mappings.swift renamed to WireDomain/Sources/WireDomain/Helpers/BackendEnvironmment+Mappings.swift

File renamed without changes.

‎WirePreviewApps/WireAuthenticationApp/ContentView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ struct ContentView: View {
3434
.assemble(
3535
authenticationType: .new,
3636
environmentType: configuration.defaultBackendEnvironment,
37-
environment: BackendEnvironment2(
37+
environment: WireNetwork.BackendEnvironment(
3838
title: "Mock backend",
3939
endpoints: Endpoints(
4040
backendURL: URL(string: "https://prod-nginz-https.wire.com")!,

‎wire-ios-share-engine/Sources/SharingSession.swift‎

Lines changed: 1 addition & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -104,148 +104,6 @@ public final class SharingSession {
104104
return featureRepository.fetchFileSharing()
105105
}
106106

107-
/// Initializes a new `SessionDirectory` to be used in an extension environment
108-
/// - parameter databaseDirectory: The `NSURL` of the shared group container
109-
/// - throws: `InitializationError.NeedsMigration` in case the local store needs to be
110-
/// migrated, which is currently only supported in the main application or `InitializationError.LoggedOut` if
111-
/// no user is currently logged in.
112-
/// - returns: The initialized session object if no error is thrown
113-
114-
@MainActor
115-
public convenience init(
116-
applicationGroupIdentifier: String,
117-
accountIdentifier: UUID,
118-
hostBundleIdentifier: String,
119-
environment: LegacyBackendEnvironment,
120-
appLockConfig: AppLockController.LegacyConfig?,
121-
sharedUserDefaults: UserDefaults,
122-
minTLSVersion: String?,
123-
currentBuildNumber: String,
124-
localDomain: String?,
125-
isFederationEnabled: Bool
126-
) async throws {
127-
128-
let sharedContainerURL = FileManager.sharedContainerDirectory(for: applicationGroupIdentifier)
129-
130-
let coreDataStack = CoreDataStack(
131-
account: Account(userName: "", userIdentifier: accountIdentifier),
132-
applicationContainer: sharedContainerURL,
133-
localDomain: localDomain,
134-
isFederationEnabled: isFederationEnabled
135-
)
136-
137-
guard coreDataStack.storesExists else {
138-
throw InitializationError.missingSharedContainer
139-
}
140-
141-
guard !coreDataStack.needsMigration else {
142-
throw InitializationError.needsMigration
143-
}
144-
145-
try await coreDataStack.load()
146-
147-
// Don't cache the cookie because if the user logs out and back in again in the main app
148-
// process, then the cached cookie will be invalid.
149-
let cookieStorage = ZMPersistentCookieStorage(
150-
forServerName: environment.backendURL.host!,
151-
userIdentifier: accountIdentifier,
152-
useCache: false
153-
)
154-
155-
let credentials = environment.proxy.flatMap { ProxyCredentials.retrieve(for: $0) }
156-
157-
let selfClientID = coreDataStack.syncContext.performAndWait {
158-
ZMUser.selfUser(in: coreDataStack.syncContext).selfClient()?.remoteIdentifier
159-
}
160-
161-
let transportSession = ZMTransportSession(
162-
environment: environment,
163-
proxyUsername: credentials?.username,
164-
proxyPassword: credentials?.password,
165-
cookieStorage: cookieStorage,
166-
reachability: environment.reachability,
167-
initialAccessToken: nil,
168-
applicationGroupIdentifier: applicationGroupIdentifier,
169-
applicationVersion: "1.0.0",
170-
minTLSVersion: minTLSVersion,
171-
selfClientID: selfClientID,
172-
// This flag only concerns the push channel which isn't relevant
173-
// in the sharing session.
174-
isSyncV2Enabled: false
175-
)
176-
177-
let proxySettings: WireNetwork.ProxySettings? = {
178-
guard let proxy = environment.proxy else { return nil }
179-
180-
if proxy.needsAuthentication {
181-
guard
182-
let proxyUsername = credentials?.username,
183-
let proxyPassword = credentials?.password else {
184-
fatalInternal("Proxy needs authentication but credentials are missing")
185-
return nil
186-
}
187-
188-
return .authenticated(
189-
host: proxy.host,
190-
port: proxy.port,
191-
username: proxyUsername,
192-
password: proxyPassword
193-
)
194-
} else {
195-
return .unauthenticated(host: proxy.host, port: proxy.port)
196-
}
197-
}()
198-
199-
let wireAPIBackendEnvironment = BackendEnvironment(
200-
url: environment.backendURL,
201-
webSocketURL: environment.backendWSURL,
202-
blacklistURL: environment.blackListURL,
203-
pinnedKeys: environment.trustData.map { trustData in
204-
PinnedKey(
205-
key: trustData.certificateKey,
206-
rawKey: trustData.rawCertificateKey,
207-
hosts: trustData.hosts.map { host in
208-
switch host.rule {
209-
case .equals:
210-
.equals(host.value)
211-
case .endsWith:
212-
.endsWith(host.value)
213-
}
214-
}
215-
)
216-
},
217-
proxySettings: proxySettings
218-
)
219-
220-
guard let apiVersion = BackendInfo.apiVersion,
221-
let wireAPIVersion = WireNetwork.APIVersion(rawValue: UInt(apiVersion.rawValue)) else {
222-
fatal("cannot resolve api version")
223-
224-
}
225-
226-
try await self.init(
227-
accountIdentifier: accountIdentifier,
228-
selfClientID: selfClientID!,
229-
coreDataStack: coreDataStack,
230-
transportSession: transportSession,
231-
cachesDirectory: FileManager.default.cachesURLForAccount(with: accountIdentifier, in: sharedContainerURL),
232-
accountContainer: CoreDataStack.accountDataFolder(
233-
accountIdentifier: accountIdentifier,
234-
applicationContainer: sharedContainerURL
235-
),
236-
appLockConfig: appLockConfig,
237-
wireAPIBackendEnvironment: wireAPIBackendEnvironment,
238-
minTLSVersion: .minVersionFrom(minTLSVersion),
239-
apiVersion: wireAPIVersion,
240-
sharedUserDefaults: sharedUserDefaults,
241-
sharedContainerURL: URL("unused")!,
242-
legacyEnvironment: environment,
243-
proxyCredentials: credentials,
244-
currentBuildNumber: currentBuildNumber,
245-
localDomain: localDomain
246-
)
247-
}
248-
249107
@MainActor
250108
init(
251109
accountIdentifier: UUID,
@@ -423,7 +281,7 @@ public final class SharingSession {
423281
}
424282

425283
let networkStack = NetworkStack(
426-
backendEnvironment: BackendEnvironment2(legacyEnvironment),
284+
backendEnvironment: WireNetwork.BackendEnvironment(legacyEnvironment),
427285
minTLSVersion: minTLSVersion,
428286
preferredAPIVersion: preferredAPIVersion,
429287
proxyCredentials: proxyCredentials

‎wire-ios-share-engine/Sources/SharingSessionLoader.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public struct SharingSessionLoader {
143143
)
144144
}
145145

146-
private func fetchBackendEnvironment() throws -> BackendEnvironment2 {
146+
private func fetchBackendEnvironment() throws -> WireNetwork.BackendEnvironment {
147147
do {
148148
guard let environment = try backendStore.fetchBackendEnvironment(accountID: accountID) else {
149149
throw Failure.mainAppRequired(message: "no backend environment")
@@ -155,7 +155,7 @@ public struct SharingSessionLoader {
155155
}
156156
}
157157

158-
private func fetchProxyCredentials(for config: BackendEnvironment2.ProxyConfig) async throws -> WireNetwork
158+
private func fetchProxyCredentials(for config: WireNetwork.BackendEnvironment.ProxyConfig) async throws -> WireNetwork
159159
.ProxyCredentials? {
160160
guard config.needsAuthentication else {
161161
return nil
@@ -258,7 +258,7 @@ public struct SharingSessionLoader {
258258

259259
private func makeSharingSession(
260260
selfClientID: String,
261-
environment: BackendEnvironment2,
261+
environment: WireNetwork.BackendEnvironment,
262262
proxyCredentials: WireNetwork.ProxyCredentials?,
263263
restNetworkService: NetworkService,
264264
webSocketNetworkService: NetworkService,

‎wire-ios-share-engine/Sources/StrategyFactory.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ final class StrategyFactory {
6565
self.apiVersion = apiVersion
6666
self.localDomain = localDomain
6767

68-
if let localDomain, BackendEnvironment2.isCloudDomain(localDomain) {
68+
if let localDomain, WireNetwork.BackendEnvironment.isCloudDomain(localDomain) {
6969
self.isCloudDomain = true
7070
} else {
7171
self.isCloudDomain = false

‎wire-ios/Wire-iOS Tests/AnalyticsTrackingManager/AnalyticsTrackingAvailabilityCheckerTests.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ final class AnalyticsTrackingAvailabilityCheckerTests: XCTestCase {
5757
}
5858
}
5959

60-
private func makeBackendEnvironment(backendURL: String) -> BackendEnvironment2 {
61-
BackendEnvironment2(
60+
private func makeBackendEnvironment(backendURL: String) -> WireNetwork.BackendEnvironment {
61+
WireNetwork.BackendEnvironment(
6262
title: "mock",
6363
environmentType: .default,
6464
config: .init(

‎wire-ios/Wire-iOS Tests/Authentication/AuthenticationInterfaceBuilderTests.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ final class AuthenticationInterfaceBuilderTests: XCTestCase, CoreDataFixtureTest
2626
var coreDataFixture: CoreDataFixture!
2727
var featureProvider: MockAuthenticationFeatureProvider!
2828
var builder: AuthenticationInterfaceBuilder!
29-
var defaultEnvironment: BackendEnvironment2!
29+
var defaultEnvironment: WireNetwork.BackendEnvironment!
3030
private var snapshotHelper: SnapshotHelper!
3131

3232
override func setUp() async throws {
3333
try await super.setUp()
3434
snapshotHelper = SnapshotHelper()
3535
coreDataFixture = try await CoreDataFixture()
3636
accentColor = .blue
37-
defaultEnvironment = BackendEnvironment2(
37+
defaultEnvironment = WireNetwork.BackendEnvironment(
3838
title: "mock",
3939
environmentType: .default,
4040
config: .init(

‎wire-ios/Wire-iOS Tests/Authentication/Helpers/RegistrationAnalyticsTrackerTests.swift‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ final class RegistrationAnalyticsTrackerTests: XCTestCase {
4141
func testIsAnalyticsTrackingAvailableCallsChecker() {
4242
// Given
4343
let environment = makeBackendEnvironment(backendURL: "https://account.bella.wire.link")
44-
availabilityChecker.isAnalyticsTrackingAvailableForEnvironmentBackendEnvironment2BoolReturnValue = true
44+
availabilityChecker.isAnalyticsTrackingAvailableForEnvironmentBackendEnvironmentBoolReturnValue = true
4545

4646
// When
4747
let result = sut.isAnalyticsTrackingAvailable(for: environment)
4848

4949
// Then
5050
XCTAssertTrue(result)
5151
XCTAssertEqual(
52-
availabilityChecker.isAnalyticsTrackingAvailableForEnvironmentBackendEnvironment2BoolReceivedInvocations,
52+
availabilityChecker.isAnalyticsTrackingAvailableForEnvironmentBackendEnvironmentBoolReceivedInvocations,
5353
[environment]
5454
)
5555
}
@@ -65,13 +65,13 @@ final class RegistrationAnalyticsTrackerTests: XCTestCase {
6565
// Then
6666
XCTAssertFalse(result)
6767
XCTAssertEqual(
68-
availabilityChecker.isAnalyticsTrackingAvailableForEnvironmentBackendEnvironment2BoolReceivedInvocations,
68+
availabilityChecker.isAnalyticsTrackingAvailableForEnvironmentBackendEnvironmentBoolReceivedInvocations,
6969
[]
7070
)
7171
}
7272

73-
private func makeBackendEnvironment(backendURL: String) -> BackendEnvironment2 {
74-
BackendEnvironment2(
73+
private func makeBackendEnvironment(backendURL: String) -> WireNetwork.BackendEnvironment {
74+
WireNetwork.BackendEnvironment(
7575
title: "mock",
7676
environmentType: .default,
7777
config: .init(
@@ -129,24 +129,24 @@ private final class AnalyticsTrackingAvailabilityCheckerProtocolMock: AnalyticsT
129129

130130
// MARK: - isAnalyticsTrackingAvailable
131131

132-
var isAnalyticsTrackingAvailableForEnvironmentBackendEnvironment2BoolCallsCount = 0
133-
var isAnalyticsTrackingAvailableForEnvironmentBackendEnvironment2BoolCalled: Bool {
134-
isAnalyticsTrackingAvailableForEnvironmentBackendEnvironment2BoolCallsCount > 0
132+
var isAnalyticsTrackingAvailableForEnvironmentBackendEnvironmentBoolCallsCount = 0
133+
var isAnalyticsTrackingAvailableForEnvironmentBackendEnvironmentBoolCalled: Bool {
134+
isAnalyticsTrackingAvailableForEnvironmentBackendEnvironmentBoolCallsCount > 0
135135
}
136136

137-
var isAnalyticsTrackingAvailableForEnvironmentBackendEnvironment2BoolReceivedEnvironment: BackendEnvironment2?
138-
var isAnalyticsTrackingAvailableForEnvironmentBackendEnvironment2BoolReceivedInvocations: [BackendEnvironment2] = []
139-
var isAnalyticsTrackingAvailableForEnvironmentBackendEnvironment2BoolReturnValue: Bool!
140-
var isAnalyticsTrackingAvailableForEnvironmentBackendEnvironment2BoolClosure: ((BackendEnvironment2) -> Bool)?
141-
142-
func isAnalyticsTrackingAvailable(for environment: BackendEnvironment2) -> Bool {
143-
isAnalyticsTrackingAvailableForEnvironmentBackendEnvironment2BoolCallsCount += 1
144-
isAnalyticsTrackingAvailableForEnvironmentBackendEnvironment2BoolReceivedEnvironment = environment
145-
isAnalyticsTrackingAvailableForEnvironmentBackendEnvironment2BoolReceivedInvocations.append(environment)
146-
if let isAnalyticsTrackingAvailableForEnvironmentBackendEnvironment2BoolClosure {
147-
return isAnalyticsTrackingAvailableForEnvironmentBackendEnvironment2BoolClosure(environment)
137+
var isAnalyticsTrackingAvailableForEnvironmentBackendEnvironmentBoolReceivedEnvironment: WireNetwork.BackendEnvironment?
138+
var isAnalyticsTrackingAvailableForEnvironmentBackendEnvironmentBoolReceivedInvocations: [WireNetwork.BackendEnvironment] = []
139+
var isAnalyticsTrackingAvailableForEnvironmentBackendEnvironmentBoolReturnValue: Bool!
140+
var isAnalyticsTrackingAvailableForEnvironmentBackendEnvironmentBoolClosure: ((WireNetwork.BackendEnvironment) -> Bool)?
141+
142+
func isAnalyticsTrackingAvailable(for environment: WireNetwork.BackendEnvironment) -> Bool {
143+
isAnalyticsTrackingAvailableForEnvironmentBackendEnvironmentBoolCallsCount += 1
144+
isAnalyticsTrackingAvailableForEnvironmentBackendEnvironmentBoolReceivedEnvironment = environment
145+
isAnalyticsTrackingAvailableForEnvironmentBackendEnvironmentBoolReceivedInvocations.append(environment)
146+
if let isAnalyticsTrackingAvailableForEnvironmentBackendEnvironmentBoolClosure {
147+
return isAnalyticsTrackingAvailableForEnvironmentBackendEnvironmentBoolClosure(environment)
148148
} else {
149-
return isAnalyticsTrackingAvailableForEnvironmentBackendEnvironment2BoolReturnValue
149+
return isAnalyticsTrackingAvailableForEnvironmentBackendEnvironmentBoolReturnValue
150150
}
151151
}
152152

‎wire-ios/Wire-iOS/Sources/AppDelegate.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ private extension AppDelegate {
515515
appRootRouter?.start(launchOptions: launchOptions)
516516
}
517517

518-
private func fetchDefaultEnvironment() -> BackendEnvironment2 {
518+
private func fetchDefaultEnvironment() -> WireNetwork.BackendEnvironment {
519519
let env = ProcessInfo.processInfo.arguments.contains("--useEnvStaging") ? "staging" : "default"
520520
guard let path = Bundle.backendBundle.path(
521521
forResource: env,
@@ -526,7 +526,7 @@ private extension AppDelegate {
526526

527527
do {
528528
let data = try Data(contentsOf: URL(filePath: path))
529-
return try BackendEnvironment2.fromJSON(data, environmentType: .default)
529+
return try WireNetwork.BackendEnvironment.fromJSON(data, environmentType: .default)
530530
} catch {
531531
fatalError("unabled to fetch default environment: \(error)")
532532
}

0 commit comments

Comments
 (0)