Skip to content

Commit 730c5b9

Browse files
Update Swift SDK to 5658d61f55255c987e60f50c2f08d8864a37d8ab
1 parent fcb0f39 commit 730c5b9

File tree

6 files changed

+41
-15
lines changed

6 files changed

+41
-15
lines changed

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ let package = Package(
3333
),
3434
.binaryTarget(
3535
name: "BitwardenFFI",
36-
url: "https://github.com/bitwarden/sdk-swift/releases/download/v1.0.0-unstable-d2ef415/BitwardenFFI-1.0.0-d2ef415.xcframework.zip",
37-
checksum: "8422907be5267c35f0ebc98efeed34ab4710d2dc7dc3c65be08d2e8f991012dd"
36+
url: "https://github.com/bitwarden/sdk-swift/releases/download/v1.0.0-unstable-5658d61/BitwardenFFI-1.0.0-5658d61.xcframework.zip",
37+
checksum: "8078802c8e364b1c2d8be589e851327409669ac2c88b2133992ce17174ecc3e9"
3838
),
3939
]
4040
)

Sources/BitwardenSdk/BitwardenCollections.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -891,8 +891,8 @@ private let initializationResult: InitializationResult = {
891891
return InitializationResult.contractVersionMismatch
892892
}
893893

894-
uniffiEnsureBitwardenCryptoInitialized()
895894
uniffiEnsureBitwardenCoreInitialized()
895+
uniffiEnsureBitwardenCryptoInitialized()
896896
return InitializationResult.ok
897897
}()
898898

Sources/BitwardenSdk/BitwardenFido.swift

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -893,15 +893,27 @@ public struct Fido2CredentialAutofillView {
893893
public let rpId: String
894894
public let userNameForUi: String?
895895
public let userHandle: Data
896+
/**
897+
* Indicates if this credential uses a signature counter (legacy passkeys).
898+
* When true, mobile clients must sync before authentication to ensure
899+
* counter values are current. Modern passkeys (counter = 0) can work offline.
900+
*/
901+
public let hasCounter: Bool
896902

897903
// Default memberwise initializers are never public by default, so we
898904
// declare one manually.
899-
public init(credentialId: Data, cipherId: Uuid, rpId: String, userNameForUi: String?, userHandle: Data) {
905+
public init(credentialId: Data, cipherId: Uuid, rpId: String, userNameForUi: String?, userHandle: Data,
906+
/**
907+
* Indicates if this credential uses a signature counter (legacy passkeys).
908+
* When true, mobile clients must sync before authentication to ensure
909+
* counter values are current. Modern passkeys (counter = 0) can work offline.
910+
*/hasCounter: Bool) {
900911
self.credentialId = credentialId
901912
self.cipherId = cipherId
902913
self.rpId = rpId
903914
self.userNameForUi = userNameForUi
904915
self.userHandle = userHandle
916+
self.hasCounter = hasCounter
905917
}
906918
}
907919

@@ -927,6 +939,9 @@ extension Fido2CredentialAutofillView: Equatable, Hashable {
927939
if lhs.userHandle != rhs.userHandle {
928940
return false
929941
}
942+
if lhs.hasCounter != rhs.hasCounter {
943+
return false
944+
}
930945
return true
931946
}
932947

@@ -936,6 +951,7 @@ extension Fido2CredentialAutofillView: Equatable, Hashable {
936951
hasher.combine(rpId)
937952
hasher.combine(userNameForUi)
938953
hasher.combine(userHandle)
954+
hasher.combine(hasCounter)
939955
}
940956
}
941957

@@ -952,7 +968,8 @@ public struct FfiConverterTypeFido2CredentialAutofillView: FfiConverterRustBuffe
952968
cipherId: FfiConverterTypeUuid.read(from: &buf),
953969
rpId: FfiConverterString.read(from: &buf),
954970
userNameForUi: FfiConverterOptionString.read(from: &buf),
955-
userHandle: FfiConverterData.read(from: &buf)
971+
userHandle: FfiConverterData.read(from: &buf),
972+
hasCounter: FfiConverterBool.read(from: &buf)
956973
)
957974
}
958975

@@ -962,6 +979,7 @@ public struct FfiConverterTypeFido2CredentialAutofillView: FfiConverterRustBuffe
962979
FfiConverterString.write(value.rpId, into: &buf)
963980
FfiConverterOptionString.write(value.userNameForUi, into: &buf)
964981
FfiConverterData.write(value.userHandle, into: &buf)
982+
FfiConverterBool.write(value.hasCounter, into: &buf)
965983
}
966984
}
967985

