bitwarden/sdk-internal@21432b5 1.0.0-2892-21432b5 - [PM-25012] Add data field to Cipher type, and add functions for client-side parsing of the field. (bitwarden/sdk-internal#517)

Author: bitwarden-devops-bot

Package.swift

@@ -30,7 +30,7 @@ let package = Package(
             dependencies: ["BitwardenSdk"]),
         .binaryTarget(
   name: "BitwardenFFI",
-  url: "https://github.com/bitwarden/sdk-swift/releases/download/v1.0.0-2878-8ef7951/BitwardenFFI-1.0.0-8ef7951.xcframework.zip",
-  checksum: "a79e664aeb61802e68290c0f599764bbf45305689682e078a198213f0166fbf7")
+  url: "https://github.com/bitwarden/sdk-swift/releases/download/v1.0.0-2892-21432b5/BitwardenFFI-1.0.0-21432b5.xcframework.zip",
+  checksum: "ce11a13ea9a8211ee2f332f684919d0827da542aadb9d9b4fecb5463a4b0b428")
     ]
 )

Sources/BitwardenSdk/BitwardenSDK.swift

@@ -8176,17 +8176,17 @@ private let initializationResult: InitializationResult = {
     uniffiCallbackInitFido2CredentialStore()
     uniffiCallbackInitFido2UserInterface()
     uniffiCallbackInitFolderRepository()
-    uniffiEnsureBitwardenCryptoInitialized()
     uniffiEnsureBitwardenCoreInitialized()
-    uniffiEnsureBitwardenCollectionsInitialized()
     uniffiEnsureBitwardenFidoInitialized()
+    uniffiEnsureBitwardenVaultInitialized()
     uniffiEnsureBitwardenExportersInitialized()
     uniffiEnsureBitwardenGeneratorsInitialized()
-    uniffiEnsureBitwardenVaultInitialized()
     uniffiEnsureBitwardenSshInitialized()
-    uniffiEnsureBitwardenStateInitialized()
-    uniffiEnsureBitwardenSendInitialized()
+    uniffiEnsureBitwardenCollectionsInitialized()
     uniffiEnsureBitwardenEncodingInitialized()
+    uniffiEnsureBitwardenSendInitialized()
+    uniffiEnsureBitwardenCryptoInitialized()
+    uniffiEnsureBitwardenStateInitialized()
     return InitializationResult.ok
 }()
 

Sources/BitwardenSdk/BitwardenSend.swift

@@ -2031,8 +2031,8 @@ private let initializationResult: InitializationResult = {
         return InitializationResult.contractVersionMismatch
     }
 
-    uniffiEnsureBitwardenCryptoInitialized()
     uniffiEnsureBitwardenCoreInitialized()
+    uniffiEnsureBitwardenCryptoInitialized()
     return InitializationResult.ok
 }()
 

Sources/BitwardenSdk/BitwardenVault.swift

