Skip to content

Commit af7dd6c

Browse files
Updating SDK to bb36b48 (1.0.0-283-7b5d9db) (#1909)
Co-authored-by: bw-ghapp[bot] <178206702+bw-ghapp[bot]@users.noreply.github.com> Co-authored-by: Federico Maccaroni <[email protected]>
1 parent 6e8c618 commit af7dd6c

File tree

5 files changed

+58
-6
lines changed

5 files changed

+58
-6
lines changed

AuthenticatorShared/Core/Auth/Services/TestHelpers/MockCryptoClient.swift

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,22 @@ class MockCryptoClient: CryptoClientProtocol {
2020
var enrollAdminPasswordPublicKey: String?
2121
var enrollAdminPasswordResetResult: Result<String, Error> = .success("RESET_PASSWORD_KEY")
2222

23+
var enrollPinPin: String?
24+
var enrollPinResult: Result<EnrollPinResponse, Error> = .success(
25+
EnrollPinResponse(
26+
pinProtectedUserKeyEnvelope: "pinProtectedUserKeyEnvelope",
27+
userKeyEncryptedPin: "userKeyEncryptedPin"
28+
)
29+
)
30+
31+
var enrollPinWithEncryptedPinEncryptedPin: String?
32+
var enrollPinWithEncryptedPinResult: Result<EnrollPinResponse, Error> = .success(
33+
EnrollPinResponse(
34+
pinProtectedUserKeyEnvelope: "pinProtectedUserKeyEnvelope",
35+
userKeyEncryptedPin: "userKeyEncryptedPin"
36+
)
37+
)
38+
2339
var getUserEncryptionKeyResult: Result<String, Error> = .success("USER_ENCRYPTION_KEY")
2440

2541
var initializeOrgCryptoRequest: InitOrgCryptoRequest?
@@ -55,6 +71,16 @@ class MockCryptoClient: CryptoClientProtocol {
5571
return try enrollAdminPasswordResetResult.get()
5672
}
5773

74+
func enrollPin(pin: String) throws -> EnrollPinResponse {
75+
enrollPinPin = pin
76+
return try enrollPinResult.get()
77+
}
78+
79+
func enrollPinWithEncryptedPin(encryptedPin: EncString) throws -> EnrollPinResponse {
80+
enrollPinWithEncryptedPinEncryptedPin = encryptedPin
81+
return try enrollPinWithEncryptedPinResult.get()
82+
}
83+
5884
func getUserEncryptionKey() async throws -> String {
5985
try getUserEncryptionKeyResult.get()
6086
}

Bitwarden.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

BitwardenShared/Core/Auth/Repositories/AuthRepository.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,7 +1108,8 @@ extension DefaultAuthRepository: AuthRepository {
11081108
case .decryptedKey,
11091109
.deviceKey,
11101110
.keyConnector,
1111-
.pin:
1111+
.pin,
1112+
.pinEnvelope: // TODO: PM-23289 will change in this ticket
11121113
// No-op: nothing extra to do.
11131114
break
11141115
}
@@ -1195,7 +1196,8 @@ extension DefaultAuthRepository: AuthRepository {
11951196
case .authRequest,
11961197
.deviceKey,
11971198
.keyConnector,
1198-
.pin:
1199+
.pin,
1200+
.pinEnvelope: // TODO: PM-23289 will change in this ticket
11991201
break
12001202
case .decryptedKey,
12011203
.password:

BitwardenShared/Core/Auth/Services/TestHelpers/MockCryptoClient.swift

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,22 @@ class MockCryptoClient: CryptoClientProtocol {
2020
var enrollAdminPasswordPublicKey: String?
2121
var enrollAdminPasswordResetResult: Result<String, Error> = .success("RESET_PASSWORD_KEY")
2222

23+
var enrollPinPin: String?
24+
var enrollPinResult: Result<EnrollPinResponse, Error> = .success(
25+
EnrollPinResponse(
26+
pinProtectedUserKeyEnvelope: "pinProtectedUserKeyEnvelope",
27+
userKeyEncryptedPin: "userKeyEncryptedPin"
28+
)
29+
)
30+
31+
var enrollPinWithEncryptedPinEncryptedPin: String?
32+
var enrollPinWithEncryptedPinResult: Result<EnrollPinResponse, Error> = .success(
33+
EnrollPinResponse(
34+
pinProtectedUserKeyEnvelope: "pinProtectedUserKeyEnvelope",
35+
userKeyEncryptedPin: "userKeyEncryptedPin"
36+
)
37+
)
38+
2339
var getUserEncryptionKeyCalled = false
2440
var getUserEncryptionKeyResult: Result<String, Error> = .success("USER_ENCRYPTION_KEY")
2541

@@ -56,6 +72,16 @@ class MockCryptoClient: CryptoClientProtocol {
5672
return try enrollAdminPasswordResetResult.get()
5773
}
5874

75+
func enrollPin(pin: String) throws -> EnrollPinResponse {
76+
enrollPinPin = pin
77+
return try enrollPinResult.get()
78+
}
79+
80+
func enrollPinWithEncryptedPin(encryptedPin: EncString) throws -> EnrollPinResponse {
81+
enrollPinWithEncryptedPinEncryptedPin = encryptedPin
82+
return try enrollPinWithEncryptedPinResult.get()
83+
}
84+
5985
func getUserEncryptionKey() async throws -> String {
6086
getUserEncryptionKeyCalled = true
6187
return try getUserEncryptionKeyResult.get()

project-common.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,14 @@ options:
77
usesTabs: false
88
indentWidth: 4
99
tabWidth: 4
10-
1110
include:
1211
- path: Configs/local-sdk.yml
1312
relativePaths: false
1413
enable: ${LOCAL_SDK}
15-
1614
packages:
1715
BitwardenSdk:
1816
url: https://github.com/bitwarden/sdk-swift
19-
revision: fe0f17e2c217497fe83e40c8dca324880070dea9
17+
revision: bb36b4848c5006b4c14f53c07476d12e6f8708ef # 1.0.0-283-7b5d9db
2018
branch: unstable
2119
Firebase:
2220
url: https://github.com/firebase/firebase-ios-sdk

0 commit comments

Comments
 (0)