Sources/BitwardenSdk/BitwardenSDK.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7246,16 +7246,16 @@ private let initializationResult: InitializationResult = {
72467246
uniffiCallbackInitCipherRepository()
72477247
uniffiCallbackInitFido2CredentialStore()
72487248
uniffiCallbackInitFido2UserInterface()
7249+
uniffiEnsureBitwardenVaultInitialized()
72497250
uniffiEnsureBitwardenSshInitialized()
7251+
uniffiEnsureBitwardenCollectionsInitialized()
72507252
uniffiEnsureBitwardenCryptoInitialized()
7251-
uniffiEnsureBitwardenSendInitialized()
7252-
uniffiEnsureBitwardenFidoInitialized()
7253-
uniffiEnsureBitwardenExportersInitialized()
72547253
uniffiEnsureBitwardenGeneratorsInitialized()
7255-
uniffiEnsureBitwardenCollectionsInitialized()
7256-
uniffiEnsureBitwardenVaultInitialized()
7257-
uniffiEnsureBitwardenCoreInitialized()
72587254
uniffiEnsureBitwardenEncodingInitialized()
7255+
uniffiEnsureBitwardenExportersInitialized()
7256+
uniffiEnsureBitwardenSendInitialized()
7257+
uniffiEnsureBitwardenCoreInitialized()
7258+
uniffiEnsureBitwardenFidoInitialized()
72597259
return InitializationResult.ok
72607260
}()
72617261

Sources/BitwardenSdk/BitwardenSend.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1653,8 +1653,8 @@ private let initializationResult: InitializationResult = {
16531653
return InitializationResult.contractVersionMismatch
16541654
}
16551655

1656-
uniffiEnsureBitwardenCoreInitialized()
16571656
uniffiEnsureBitwardenCryptoInitialized()
1657+
uniffiEnsureBitwardenCoreInitialized()
16581658
return InitializationResult.ok
16591659
}()
16601660

Sources/BitwardenSdk/BitwardenVault.swift

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2275,15 +2275,17 @@ public struct Fido2CredentialListView {
22752275
public let userHandle: String?
22762276
public let userName: String?
22772277
public let userDisplayName: String?
2278+
public let counter: String
22782279

22792280
// Default memberwise initializers are never public by default, so we
22802281
// declare one manually.
2281-
public init(credentialId: String, rpId: String, userHandle: String?, userName: String?, userDisplayName: String?) {
2282+
public init(credentialId: String, rpId: String, userHandle: String?, userName: String?, userDisplayName: String?, counter: String) {
22822283
self.credentialId = credentialId
22832284
self.rpId = rpId
22842285
self.userHandle = userHandle
22852286
self.userName = userName
22862287
self.userDisplayName = userDisplayName
2288+
self.counter = counter
22872289
}
22882290
}
22892291

@@ -2309,6 +2311,9 @@ extension Fido2CredentialListView: Equatable, Hashable {
23092311
if lhs.userDisplayName != rhs.userDisplayName {
23102312
return false
23112313
}
2314+
if lhs.counter != rhs.counter {
2315+
return false
2316+
}
23122317
return true
23132318
}
23142319

@@ -2318,6 +2323,7 @@ extension Fido2CredentialListView: Equatable, Hashable {
23182323
hasher.combine(userHandle)
23192324
hasher.combine(userName)
23202325
hasher.combine(userDisplayName)
2326+
hasher.combine(counter)
23212327
}
23222328
}
23232329

@@ -2334,7 +2340,8 @@ public struct FfiConverterTypeFido2CredentialListView: FfiConverterRustBuffer {
23342340
rpId: FfiConverterString.read(from: &buf),
23352341
userHandle: FfiConverterOptionString.read(from: &buf),
23362342
userName: FfiConverterOptionString.read(from: &buf),
2337-
userDisplayName: FfiConverterOptionString.read(from: &buf)
2343+
userDisplayName: FfiConverterOptionString.read(from: &buf),
2344+
counter: FfiConverterString.read(from: &buf)
23382345
)
23392346
}
23402347

@@ -2344,6 +2351,7 @@ public struct FfiConverterTypeFido2CredentialListView: FfiConverterRustBuffer {
23442351
FfiConverterOptionString.write(value.userHandle, into: &buf)
23452352
FfiConverterOptionString.write(value.userName, into: &buf)
23462353
FfiConverterOptionString.write(value.userDisplayName, into: &buf)
2354+
FfiConverterString.write(value.counter, into: &buf)
23472355
}
23482356
}
23492357

@@ -6510,9 +6518,9 @@ private let initializationResult: InitializationResult = {
65106518
return InitializationResult.contractVersionMismatch
65116519
}
65126520

6521+
uniffiEnsureBitwardenCollectionsInitialized()
65136522
uniffiEnsureBitwardenCoreInitialized()
65146523
uniffiEnsureBitwardenCryptoInitialized()
6515-
uniffiEnsureBitwardenCollectionsInitialized()
65166524
return InitializationResult.ok
65176525
}()
65186526

0 commit comments

Comments
 (0)