Update Swift SDK to ab3c7dbd0699a57f626acf430d1bcf3120d2cc07

bitwarden-devops-bot · bitwarden-devops-bot · commit 35714771471f · 2025-08-22T10:14:53.000Z
diff --git a/Package.swift b/Package.swift
@@ -33,8 +33,8 @@ let package = Package(
         ),
         .binaryTarget(
             name: "BitwardenFFI",
-            url: "https://github.com/bitwarden/sdk-swift/releases/download/v1.0.0-unstable-a3d1c11/BitwardenFFI-1.0.0-a3d1c11.xcframework.zip",
-            checksum: "c10a9bfea745349daa4082ebc7b797f3d0cb0e4e15b7875012459adffd50ece1"
+            url: "https://github.com/bitwarden/sdk-swift/releases/download/v1.0.0-unstable-ab3c7db/BitwardenFFI-1.0.0-ab3c7db.xcframework.zip",
+            checksum: "d3fa6e182688aa4849811f0b82fdf0e0cdd08c4e7baf917f0b98386389172d11"
         ),
     ]
 )
diff --git a/Sources/BitwardenSdk/BitwardenCollections.swift b/Sources/BitwardenSdk/BitwardenCollections.swift
@@ -464,8 +464,8 @@ fileprivate struct FfiConverterString: FfiConverter {
 
 
 public struct Collection {
-    public let id: Uuid?
-    public let organizationId: Uuid
+    public let id: CollectionId?
+    public let organizationId: OrganizationId
     public let name: EncString
     public let externalId: String?
     public let hidePasswords: Bool
@@ -476,7 +476,7 @@ public struct Collection {
 
     // Default memberwise initializers are never public by default, so we
     // declare one manually.
-    public init(id: Uuid?, organizationId: Uuid, name: EncString, externalId: String?, hidePasswords: Bool, readOnly: Bool, manage: Bool, defaultUserCollectionEmail: String?, type: CollectionType) {
+    public init(id: CollectionId?, organizationId: OrganizationId, name: EncString, externalId: String?, hidePasswords: Bool, readOnly: Bool, manage: Bool, defaultUserCollectionEmail: String?, type: CollectionType) {
         self.id = id
         self.organizationId = organizationId
         self.name = name
@@ -548,8 +548,8 @@ public struct FfiConverterTypeCollection: FfiConverterRustBuffer {
     public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> Collection {
         return
             try Collection(
-                id: FfiConverterOptionTypeUuid.read(from: &buf), 
-                organizationId: FfiConverterTypeUuid.read(from: &buf), 
+                id: FfiConverterOptionTypeCollectionId.read(from: &buf), 
+                organizationId: FfiConverterTypeOrganizationId.read(from: &buf), 
                 name: FfiConverterTypeEncString.read(from: &buf), 
                 externalId: FfiConverterOptionString.read(from: &buf), 
                 hidePasswords: FfiConverterBool.read(from: &buf), 
@@ -561,8 +561,8 @@ public struct FfiConverterTypeCollection: FfiConverterRustBuffer {
     }
 
     public static func write(_ value: Collection, into buf: inout [UInt8]) {
-        FfiConverterOptionTypeUuid.write(value.id, into: &buf)
-        FfiConverterTypeUuid.write(value.organizationId, into: &buf)
+        FfiConverterOptionTypeCollectionId.write(value.id, into: &buf)
+        FfiConverterTypeOrganizationId.write(value.organizationId, into: &buf)
         FfiConverterTypeEncString.write(value.name, into: &buf)
         FfiConverterOptionString.write(value.externalId, into: &buf)
         FfiConverterBool.write(value.hidePasswords, into: &buf)
@@ -590,8 +590,8 @@ public func FfiConverterTypeCollection_lower(_ value: Collection) -> RustBuffer
 
 
 public struct CollectionView {
-    public let id: Uuid?
-    public let organizationId: Uuid
+    public let id: CollectionId?
+    public let organizationId: OrganizationId
     public let name: String
     public let externalId: String?
     public let hidePasswords: Bool
@@ -601,7 +601,7 @@ public struct CollectionView {
 
     // Default memberwise initializers are never public by default, so we
     // declare one manually.
-    public init(id: Uuid?, organizationId: Uuid, name: String, externalId: String?, hidePasswords: Bool, readOnly: Bool, manage: Bool, type: CollectionType) {
+    public init(id: CollectionId?, organizationId: OrganizationId, name: String, externalId: String?, hidePasswords: Bool, readOnly: Bool, manage: Bool, type: CollectionType) {
         self.id = id
         self.organizationId = organizationId
         self.name = name
@@ -668,8 +668,8 @@ public struct FfiConverterTypeCollectionView: FfiConverterRustBuffer {
     public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> CollectionView {
         return
             try CollectionView(
-                id: FfiConverterOptionTypeUuid.read(from: &buf), 
-                organizationId: FfiConverterTypeUuid.read(from: &buf), 
+                id: FfiConverterOptionTypeCollectionId.read(from: &buf), 
+                organizationId: FfiConverterTypeOrganizationId.read(from: &buf), 
                 name: FfiConverterString.read(from: &buf), 
                 externalId: FfiConverterOptionString.read(from: &buf), 
                 hidePasswords: FfiConverterBool.read(from: &buf), 
@@ -680,8 +680,8 @@ public struct FfiConverterTypeCollectionView: FfiConverterRustBuffer {
     }
 
     public static func write(_ value: CollectionView, into buf: inout [UInt8]) {
-        FfiConverterOptionTypeUuid.write(value.id, into: &buf)
-        FfiConverterTypeUuid.write(value.organizationId, into: &buf)
+        FfiConverterOptionTypeCollectionId.write(value.id, into: &buf)
+        FfiConverterTypeOrganizationId.write(value.organizationId, into: &buf)
         FfiConverterString.write(value.name, into: &buf)
         FfiConverterOptionString.write(value.externalId, into: &buf)
         FfiConverterBool.write(value.hidePasswords, into: &buf)
@@ -810,27 +810,71 @@ fileprivate struct FfiConverterOptionString: FfiConverterRustBuffer {
 #if swift(>=5.8)
 @_documentation(visibility: private)
 #endif
-fileprivate struct FfiConverterOptionTypeUuid: FfiConverterRustBuffer {
-    typealias SwiftType = Uuid?
+fileprivate struct FfiConverterOptionTypeCollectionId: FfiConverterRustBuffer {
+    typealias SwiftType = CollectionId?
 
     public static func write(_ value: SwiftType, into buf: inout [UInt8]) {
         guard let value = value else {
             writeInt(&buf, Int8(0))
             return
         }
         writeInt(&buf, Int8(1))
-        FfiConverterTypeUuid.write(value, into: &buf)
+        FfiConverterTypeCollectionId.write(value, into: &buf)
     }
 
     public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> SwiftType {
         switch try readInt(&buf) as Int8 {
         case 0: return nil
-        case 1: return try FfiConverterTypeUuid.read(from: &buf)
+        case 1: return try FfiConverterTypeCollectionId.read(from: &buf)
         default: throw UniffiInternalError.unexpectedOptionalTag
         }
     }
 }
 
+
+/**
+ * Typealias from the type name used in the UDL file to the builtin type.  This
+ * is needed because the UDL type name is used in function/method signatures.
+ */
+public typealias CollectionId = Uuid
+
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
+public struct FfiConverterTypeCollectionId: FfiConverter {
+    public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> CollectionId {
+        return try FfiConverterTypeUuid.read(from: &buf)
+    }
+
+    public static func write(_ value: CollectionId, into buf: inout [UInt8]) {
+        return FfiConverterTypeUuid.write(value, into: &buf)
+    }
+
+    public static func lift(_ value: RustBuffer) throws -> CollectionId {
+        return try FfiConverterTypeUuid_lift(value)
+    }
+
+    public static func lower(_ value: CollectionId) -> RustBuffer {
+        return FfiConverterTypeUuid_lower(value)
+    }
+}
+
+
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
+public func FfiConverterTypeCollectionId_lift(_ value: RustBuffer) throws -> CollectionId {
+    return try FfiConverterTypeCollectionId.lift(value)
+}
+
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
+public func FfiConverterTypeCollectionId_lower(_ value: CollectionId) -> RustBuffer {
+    return FfiConverterTypeCollectionId.lower(value)
+}
+
+
 private enum InitializationResult {
     case ok
     case contractVersionMismatch
@@ -847,8 +891,8 @@ private let initializationResult: InitializationResult = {
         return InitializationResult.contractVersionMismatch
     }
 
-    uniffiEnsureBitwardenCoreInitialized()
     uniffiEnsureBitwardenCryptoInitialized()
+    uniffiEnsureBitwardenCoreInitialized()
     return InitializationResult.ok
 }()
 
diff --git a/Sources/BitwardenSdk/BitwardenCore.swift b/Sources/BitwardenSdk/BitwardenCore.swift
@@ -1065,14 +1065,14 @@ public struct InitOrgCryptoRequest {
     /**
      * The encryption keys for all the organizations the user is a part of
      */
-    public let organizationKeys: [Uuid: UnsignedSharedKey]
+    public let organizationKeys: [OrganizationId: UnsignedSharedKey]
 
     // Default memberwise initializers are never public by default, so we
     // declare one manually.
     public init(
         /**
          * The encryption keys for all the organizations the user is a part of
-         */organizationKeys: [Uuid: UnsignedSharedKey]) {
+         */organizationKeys: [OrganizationId: UnsignedSharedKey]) {
         self.organizationKeys = organizationKeys
     }
 }
@@ -1104,12 +1104,12 @@ public struct FfiConverterTypeInitOrgCryptoRequest: FfiConverterRustBuffer {
     public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> InitOrgCryptoRequest {
         return
             try InitOrgCryptoRequest(
-                organizationKeys: FfiConverterDictionaryTypeUuidTypeUnsignedSharedKey.read(from: &buf)
+                organizationKeys: FfiConverterDictionaryTypeOrganizationIdTypeUnsignedSharedKey.read(from: &buf)
         )
     }
 
     public static func write(_ value: InitOrgCryptoRequest, into buf: inout [UInt8]) {
-        FfiConverterDictionaryTypeUuidTypeUnsignedSharedKey.write(value.organizationKeys, into: &buf)
+        FfiConverterDictionaryTypeOrganizationIdTypeUnsignedSharedKey.write(value.organizationKeys, into: &buf)
     }
 }
 
@@ -1136,7 +1136,7 @@ public struct InitUserCryptoRequest {
     /**
      * The user's ID.
      */
-    public let userId: Uuid?
+    public let userId: UserId?
     /**
      * The user's KDF parameters, as received from the prelogin request
      */
@@ -1167,7 +1167,7 @@ public struct InitUserCryptoRequest {
     public init(
         /**
          * The user's ID.
-         */userId: Uuid?, 
+         */userId: UserId?, 
         /**
          * The user's KDF parameters, as received from the prelogin request
          */kdfParams: Kdf, 
@@ -1247,7 +1247,7 @@ public struct FfiConverterTypeInitUserCryptoRequest: FfiConverterRustBuffer {
     public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> InitUserCryptoRequest {
         return
             try InitUserCryptoRequest(
-                userId: FfiConverterOptionTypeUuid.read(from: &buf), 
+                userId: FfiConverterOptionTypeUserId.read(from: &buf), 
                 kdfParams: FfiConverterTypeKdf.read(from: &buf), 
                 email: FfiConverterString.read(from: &buf), 
                 privateKey: FfiConverterTypeEncString.read(from: &buf), 
@@ -1258,7 +1258,7 @@ public struct FfiConverterTypeInitUserCryptoRequest: FfiConverterRustBuffer {
     }
 
     public static func write(_ value: InitUserCryptoRequest, into buf: inout [UInt8]) {
-        FfiConverterOptionTypeUuid.write(value.userId, into: &buf)
+        FfiConverterOptionTypeUserId.write(value.userId, into: &buf)
         FfiConverterTypeKdf.write(value.kdfParams, into: &buf)
         FfiConverterString.write(value.email, into: &buf)
         FfiConverterTypeEncString.write(value.privateKey, into: &buf)
@@ -2793,22 +2793,22 @@ fileprivate struct FfiConverterOptionTypeSignedSecurityState: FfiConverterRustBu
 #if swift(>=5.8)
 @_documentation(visibility: private)
 #endif
-fileprivate struct FfiConverterOptionTypeUuid: FfiConverterRustBuffer {
-    typealias SwiftType = Uuid?
+fileprivate struct FfiConverterOptionTypeUserId: FfiConverterRustBuffer {
+    typealias SwiftType = UserId?
 
     public static func write(_ value: SwiftType, into buf: inout [UInt8]) {
         guard let value = value else {
             writeInt(&buf, Int8(0))
             return
         }
         writeInt(&buf, Int8(1))
-        FfiConverterTypeUuid.write(value, into: &buf)
+        FfiConverterTypeUserId.write(value, into: &buf)
     }
 
     public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> SwiftType {
         switch try readInt(&buf) as Int8 {
         case 0: return nil
-        case 1: return try FfiConverterTypeUuid.read(from: &buf)
+        case 1: return try FfiConverterTypeUserId.read(from: &buf)
         default: throw UniffiInternalError.unexpectedOptionalTag
         }
     }
@@ -2841,22 +2841,22 @@ fileprivate struct FfiConverterOptionTypeEncString: FfiConverterRustBuffer {
 #if swift(>=5.8)
 @_documentation(visibility: private)
 #endif
-fileprivate struct FfiConverterDictionaryTypeUuidTypeUnsignedSharedKey: FfiConverterRustBuffer {
-    public static func write(_ value: [Uuid: UnsignedSharedKey], into buf: inout [UInt8]) {
+fileprivate struct FfiConverterDictionaryTypeOrganizationIdTypeUnsignedSharedKey: FfiConverterRustBuffer {
+    public static func write(_ value: [OrganizationId: UnsignedSharedKey], into buf: inout [UInt8]) {
         let len = Int32(value.count)
         writeInt(&buf, len)
         for (key, value) in value {
-            FfiConverterTypeUuid.write(key, into: &buf)
+            FfiConverterTypeOrganizationId.write(key, into: &buf)
             FfiConverterTypeUnsignedSharedKey.write(value, into: &buf)
         }
     }
 
-    public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> [Uuid: UnsignedSharedKey] {
+    public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> [OrganizationId: UnsignedSharedKey] {
         let len: Int32 = try readInt(&buf)
-        var dict = [Uuid: UnsignedSharedKey]()
+        var dict = [OrganizationId: UnsignedSharedKey]()
         dict.reserveCapacity(Int(len))
         for _ in 0..<len {
-            let key = try FfiConverterTypeUuid.read(from: &buf)
+            let key = try FfiConverterTypeOrganizationId.read(from: &buf)
             let value = try FfiConverterTypeUnsignedSharedKey.read(from: &buf)
             dict[key] = value
         }
@@ -3041,6 +3041,50 @@ public func FfiConverterTypeSignedSecurityState_lower(_ value: SignedSecuritySta
 
 
 
+/**
+ * Typealias from the type name used in the UDL file to the builtin type.  This
+ * is needed because the UDL type name is used in function/method signatures.
+ */
+public typealias UserId = Uuid
+
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
+public struct FfiConverterTypeUserId: FfiConverter {
+    public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> UserId {
+        return try FfiConverterTypeUuid.read(from: &buf)
+    }
+
+    public static func write(_ value: UserId, into buf: inout [UInt8]) {
+        return FfiConverterTypeUuid.write(value, into: &buf)
+    }
+
+    public static func lift(_ value: RustBuffer) throws -> UserId {
+        return try FfiConverterTypeUuid_lift(value)
+    }
+
+    public static func lower(_ value: UserId) -> RustBuffer {
+        return FfiConverterTypeUuid_lower(value)
+    }
+}
+
+
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
+public func FfiConverterTypeUserId_lift(_ value: RustBuffer) throws -> UserId {
+    return try FfiConverterTypeUserId.lift(value)
+}
+
+#if swift(>=5.8)
+@_documentation(visibility: private)
+#endif
+public func FfiConverterTypeUserId_lower(_ value: UserId) -> RustBuffer {
+    return FfiConverterTypeUserId.lower(value)
+}
+
+
+
 /**
  * Typealias from the type name used in the UDL file to the builtin type.  This
  * is needed because the UDL type name is used in function/method signatures.
diff --git a/Sources/BitwardenSdk/BitwardenFido.swift b/Sources/BitwardenSdk/BitwardenFido.swift
@@ -2666,8 +2666,8 @@ private let initializationResult: InitializationResult = {
         return InitializationResult.contractVersionMismatch
     }
 
-    uniffiEnsureBitwardenVaultInitialized()
     uniffiEnsureBitwardenCoreInitialized()
+    uniffiEnsureBitwardenVaultInitialized()
     return InitializationResult.ok
 }()
 
diff --git a/Sources/BitwardenSdk/BitwardenSDK.swift b/Sources/BitwardenSdk/BitwardenSDK.swift
diff --git a/Sources/BitwardenSdk/BitwardenVault.swift b/Sources/BitwardenSdk/BitwardenVault.swift

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,8 @@ let package = Package(`
`33`	`33`	`),`
`34`	`34`	`.binaryTarget(`
`35`	`35`	`name: "BitwardenFFI",`
`36`		`- url: "https://github.com/bitwarden/sdk-swift/releases/download/v1.0.0-unstable-a3d1c11/BitwardenFFI-1.0.0-a3d1c11.xcframework.zip",`
`37`		`- checksum: "c10a9bfea745349daa4082ebc7b797f3d0cb0e4e15b7875012459adffd50ece1"`
	`36`	`+ url: "https://github.com/bitwarden/sdk-swift/releases/download/v1.0.0-unstable-ab3c7db/BitwardenFFI-1.0.0-ab3c7db.xcframework.zip",`
	`37`	`+ checksum: "d3fa6e182688aa4849811f0b82fdf0e0cdd08c4e7baf917f0b98386389172d11"`
`38`	`38`	`),`
`39`	`39`	`]`
`40`	`40`	`)`
Original file line number	Diff line number	Diff line change
`@@ -2666,8 +2666,8 @@ private let initializationResult: InitializationResult = {`
`2666`	`2666`	`return InitializationResult.contractVersionMismatch`
`2667`	`2667`	`}`
`2668`	`2668`
`2669`		`- uniffiEnsureBitwardenVaultInitialized()`
`2670`	`2669`	`uniffiEnsureBitwardenCoreInitialized()`
	`2670`	`+ uniffiEnsureBitwardenVaultInitialized()`
`2671`	`2671`	`return InitializationResult.ok`
`2672`	`2672`	`}()`
`2673`	`2673`