@@ -1240,14 +1240,15 @@ public struct Cipher {
     public let deletedDate: DateTime?
     public let revisionDate: DateTime
     public let archivedDate: DateTime?
+    public let data: String?
 
     // Default memberwise initializers are never public by default, so we
     // declare one manually.
     public init(id: CipherId?, organizationId: OrganizationId?, folderId: FolderId?, collectionIds: [CollectionId], 
         /**
          * More recent ciphers uses individual encryption keys to encrypt the other fields of the
          * Cipher.
-         */key: EncString?, name: EncString, notes: EncString?, type: CipherType, login: Login?, identity: Identity?, card: Card?, secureNote: SecureNote?, sshKey: SshKey?, favorite: Bool, reprompt: CipherRepromptType, organizationUseTotp: Bool, edit: Bool, permissions: CipherPermissions?, viewPassword: Bool, localData: LocalData?, attachments: [Attachment]?, fields: [Field]?, passwordHistory: [PasswordHistory]?, creationDate: DateTime, deletedDate: DateTime?, revisionDate: DateTime, archivedDate: DateTime?) {
+         */key: EncString?, name: EncString, notes: EncString?, type: CipherType, login: Login?, identity: Identity?, card: Card?, secureNote: SecureNote?, sshKey: SshKey?, favorite: Bool, reprompt: CipherRepromptType, organizationUseTotp: Bool, edit: Bool, permissions: CipherPermissions?, viewPassword: Bool, localData: LocalData?, attachments: [Attachment]?, fields: [Field]?, passwordHistory: [PasswordHistory]?, creationDate: DateTime, deletedDate: DateTime?, revisionDate: DateTime, archivedDate: DateTime?, data: String?) {
         self.id = id
         self.organizationId = organizationId
         self.folderId = folderId
@@ -1275,6 +1276,7 @@ public struct Cipher {
         self.deletedDate = deletedDate
         self.revisionDate = revisionDate
         self.archivedDate = archivedDate
+        self.data = data
     }
 }
 
@@ -1369,6 +1371,9 @@ extension Cipher: Equatable, Hashable {
         if lhs.archivedDate != rhs.archivedDate {
             return false
         }
+        if lhs.data != rhs.data {
+            return false
+        }
         return true
     }
 
@@ -1400,6 +1405,7 @@ extension Cipher: Equatable, Hashable {
         hasher.combine(deletedDate)
         hasher.combine(revisionDate)
         hasher.combine(archivedDate)
+        hasher.combine(data)
     }
 }
 
@@ -1438,7 +1444,8 @@ public struct FfiConverterTypeCipher: FfiConverterRustBuffer {
                 creationDate: FfiConverterTypeDateTime.read(from: &buf), 
                 deletedDate: FfiConverterOptionTypeDateTime.read(from: &buf), 
                 revisionDate: FfiConverterTypeDateTime.read(from: &buf), 
-                archivedDate: FfiConverterOptionTypeDateTime.read(from: &buf)
+                archivedDate: FfiConverterOptionTypeDateTime.read(from: &buf), 
+                data: FfiConverterOptionString.read(from: &buf)
         )
     }
 
@@ -1470,6 +1477,7 @@ public struct FfiConverterTypeCipher: FfiConverterRustBuffer {
         FfiConverterOptionTypeDateTime.write(value.deletedDate, into: &buf)
         FfiConverterTypeDateTime.write(value.revisionDate, into: &buf)
         FfiConverterOptionTypeDateTime.write(value.archivedDate, into: &buf)
+        FfiConverterOptionString.write(value.data, into: &buf)
     }
 }
 
@@ -5565,6 +5573,10 @@ public enum CipherError: Swift.Error {
 
     case AttachmentsWithoutKeys(message: String)
 
+    case Chrono(message: String)
+    
+    case SerdeJson(message: String)
+    
 }
 
 
@@ -5597,6 +5609,14 @@ public struct FfiConverterTypeCipherError: FfiConverterRustBuffer {
             message: try FfiConverterString.read(from: &buf)
         )
 
+        case 5: return .Chrono(
+            message: try FfiConverterString.read(from: &buf)
+        )
+        
+        case 6: return .SerdeJson(
+            message: try FfiConverterString.read(from: &buf)
+        )
+        
 
         default: throw UniffiInternalError.unexpectedEnumCase
         }
@@ -5616,6 +5636,10 @@ public struct FfiConverterTypeCipherError: FfiConverterRustBuffer {
             writeInt(&buf, Int32(3))
         case .AttachmentsWithoutKeys(_ /* message is ignored*/):
             writeInt(&buf, Int32(4))
+        case .Chrono(_ /* message is ignored*/):
+            writeInt(&buf, Int32(5))
+        case .SerdeJson(_ /* message is ignored*/):
+            writeInt(&buf, Int32(6))
 
 
         }
@@ -9078,9 +9102,9 @@ private let initializationResult: InitializationResult = {
         return InitializationResult.contractVersionMismatch
     }
 
-    uniffiEnsureBitwardenCollectionsInitialized()
     uniffiEnsureBitwardenCoreInitialized()
     uniffiEnsureBitwardenCryptoInitialized()
+    uniffiEnsureBitwardenCollectionsInitialized()
     return InitializationResult.ok
 }()