Skip to content

Updating SDK to bb36b48 (1.0.0-2207-03d02e6) #1909

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 4 commits into from
Sep 3, 2025
Merged

Updating SDK to bb36b48 (1.0.0-2207-03d02e6) #1909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
47edde1
SDK Update - bb36b48 (1.0.0-283-7b5d9db)
bw-ghapp[bot] Sep 3, 2025
756873a
Fix temporary breaking changes
fedemkr Sep 3, 2025
170a374
Fix MockCryptoClient
fedemkr Sep 3, 2025
2de7851
Fix MockCryptoClient on Authenticator.
fedemkr Sep 3, 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
26 changes: 26 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 @@ -20,6 +20,22 @@ class MockCryptoClient: CryptoClientProtocol {
var enrollAdminPasswordPublicKey: String?
var enrollAdminPasswordResetResult: Result<String, Error> = .success("RESET_PASSWORD_KEY")

var enrollPinPin: String?
var enrollPinResult: Result<EnrollPinResponse, Error> = .success(
EnrollPinResponse(
pinProtectedUserKeyEnvelope: "pinProtectedUserKeyEnvelope",
userKeyEncryptedPin: "userKeyEncryptedPin"
)
)

var enrollPinWithEncryptedPinEncryptedPin: String?
var enrollPinWithEncryptedPinResult: Result<EnrollPinResponse, Error> = .success(
EnrollPinResponse(
pinProtectedUserKeyEnvelope: "pinProtectedUserKeyEnvelope",
userKeyEncryptedPin: "userKeyEncryptedPin"
)
)

var getUserEncryptionKeyResult: Result<String, Error> = .success("USER_ENCRYPTION_KEY")

var initializeOrgCryptoRequest: InitOrgCryptoRequest?
Expand Down Expand Up @@ -55,6 +71,16 @@ class MockCryptoClient: CryptoClientProtocol {
return try enrollAdminPasswordResetResult.get()
}

func enrollPin(pin: String) throws -> EnrollPinResponse {
enrollPinPin = pin
return try enrollPinResult.get()
}

func enrollPinWithEncryptedPin(encryptedPin: EncString) throws -> EnrollPinResponse {
enrollPinWithEncryptedPinEncryptedPin = encryptedPin
return try enrollPinWithEncryptedPinResult.get()
}

func getUserEncryptionKey() async throws -> String {
try getUserEncryptionKeyResult.get()
}
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.

6 changes: 4 additions & 2 deletions BitwardenShared/Core/Auth/Repositories/AuthRepository.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1108,7 +1108,8 @@ extension DefaultAuthRepository: AuthRepository {
case .decryptedKey,
.deviceKey,
.keyConnector,
.pin:
.pin,
.pinEnvelope: // TODO: PM-23289 will change in this ticket
// No-op: nothing extra to do.
break
}
Expand Down Expand Up @@ -1195,7 +1196,8 @@ extension DefaultAuthRepository: AuthRepository {
case .authRequest,
.deviceKey,
.keyConnector,
.pin:
.pin,
.pinEnvelope: // TODO: PM-23289 will change in this ticket
break
case .decryptedKey,
.password:
Expand Down
26 changes: 26 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
Expand Up @@ -20,6 +20,22 @@ class MockCryptoClient: CryptoClientProtocol {
var enrollAdminPasswordPublicKey: String?
var enrollAdminPasswordResetResult: Result<String, Error> = .success("RESET_PASSWORD_KEY")

var enrollPinPin: String?
var enrollPinResult: Result<EnrollPinResponse, Error> = .success(
EnrollPinResponse(
pinProtectedUserKeyEnvelope: "pinProtectedUserKeyEnvelope",
userKeyEncryptedPin: "userKeyEncryptedPin"
)
)

var enrollPinWithEncryptedPinEncryptedPin: String?
var enrollPinWithEncryptedPinResult: Result<EnrollPinResponse, Error> = .success(
EnrollPinResponse(
pinProtectedUserKeyEnvelope: "pinProtectedUserKeyEnvelope",
userKeyEncryptedPin: "userKeyEncryptedPin"
)
)

var getUserEncryptionKeyCalled = false
var getUserEncryptionKeyResult: Result<String, Error> = .success("USER_ENCRYPTION_KEY")

Expand Down Expand Up @@ -56,6 +72,16 @@ class MockCryptoClient: CryptoClientProtocol {
return try enrollAdminPasswordResetResult.get()
}

func enrollPin(pin: String) throws -> EnrollPinResponse {
enrollPinPin = pin
return try enrollPinResult.get()
}

func enrollPinWithEncryptedPin(encryptedPin: EncString) throws -> EnrollPinResponse {
enrollPinWithEncryptedPinEncryptedPin = encryptedPin
return try enrollPinWithEncryptedPinResult.get()
}

func getUserEncryptionKey() async throws -> String {
getUserEncryptionKeyCalled = true
return try getUserEncryptionKeyResult.get()
Expand Down
4 changes: 1 addition & 3 deletions project-common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,14 @@ options:
usesTabs: false
indentWidth: 4
tabWidth: 4

include:
- path: Configs/local-sdk.yml
relativePaths: false
enable: ${LOCAL_SDK}

packages:
BitwardenSdk:
url: https://github.com/bitwarden/sdk-swift
revision: fe0f17e2c217497fe83e40c8dca324880070dea9
revision: bb36b4848c5006b4c14f53c07476d12e6f8708ef # 1.0.0-283-7b5d9db
branch: unstable
Firebase:
url: https://github.com/firebase/firebase-ios-sdk
Expand Down