Skip to content

Commit b6f37eb

Browse files
fix: resolve cells URL manually (temporary fix) - WPB-22571 🍒 (#4083)
Co-authored-by: Jullian Mercier <[email protected]>
1 parent 92799fc commit b6f37eb

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

wire-ios-sync-engine/Source/UserSession/ZMUserSession/ZMUserSession.swift

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,7 @@ public final class ZMUserSession: NSObject {
178178
}
179179

180180
public var isWireCellsEnabled: Bool {
181-
let isFeatureEnabled = wireCellsFeature.status == .enabled
182-
let hasBackendURL = wireCellsBackendURL != nil
183-
184-
return isFeatureEnabled && hasBackendURL
181+
wireCellsFeature.status == .enabled
185182
}
186183

187184
public var conferenceCallingFeature: Feature.ConferenceCalling {

wire-ios/Wire-iOS/Sources/UserInterface/MainController/ZClientControllerBuilder.swift

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,19 @@ final class ZClientControllerBuilder {
3434
private(set) var trackingManager: TrackingManager?
3535
let legacyEnvironment: WireTransport.BackendEnvironment
3636
let newEnvironment: WireNetwork.BackendEnvironment2?
37-
private lazy var wireCellsBackendURL: URL? = {
38-
let contextProvider = userSession.contextProvider
39-
let syncContext = contextProvider.syncContext
40-
let featureRepository = LegacyFeatureRepository(context: syncContext)
41-
42-
return syncContext.performAndWait {
43-
featureRepository.fetchCellsInternal()?.config.backend.url
37+
private lazy var wireCellsBackendURL: URL = {
38+
let serverURL = newEnvironment?.config.endpoints.restAPIURL ?? legacyEnvironment.backendURL
39+
return switch serverURL.host {
40+
case "prod-nginz-https.wire.com": // Production
41+
URL(string: "https://cells-beta.wire.com")!
42+
case "staging-nginz-https.zinfra.io": // Staging
43+
URL(string: "https://cells.staging.zinfra.io")!
44+
case "nginz-https.fulu.wire.link": // Fulu
45+
URL(string: "https://cells.fulu.wire.link")!
46+
case "nginz-https.imai.wire.link": // Imai
47+
URL(string: "https://cells.imai.wire.link")!
48+
default:
49+
serverURL
4450
}
4551
}()
4652

@@ -85,7 +91,7 @@ final class ZClientControllerBuilder {
8591
case missingCellsBackendURL
8692
}
8793

88-
guard let self, let wireCellsBackendURL else {
94+
guard let self else {
8995
throw Failure.missingCellsBackendURL
9096
}
9197

0 commit comments

Comments
 (0)