Updating SDK to 1e78e85 (1.0.0-2506-9947387) (#1986)

bw-ghapp[bot] · web-flow · commit e64f7d5026aa · 2025-10-02T16:45:45.000-03:00
diff --git a/AuthenticatorShared/Core/Platform/Services/ClientService.swift b/AuthenticatorShared/Core/Platform/Services/ClientService.swift
@@ -285,7 +285,7 @@ class DefaultClientBuilder: ClientBuilder {
     // MARK: Methods
 
     func buildClient() -> BitwardenSdkClient {
-        Client(settings: settings)
+        Client(tokenProvider: DefaultClientManagedTokensProvider(), settings: settings)
     }
 }
 
@@ -347,3 +347,14 @@ extension Client: BitwardenSdkClient {
         vault() as VaultClient
     }
 }
+
+// MARK: DefaultTokenProvider
+
+/// Default implementation of the SDK's `ClientManagedTokens`.
+/// Given that we are not performing authenticated API calls in BWA
+/// we just return `nil` for the access token.
+final class DefaultClientManagedTokensProvider: ClientManagedTokens {
+    func getAccessToken() async -> String? {
+        nil
+    }
+}
diff --git a/AuthenticatorShared/Core/Vault/Services/TestHelpers/MockVaultClientService.swift b/AuthenticatorShared/Core/Vault/Services/TestHelpers/MockVaultClientService.swift
@@ -163,7 +163,7 @@ class MockClientCollections: CollectionsClientProtocol {
 
     func getCollectionTree(collections: [BitwardenSdk.CollectionView]) -> BitwardenSdk.CollectionViewTree {
         getCollectionTreeReceivedCollection = collections
-        return getCollectionTreeReturnValue ?? BitwardenSdk.CollectionViewTree(noPointer: .init())
+        return getCollectionTreeReturnValue ?? BitwardenSdk.CollectionViewTree(noHandle: .init())
     }
 }
 
diff --git a/AuthenticatorShared/UI/Platform/Application/Extensions/Alert+Networking.swift b/AuthenticatorShared/UI/Platform/Application/Extensions/Alert+Networking.swift
@@ -45,11 +45,6 @@ extension Alert {
                 title: Localizations.anErrorHasOccurred,
                 message: serverError.message
             )
-        case let BitwardenSdk.BitwardenError.E(message):
-            return defaultAlert(
-                title: Localizations.anErrorHasOccurred,
-                message: message
-            )
         case let error as URLError where error.code == .notConnectedToInternet || error.code == .networkConnectionLost:
             return internetConnectionError(tryAgain)
         case let error as URLError where error.code == .timedOut:
diff --git a/Bitwarden.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Bitwarden.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/BitwardenShared/Core/Platform/Extensions/BitwardenSdk+Platform.swift b/BitwardenShared/Core/Platform/Extensions/BitwardenSdk+Platform.swift
@@ -6,9 +6,6 @@ import Foundation
 extension BitwardenSdk.BitwardenError: @retroactive CustomNSError {
     /// The user-info dictionary.
     public var errorUserInfo: [String: Any] {
-        guard case let .E(message) = self else {
-            return [:]
-        }
-        return ["Message": message]
+        ["SpecificError": String(describing: self)]
     }
 }
diff --git a/BitwardenShared/Core/Platform/Extensions/BitwardenSdk+PlatformTests.swift b/BitwardenShared/Core/Platform/Extensions/BitwardenSdk+PlatformTests.swift
@@ -8,11 +8,13 @@ import XCTest
 class BitwardenErrorTests: BitwardenTestCase {
     // MARK: Tests
 
-    /// `getter:errorUserInfo` gets the appropriate user info based on the message of the error `E`
+    /// `getter:errorUserInfo` gets the appropriate user info based on the message
+    /// of the internal `BitwardenSdk.BitwardenError`.
     func test_errorUserInfo() {
-        let expectedMessage = "expectedMessage"
-        let error = BitwardenSdk.BitwardenError.E(message: expectedMessage)
-        let userInfo = error.errorUserInfo
-        XCTAssertEqual(userInfo["Message"] as? String, expectedMessage)
+        let expectedMessage = "Crypto(BitwardenSdk.CryptoError.Fingerprint(message: \"internal error\"))"
+        let error = BitwardenSdk.BitwardenError.Crypto(CryptoError.Fingerprint(message: "internal error"))
+        let nsError = error as NSError
+        let userInfo = nsError.userInfo
+        XCTAssertEqual(userInfo["SpecificError"] as? String, expectedMessage)
     }
 }
