Send config requests unauthenticated so we can get feature flags befo…

…re user is logged in
bitwarden · May 1, 2024 · b0651c1 · b0651c1
1 parent bc789c0
commit b0651c1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/BitwardenShared/Core/Platform/Models/Domain/ServerConfig.swift b/BitwardenShared/Core/Platform/Models/Domain/ServerConfig.swift
@@ -64,22 +64,22 @@ struct ThirdPartyServerConfig: Equatable, Codable {
 /// Model for the environment URLs in a server configuration.
 struct EnvironmentServerConfig: Equatable, Codable {
     /// The API URL.
-    let api: String
+    let api: String?
 
     /// The Cloud Region (e.g. "US")
-    let cloudRegion: String
+    let cloudRegion: String?
 
     /// The Identity URL.
-    let identity: String
+    let identity: String?
 
     /// The Notifications URL.
-    let notifications: String
+    let notifications: String?
 
     /// The SSO URL.
-    let sso: String
+    let sso: String?
 
     /// The Vault URL.
-    let vault: String
+    let vault: String?
 
     init?(responseModel: EnvironmentServerConfigResponseModel?) {
         guard let responseModel else { return nil }

diff --git a/BitwardenShared/Core/Platform/Services/API/ConfigAPIService.swift b/BitwardenShared/Core/Platform/Services/API/ConfigAPIService.swift
@@ -10,6 +10,6 @@ protocol ConfigAPIService {
 
 extension APIService: ConfigAPIService {
     func getConfig() async throws -> ConfigResponseModel {
-        try await apiService.send(ConfigRequest())
+        try await apiUnauthenticatedService.send(ConfigRequest())
     }
 }
diff --git a/BitwardenShared/Core/Platform/Services/API/Response/ConfigResponseModel.swift b/BitwardenShared/Core/Platform/Services/API/Response/ConfigResponseModel.swift
@@ -36,20 +36,20 @@ struct ThirdPartyConfigResponseModel: Equatable, JSONResponse {
 /// API response model for the environment URLs in a configuration response.
 struct EnvironmentServerConfigResponseModel: Equatable, JSONResponse {
     /// The API URL.
-    let api: String
+    let api: String?
 
     /// The Cloud Region (e.g. "US")
-    let cloudRegion: String
+    let cloudRegion: String?
 
     /// The Identity URL.
-    let identity: String
+    let identity: String?
 
     /// The Notifications URL.
-    let notifications: String
+    let notifications: String?
 
     /// The SSO URL.
-    let sso: String
+    let sso: String?
 
     /// The Vault URL.
-    let vault: String
+    let vault: String?
 }
diff --git a/BitwardenShared/Core/Platform/Services/ConfigService.swift b/BitwardenShared/Core/Platform/Services/ConfigService.swift
@@ -114,7 +114,7 @@ class DefaultConfigService: ConfigService {
                     date: timeProvider.presentTime,
                     responseModel: configResponse
                 )
-                try await stateService.setServerConfig(serverConfig)
+                try? await stateService.setServerConfig(serverConfig)
                 return serverConfig
             } catch {
                 errorReporter.log(error: error)