Skip to content

Updating SDK to f14c06f (1.0.0-2413-0eba924) #1946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Sep 18, 2025
Merged

Updating SDK to f14c06f (1.0.0-2413-0eba924) #1946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6e63e29
SDK Update - c16a299 (1.0.0-283-7b5d9db)
bw-ghapp[bot] Sep 11, 2025
7e2a852
SDK Update - 8b605c5 (1.0.0-2301-0b6d9c4)
bw-ghapp[bot] Sep 11, 2025
de95709
SDK Update - 3e310f8 (1.0.0-2394-72f4866)
bw-ghapp[bot] Sep 16, 2025
1801587
SDK Update - f14c06f (1.0.0-2413-0eba924)
bw-ghapp[bot] Sep 17, 2025
ea986fb
Merge branch 'main' into sdlc/sdk-update
vvolkgang Sep 17, 2025
22d0dbf
Add archivedDate properties
matt-livefront Sep 18, 2025
866f360
Add mock methods to MockCryptoClient
matt-livefront Sep 18, 2025
8a30fc9
Update Package.resolved
matt-livefront Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions AuthenticatorShared/Core/Auth/Services/TestHelpers/MockCryptoClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,28 @@ class MockCryptoClient: CryptoClientProtocol {
var initializeUserCryptoRequest: InitUserCryptoRequest?
var initializeUserCryptoResult: Result<Void, Error> = .success(())

var makeUpdateKdfKdf: Kdf?
var makeUpdateKdfPassword: String?
var makeUpdateKdfResult: Result<UpdateKdfResponse, Error> = .success(
UpdateKdfResponse(
masterPasswordAuthenticationData: MasterPasswordAuthenticationData(
kdf: .pbkdf2(iterations: NonZeroU32(600_000)),
salt: "AUTHENTICATION_SALT",
masterPasswordAuthenticationHash: "MASTER_PASSWORD_AUTHENTICATION_HASH"
),
masterPasswordUnlockData: MasterPasswordUnlockData(
kdf: .pbkdf2(iterations: NonZeroU32(600_000)),
masterKeyWrappedUserKey: "MASTER_KEY_WRAPPED_USER_KEY",
salt: "UNLOCK_SALT"
),
oldMasterPasswordAuthenticationData: MasterPasswordAuthenticationData(
kdf: .pbkdf2(iterations: NonZeroU32(600_000)),
salt: "OLD_AUTHENTICATION_SALT",
masterPasswordAuthenticationHash: "MASTER_PASSWORD_AUTHENTICATION_HASH"
)
)
)

var updatePasswordNewPassword: String?
var updatePasswordResult: Result<UpdatePasswordResponse, Error> = .success(
UpdatePasswordResponse(
Expand Down Expand Up @@ -95,6 +117,17 @@ class MockCryptoClient: CryptoClientProtocol {
return try initializeUserCryptoResult.get()
}

func makeUpdateKdf(password: String, kdf: Kdf) throws -> UpdateKdfResponse {
makeUpdateKdfPassword = password
makeUpdateKdfKdf = kdf
return try makeUpdateKdfResult.get()
}

func makeUpdatePassword(newPassword: String) throws -> UpdatePasswordResponse {
updatePasswordNewPassword = newPassword
return try updatePasswordResult.get()
}

func updatePassword(newPassword: String) throws -> BitwardenSdk.UpdatePasswordResponse {
updatePasswordNewPassword = newPassword
return try updatePasswordResult.get()
Expand Down
7 changes: 5 additions & 2 deletions AuthenticatorShared/Core/Vault/Services/TestHelpers/BitwardenSdk+VaultMocking.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ extension CipherListView {
creationDate: cipher.creationDate,
deletedDate: cipher.deletedDate,
revisionDate: cipher.revisionDate,
archivedDate: cipher.archivedDate,
copyableFields: [],
localData: cipher.localData.map(LocalDataView.init)
)
Expand Down Expand Up @@ -138,7 +139,8 @@ extension Cipher {
passwordHistory: cipherView.passwordHistory?.map(PasswordHistory.init),
creationDate: cipherView.creationDate,
deletedDate: cipherView.deletedDate,
revisionDate: cipherView.revisionDate
revisionDate: cipherView.revisionDate,
archivedDate: cipherView.archivedDate
)
}
}
Expand Down Expand Up @@ -171,7 +173,8 @@ extension CipherView {
passwordHistory: cipher.passwordHistory?.map(PasswordHistoryView.init),
creationDate: cipher.creationDate,
deletedDate: cipher.deletedDate,
revisionDate: cipher.revisionDate
revisionDate: cipher.revisionDate,
archivedDate: cipher.archivedDate
)
}
}
Expand Down
16 changes: 12 additions & 4 deletions AuthenticatorShared/UI/Vault/PreviewContent/BitwardenSdk+VaultFixtures.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ extension AttachmentView {

extension Cipher {
static func fixture(
archivedDate: Date? = nil,
attachments: [Attachment]? = nil,
card: Card? = nil,
collectionIds: [String] = [],
Expand Down Expand Up @@ -80,13 +81,15 @@ extension Cipher {
passwordHistory: passwordHistory,
creationDate: creationDate,
deletedDate: deletedDate,
revisionDate: revisionDate
revisionDate: revisionDate,
archivedDate: archivedDate
)
}
}

extension CipherView {
static func fixture(
archivedDate: Date? = nil,
attachments: [AttachmentView]? = nil,
card: CardView? = nil,
collectionIds: [String] = [],
Expand Down Expand Up @@ -140,11 +143,13 @@ extension CipherView {
passwordHistory: passwordHistory,
creationDate: creationDate,
deletedDate: deletedDate,
revisionDate: revisionDate
revisionDate: revisionDate,
archivedDate: archivedDate
)
}

static func cardFixture(
archivedDate: Date? = nil,
attachments: [AttachmentView]? = nil,
card: CardView = CardView.fixture(),
collectionIds: [String] = [],
Expand Down Expand Up @@ -193,11 +198,13 @@ extension CipherView {
passwordHistory: passwordHistory,
creationDate: creationDate,
deletedDate: deletedDate,
revisionDate: revisionDate
revisionDate: revisionDate,
archivedDate: archivedDate
)
}

static func loginFixture(
archivedDate: Date? = nil,
attachments: [AttachmentView]? = nil,
collectionIds: [String] = [],
creationDate: DateTime = Date(year: 2023, month: 11, day: 5, hour: 9, minute: 41),
Expand Down Expand Up @@ -246,7 +253,8 @@ extension CipherView {
passwordHistory: passwordHistory,
creationDate: creationDate,
deletedDate: deletedDate,
revisionDate: revisionDate
revisionDate: revisionDate,
archivedDate: archivedDate
)
}

Expand Down
2 changes: 1 addition & 1 deletion Bitwarden.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 34 additions & 0 deletions BitwardenShared/Core/Auth/Services/TestHelpers/MockCryptoClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import BitwardenKit
import BitwardenSdk

@testable import BitwardenShared
Expand Down Expand Up @@ -45,6 +46,28 @@ class MockCryptoClient: CryptoClientProtocol {
var initializeUserCryptoRequest: InitUserCryptoRequest?
var initializeUserCryptoResult: Result<Void, Error> = .success(())

var makeUpdateKdfKdf: Kdf?
var makeUpdateKdfPassword: String?
var makeUpdateKdfResult: Result<UpdateKdfResponse, Error> = .success(
UpdateKdfResponse(
masterPasswordAuthenticationData: MasterPasswordAuthenticationData(
kdf: .pbkdf2(iterations: NonZeroU32(Constants.pbkdf2Iterations)),
salt: "AUTHENTICATION_SALT",
masterPasswordAuthenticationHash: "MASTER_PASSWORD_AUTHENTICATION_HASH"
),
masterPasswordUnlockData: MasterPasswordUnlockData(
kdf: .pbkdf2(iterations: NonZeroU32(Constants.pbkdf2Iterations)),
masterKeyWrappedUserKey: "MASTER_KEY_WRAPPED_USER_KEY",
salt: "UNLOCK_SALT"
),
oldMasterPasswordAuthenticationData: MasterPasswordAuthenticationData(
kdf: .pbkdf2(iterations: NonZeroU32(Constants.pbkdf2Iterations)),
salt: "OLD_AUTHENTICATION_SALT",
masterPasswordAuthenticationHash: "MASTER_PASSWORD_AUTHENTICATION_HASH"
)
)
)

var updatePasswordNewPassword: String?
var updatePasswordResult: Result<UpdatePasswordResponse, Error> = .success(
UpdatePasswordResponse(
Expand Down Expand Up @@ -97,6 +120,17 @@ class MockCryptoClient: CryptoClientProtocol {
return try initializeUserCryptoResult.get()
}

func makeUpdateKdf(password: String, kdf: Kdf) throws -> UpdateKdfResponse {
makeUpdateKdfPassword = password
makeUpdateKdfKdf = kdf
return try makeUpdateKdfResult.get()
}

func makeUpdatePassword(newPassword: String) throws -> UpdatePasswordResponse {
updatePasswordNewPassword = newPassword
return try updatePasswordResult.get()
}

func updatePassword(newPassword: String) throws -> BitwardenSdk.UpdatePasswordResponse {
updatePasswordNewPassword = newPassword
return try updatePasswordResult.get()
Expand Down
7 changes: 5 additions & 2 deletions BitwardenShared/Core/Vault/Extensions/BitwardenSdk+Vault.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ extension CipherDetailsResponseModel {
init(cipher: BitwardenSdk.Cipher) throws {
guard let id = cipher.id else { throw DataMappingError.invalidData }
self.init(
archivedDate: cipher.archivedDate,
attachments: cipher.attachments?.map(AttachmentResponseModel.init),
card: cipher.card.map(CipherCardModel.init),
collectionIds: cipher.collectionIds,
Expand Down Expand Up @@ -353,7 +354,8 @@ extension BitwardenSdk.Cipher {
passwordHistory: model.passwordHistory?.map(PasswordHistory.init),
creationDate: model.creationDate,
deletedDate: model.deletedDate,
revisionDate: model.revisionDate
revisionDate: model.revisionDate,
archivedDate: model.archivedDate
)
}
}
Expand Down Expand Up @@ -432,7 +434,8 @@ extension BitwardenSdk.CipherView: @retroactive Identifiable, Fido2UserVerifiabl
passwordHistory: nil,
creationDate: timeProvider.presentTime,
deletedDate: nil,
revisionDate: timeProvider.presentTime
revisionDate: timeProvider.presentTime,
archivedDate: nil
)
}
}
Expand Down
6 changes: 4 additions & 2 deletions BitwardenShared/Core/Vault/Extensions/BitwardenSdkVaultTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,8 @@ class CipherViewTests: BitwardenTestCase {
passwordHistory: nil,
creationDate: timeProvider.presentTime,
deletedDate: nil,
revisionDate: timeProvider.presentTime
revisionDate: timeProvider.presentTime,
archivedDate: nil
)
)
}
Expand Down Expand Up @@ -258,7 +259,8 @@ class CipherViewTests: BitwardenTestCase {
passwordHistory: nil,
creationDate: timeProvider.presentTime,
deletedDate: nil,
revisionDate: timeProvider.presentTime
revisionDate: timeProvider.presentTime,
archivedDate: nil
)
)
}
Expand Down
1 change: 1 addition & 0 deletions BitwardenShared/Core/Vault/Extensions/CipherListView+Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ extension CipherListView {
creationDate: cipher.creationDate,
deletedDate: cipher.deletedDate,
revisionDate: cipher.revisionDate,
archivedDate: cipher.archivedDate,
copyableFields: [],
localData: nil
)
Expand Down
4 changes: 4 additions & 0 deletions BitwardenShared/Core/Vault/Models/Domain/Fixtures/CipherListView+Fixtures.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ extension CipherListView {
creationDate: Date = Date(),
deletedDate: Date? = nil,
revisionDate: Date = Date(),
archivedDate: Date? = nil,
copyableFields: [CopyableCipherFields] = [],
localData: LocalDataView? = nil
) -> CipherListView {
Expand All @@ -45,6 +46,7 @@ extension CipherListView {
creationDate: creationDate,
deletedDate: deletedDate,
revisionDate: revisionDate,
archivedDate: archivedDate,
copyableFields: copyableFields,
localData: localData
)
Expand All @@ -70,6 +72,7 @@ extension CipherListView {
creationDate: Date = Date(),
deletedDate: Date? = nil,
revisionDate: Date = Date(),
archivedDate: Date? = nil,
copyableFields: [CopyableCipherFields] = [],
localData: LocalDataView? = nil
) -> CipherListView {
Expand All @@ -93,6 +96,7 @@ extension CipherListView {
creationDate: creationDate,
deletedDate: deletedDate,
revisionDate: revisionDate,
archivedDate: archivedDate,
copyableFields: copyableFields,
localData: localData
)
Expand Down
3 changes: 3 additions & 0 deletions BitwardenShared/Core/Vault/Models/Response/CipherDetailsResponseModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ import Networking
struct CipherDetailsResponseModel: JSONResponse, Equatable {
// MARK: Properties

/// The date the cipher was archived.
let archivedDate: Date?

/// The cipher's list of attachments.
let attachments: [AttachmentResponseModel]?

Expand Down
2 changes: 2 additions & 0 deletions ...ardenShared/Core/Vault/Models/Response/Fixtures/CipherDetailsResponseModel+Fixtures.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import Foundation

extension CipherDetailsResponseModel {
static func fixture(
archivedDate: Date? = nil,
attachments: [AttachmentResponseModel]? = nil,
card: CipherCardModel? = nil,
collectionIds: [String] = [],
Expand Down Expand Up @@ -31,6 +32,7 @@ extension CipherDetailsResponseModel {
viewPassword: Bool = false
) -> CipherDetailsResponseModel {
self.init(
archivedDate: archivedDate,
attachments: attachments,
card: card,
collectionIds: collectionIds,
Expand Down
4 changes: 4 additions & 0 deletions BitwardenShared/Core/Vault/Services/API/Cipher/CipherAPIServiceTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ class CipherAPIServiceTests: XCTestCase { // swiftlint:disable:this type_body_le
XCTAssertEqual(
response,
CipherDetailsResponseModel(
archivedDate: nil,
attachments: nil,
card: nil,
collectionIds: nil,
Expand Down Expand Up @@ -101,6 +102,7 @@ class CipherAPIServiceTests: XCTestCase { // swiftlint:disable:this type_body_le
XCTAssertEqual(
response,
CipherDetailsResponseModel(
archivedDate: nil,
attachments: nil,
card: nil,
collectionIds: nil,
Expand Down Expand Up @@ -221,6 +223,7 @@ class CipherAPIServiceTests: XCTestCase { // swiftlint:disable:this type_body_le
SaveAttachmentResponse(
attachmentId: "1",
cipherResponse: CipherDetailsResponseModel(
archivedDate: nil,
attachments: [
.init(
fileName: "2.q4Pl+Pz7D3sxr1VEKuwke",
Expand Down Expand Up @@ -287,6 +290,7 @@ class CipherAPIServiceTests: XCTestCase { // swiftlint:disable:this type_body_le
XCTAssertEqual(
response,
CipherDetailsResponseModel(
archivedDate: nil,
attachments: nil,
card: nil,
collectionIds: nil,
Expand Down
7 changes: 5 additions & 2 deletions BitwardenShared/Core/Vault/Services/TestHelpers/BitwardenSdk+VaultMocking.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ extension CipherListView {
creationDate: cipher.creationDate,
deletedDate: cipher.deletedDate,
revisionDate: cipher.revisionDate,
archivedDate: cipher.archivedDate,
copyableFields: [],
localData: cipher.localData.map(LocalDataView.init)
)
Expand Down Expand Up @@ -138,7 +139,8 @@ extension Cipher {
passwordHistory: cipherView.passwordHistory?.map(PasswordHistory.init),
creationDate: cipherView.creationDate,
deletedDate: cipherView.deletedDate,
revisionDate: cipherView.revisionDate
revisionDate: cipherView.revisionDate,
archivedDate: cipherView.archivedDate
)
}
}
Expand Down Expand Up @@ -171,7 +173,8 @@ extension CipherView {
passwordHistory: cipher.passwordHistory?.map(PasswordHistoryView.init),
creationDate: cipher.creationDate,
deletedDate: cipher.deletedDate,
revisionDate: cipher.revisionDate
revisionDate: cipher.revisionDate,
archivedDate: cipher.archivedDate
)
}
}
Expand Down
Loading