diff --git a/BitwardenShared/Core/Platform/Services/ClientBuilderTests.swift b/BitwardenShared/Core/Platform/Services/ClientBuilderTests.swift
@@ -6,6 +6,7 @@ import XCTest
 class ClientBuilderTests: BitwardenTestCase {
     // MARK: Properties
 
+    var clientManagedTokens: MockClientManagedTokens!
     var errorReporter: MockErrorReporter!
     var mockPlatform: MockPlatformClientService!
     var subject: DefaultClientBuilder!
@@ -15,16 +16,19 @@ class ClientBuilderTests: BitwardenTestCase {
     override func setUp() {
         super.setUp()
 
+        clientManagedTokens = MockClientManagedTokens()
         errorReporter = MockErrorReporter()
         mockPlatform = MockPlatformClientService()
         subject = DefaultClientBuilder(
-            errorReporter: errorReporter
+            errorReporter: errorReporter,
+            tokenProvider: clientManagedTokens
         )
     }
 
     override func tearDown() {
         super.tearDown()
 
+        clientManagedTokens = nil
         errorReporter = nil
         mockPlatform = nil
         subject = nil
diff --git a/BitwardenShared/Core/Platform/Services/ClientService.swift b/BitwardenShared/Core/Platform/Services/ClientService.swift
@@ -351,25 +351,31 @@ class DefaultClientBuilder: ClientBuilder {
     /// The settings applied to the client.
     private let settings: ClientSettings?
 
+    /// The token provider to pass to the SDK.
+    private let tokenProvider: ClientManagedTokens
+
     // MARK: Initialization
 
     /// Initializes a new client.
     ///
     /// - Parameters:
     ///   - errorReporter: The service used by the application to report non-fatal errors.
     ///   - settings: The settings applied to the client.
+    ///   - tokenProvider: The token provider to pass to the SDK.
     init(
         errorReporter: ErrorReporter,
-        settings: ClientSettings? = nil
+        settings: ClientSettings? = nil,
+        tokenProvider: ClientManagedTokens
     ) {
         self.errorReporter = errorReporter
         self.settings = settings
+        self.tokenProvider = tokenProvider
     }
 
     // MARK: Methods
 
     func buildClient() -> BitwardenSdkClient {
-        Client(settings: settings)
+        Client(tokenProvider: tokenProvider, settings: settings)
     }
 }
 
diff --git a/BitwardenShared/Core/Platform/Services/ServiceContainer.swift b/BitwardenShared/Core/Platform/Services/ServiceContainer.swift
@@ -435,7 +435,11 @@ public class ServiceContainer: Services { // swiftlint:disable:this type_body_le
         let environmentService = DefaultEnvironmentService(errorReporter: errorReporter, stateService: stateService)
         let collectionService = DefaultCollectionService(collectionDataStore: dataStore, stateService: stateService)
         let settingsService = DefaultSettingsService(settingsDataStore: dataStore, stateService: stateService)
-        let tokenService = DefaultTokenService(keychainRepository: keychainRepository, stateService: stateService)
+        let tokenService = DefaultTokenService(
+            errorReporter: errorReporter,
+            keychainRepository: keychainRepository,
+            stateService: stateService
+        )
         let apiService = APIService(
             environmentService: environmentService,
             flightRecorder: flightRecorder,
@@ -463,7 +467,8 @@ public class ServiceContainer: Services { // swiftlint:disable:this type_body_le
         )
 
         let clientBuilder = DefaultClientBuilder(
-            errorReporter: errorReporter
+            errorReporter: errorReporter,
+            tokenProvider: tokenService
         )
         let clientService = DefaultClientService(
             clientBuilder: clientBuilder,
diff --git a/BitwardenShared/Core/Platform/Services/TokenService.swift b/BitwardenShared/Core/Platform/Services/TokenService.swift
@@ -1,3 +1,6 @@
+import BitwardenKit
+import BitwardenSdk
+
 /// A protocol for a `TokenService` which manages accessing and updating the active account's tokens.
 ///
 protocol TokenService: AnyObject {
@@ -35,6 +38,9 @@ protocol TokenService: AnyObject {
 actor DefaultTokenService: TokenService {
     // MARK: Properties
 
+    /// The service used by the application to report non-fatal errors.
+    let errorReporter: ErrorReporter
+
     /// The repository used to manages keychain items.
     let keychainRepository: KeychainRepository
 
@@ -46,13 +52,16 @@ actor DefaultTokenService: TokenService {
     /// Initialize a `DefaultTokenService`.
     ///
     /// - Parameters
+    ///   - errorReporter: The service used by the application to report non-fatal errors.
     ///   - keychainRepository: The repository used to manages keychain items.
     ///   - stateService: The service that manages the account state.
     ///
     init(
+        errorReporter: ErrorReporter,
         keychainRepository: KeychainRepository,
         stateService: StateService
     ) {
+        self.errorReporter = errorReporter
         self.keychainRepository = keychainRepository
         self.stateService = stateService
     }
@@ -65,7 +74,7 @@ actor DefaultTokenService: TokenService {
     }
 
     func getIsExternal() async throws -> Bool {
-        let accessToken = try await getAccessToken()
+        let accessToken: String = try await getAccessToken()
         let tokenPayload = try TokenParser.parseToken(accessToken)
         return tokenPayload.isExternal
     }
@@ -81,3 +90,14 @@ actor DefaultTokenService: TokenService {
         try await keychainRepository.setRefreshToken(refreshToken, userId: userId)
     }
 }
+
+// MARK: ClientManagedTokens (SDK)
+
+extension DefaultTokenService: ClientManagedTokens {
+    /// Gets the access token for the SDK, nil if any errors are thrown.
+    func getAccessToken() async -> String? {
+        // TODO: PM-21846 Returning `nil` temporarily until we add validation
+        // given that the SDK expects non-expired token.
+        return nil
+    }
+}
diff --git a/BitwardenShared/Core/Platform/Services/TokenServiceTests.swift b/BitwardenShared/Core/Platform/Services/TokenServiceTests.swift
@@ -1,3 +1,4 @@
+import BitwardenKitMocks
 import TestHelpers
 import XCTest
 
@@ -6,6 +7,7 @@ import XCTest
 class TokenServiceTests: BitwardenTestCase {
     // MARK: Properties
 
+    var errorReporter: MockErrorReporter!
     var keychainRepository: MockKeychainRepository!
     var stateService: MockStateService!
     var subject: DefaultTokenService!
@@ -15,15 +17,21 @@ class TokenServiceTests: BitwardenTestCase {
     override func setUp() {
         super.setUp()
 
+        errorReporter = MockErrorReporter()
         keychainRepository = MockKeychainRepository()
         stateService = MockStateService()
 
-        subject = DefaultTokenService(keychainRepository: keychainRepository, stateService: stateService)
+        subject = DefaultTokenService(
+            errorReporter: errorReporter,
+            keychainRepository: keychainRepository,
+            stateService: stateService
+        )
     }
 
     override func tearDown() {
         super.tearDown()
 
+        errorReporter = nil
         keychainRepository = nil
         stateService = nil
         subject = nil
@@ -35,12 +43,12 @@ class TokenServiceTests: BitwardenTestCase {
     func test_getAccessToken() async throws {
         stateService.activeAccount = .fixture()
 
-        let accessToken = try await subject.getAccessToken()
+        let accessToken: String = try await subject.getAccessToken()
         XCTAssertEqual(accessToken, "ACCESS_TOKEN")
 
         keychainRepository.getAccessTokenResult = .success("🔑")
 
-        let updatedAccessToken = try await subject.getAccessToken()
+        let updatedAccessToken: String = try await subject.getAccessToken()
         XCTAssertEqual(updatedAccessToken, "🔑")
     }
 
@@ -49,10 +57,18 @@ class TokenServiceTests: BitwardenTestCase {
         stateService.activeAccount = nil
 
         await assertAsyncThrows(error: StateServiceError.noActiveAccount) {
-            _ = try await subject.getAccessToken()
+            let accessToken: String = try await subject.getAccessToken()
         }
     }
 
+    /// `getAccessToken()` returns the access token stored in the state service for the active account
+    /// for the `ClientManagedTokens` function. Now it temporarily returns `nil` until the expired validation is added
+    /// as the SDK always expect a valid token.
+    func test_getAccessToken_sdk() async throws {
+        let accessToken: String? = await subject.getAccessToken()
+        XCTAssertNil(accessToken)
+    }
+
     /// `getIsExternal()` returns false if the user isn't an external user.
     func test_getIsExternal_false() async throws {
         // swiftlint:disable:next line_length
diff --git a/BitwardenShared/Core/Platform/Utilities/TestHelpers/MockClientManagedTokens.swift b/BitwardenShared/Core/Platform/Utilities/TestHelpers/MockClientManagedTokens.swift
@@ -0,0 +1,12 @@
+import BitwardenSdk
+
+@testable import BitwardenShared
+
+@MainActor
+final class MockClientManagedTokens: ClientManagedTokens {
+    var getAccessTokenReturnValue: String?
+
+    func getAccessToken() async -> String? {
+        getAccessTokenReturnValue
+    }
+}
diff --git a/BitwardenShared/Core/Vault/Services/TestHelpers/MockVaultClientService.swift b/BitwardenShared/Core/Vault/Services/TestHelpers/MockVaultClientService.swift
@@ -199,7 +199,7 @@ class MockClientCollections: CollectionsClientProtocol {
 
     func getCollectionTree(collections: [BitwardenSdk.CollectionView]) -> BitwardenSdk.CollectionViewTree {
         getCollectionTreeReceivedCollection = collections
-        return getCollectionTreeReturnValue ?? BitwardenSdk.CollectionViewTree(noPointer: .init())
+        return getCollectionTreeReturnValue ?? BitwardenSdk.CollectionViewTree(noHandle: .init())
     }
 }
 
diff --git a/BitwardenShared/UI/Auth/RemoveMasterPassword/RemoveMasterPasswordProcessorTests.swift b/BitwardenShared/UI/Auth/RemoveMasterPassword/RemoveMasterPasswordProcessorTests.swift
@@ -81,7 +81,11 @@ class RemoveMasterPasswordProcessorTests: BitwardenTestCase {
     @MainActor
     func test_perform_continueFlow_invalidPassword() async throws {
         authRepository.migrateUserToKeyConnectorResult = .failure(
-            BitwardenSdk.BitwardenError.E(message: "invalid master password")
+            BitwardenSdk.BitwardenError.AuthValidate(
+                AuthValidateError.WrongPassword(
+                    message: "invalid master password"
+                )
+            )
         )
         subject.state.masterPassword = "password"
 
diff --git a/BitwardenShared/UI/Platform/Application/Extensions/Alert+Networking.swift b/BitwardenShared/UI/Platform/Application/Extensions/Alert+Networking.swift
@@ -50,11 +50,6 @@ extension Alert {
                 title: Localizations.anErrorHasOccurred,
                 message: serverError.message
             )
-        case let BitwardenSdk.BitwardenError.E(message):
-            return defaultAlert(
-                title: Localizations.anErrorHasOccurred,
-                message: message
-            )
         case let error as URLError where error.code == .notConnectedToInternet || error.code == .networkConnectionLost:
             return internetConnectionError(tryAgain)
         case let error as URLError where error.code == .timedOut:
diff --git a/BitwardenShared/UI/Platform/DebugMenu/DebugMenuProcessor.swift b/BitwardenShared/UI/Platform/DebugMenu/DebugMenuProcessor.swift
@@ -48,9 +48,9 @@ final class DebugMenuProcessor: StateProcessor<DebugMenuState, DebugMenuAction,
         case .generateCrash:
             preconditionFailure("Generated crash from debug view.")
         case .generateErrorReport:
-            services.errorReporter.log(error: BitwardenSdk.BitwardenError.E(
+            services.errorReporter.log(error: BitwardenSdk.BitwardenError.Api(ApiError.ResponseContent(
                 message: "Generated error report from debug view.")
-            )
+            ))
             services.errorReporter.log(error: KeychainServiceError.osStatusError(1))
         }
     }
diff --git a/BitwardenShared/UI/Platform/DebugMenu/DebugMenuProcessorTests.swift b/BitwardenShared/UI/Platform/DebugMenu/DebugMenuProcessorTests.swift
@@ -97,9 +97,9 @@ class DebugMenuProcessorTests: BitwardenTestCase {
         subject.receive(.generateErrorReport)
         XCTAssertEqual(
             errorReporter.errors[0] as? BitwardenSdk.BitwardenError,
-            BitwardenSdk.BitwardenError.E(
+            BitwardenSdk.BitwardenError.Api(ApiError.ResponseContent(
                 message: "Generated error report from debug view."
-            )
+            ))
         )
         XCTAssertEqual(
             errorReporter.errors[1] as? KeychainServiceError,
diff --git a/project-common.yml b/project-common.yml
@@ -14,7 +14,7 @@ include:
 packages:
   BitwardenSdk:
     url: https://github.com/bitwarden/sdk-swift
-    revision: f3c527ff2c53b576743e090ed118f0a5a7c613d3 # 1.0.0-2469-1ca5a58
+    revision: 1e78e85bd3d45d14cf76592b0f109ba54c119d4b # 1.0.0-2506-9947387
     branch: unstable
   Firebase:
     url: https://github.com/firebase/firebase-ios-sdk

Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ class DefaultClientBuilder: ClientBuilder {`
`285`	`285`	`// MARK: Methods`
`286`	`286`
`287`	`287`	`func buildClient() -> BitwardenSdkClient {`
`288`		`- Client(settings: settings)`
	`288`	`+ Client(tokenProvider: DefaultClientManagedTokensProvider(), settings: settings)`
`289`	`289`	`}`
`290`	`290`	`}`
`291`	`291`
`@@ -347,3 +347,14 @@ extension Client: BitwardenSdkClient {`
`347`	`347`	`vault() as VaultClient`
`348`	`348`	`}`
`349`	`349`	`}`
	`350`	`+`
	`351`	`+// MARK: DefaultTokenProvider`
	`352`	`+`
	`353`	+/// Default implementation of the SDK's `ClientManagedTokens`.
	`354`	`+/// Given that we are not performing authenticated API calls in BWA`
	`355`	+/// we just return `nil` for the access token.
	`356`	`+final class DefaultClientManagedTokensProvider: ClientManagedTokens {`
	`357`	`+ func getAccessToken() async -> String? {`
	`358`	`+ nil`
	`359`	`+ }`
	`360`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ class MockClientCollections: CollectionsClientProtocol {`
`163`	`163`
`164`	`164`	`func getCollectionTree(collections: [BitwardenSdk.CollectionView]) -> BitwardenSdk.CollectionViewTree {`
`165`	`165`	`getCollectionTreeReceivedCollection = collections`
`166`		`- return getCollectionTreeReturnValue ?? BitwardenSdk.CollectionViewTree(noPointer: .init())`
	`166`	`+ return getCollectionTreeReturnValue ?? BitwardenSdk.CollectionViewTree(noHandle: .init())`
`167`	`167`	`}`
`168`	`168`	`}`
`169`	`169`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,6 @@ import Foundation`
`6`	`6`	`extension BitwardenSdk.BitwardenError: @retroactive CustomNSError {`
`7`	`7`	`/// The user-info dictionary.`
`8`	`8`	`public var errorUserInfo: [String: Any] {`
`9`		`- guard case let .E(message) = self else {`
`10`		`- return [:]`
`11`		`- }`
`12`		`- return ["Message": message]`
	`9`	`+ ["SpecificError": String(describing: self)]`
`13`	`10`	`}`
`14`	`11`	`}`