Skip to content
Merged
Changes from all commits
Commits
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
45 changes: 29 additions & 16 deletions crates/bitwarden-exporters/src/cxf/identity.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use credential_exchange_format::{
AddressCredential, Credential, CustomFieldsCredential, DriversLicenseCredential, EditableField,
EditableFieldString, IdentityDocumentCredential, PassportCredential, PersonNameCredential,
EditableFieldString, EditableFieldValue, IdentityDocumentCredential, PassportCredential,
PersonNameCredential,
};

use crate::{cxf::editable_field::create_field, Field, Identity};
Expand Down Expand Up @@ -421,18 +422,22 @@ impl From<Identity> for Vec<Credential> {
}

// Handle unmapped Identity fields as custom fields
let custom_fields: Vec<EditableField<EditableFieldString>> = [
identity.email.as_ref().map(|email| EditableField {
id: None,
label: Some("Email".to_string()),
value: EditableFieldString(email.clone()),
extensions: None,
let custom_fields: Vec<EditableFieldValue> = [
identity.email.as_ref().map(|email| {
EditableFieldValue::String(EditableField {
id: None,
label: Some("Email".to_string()),
value: EditableFieldString(email.clone()),
extensions: None,
})
}),
identity.username.as_ref().map(|username| EditableField {
id: None,
label: Some("Username".to_string()),
value: EditableFieldString(username.clone()),
extensions: None,
identity.username.as_ref().map(|username| {
EditableFieldValue::String(EditableField {
id: None,
label: Some("Username".to_string()),
value: EditableFieldString(username.clone()),
extensions: None,
})
}),
]
.into_iter()
Expand Down Expand Up @@ -752,13 +757,21 @@ mod tests {

// Check email field
let email_field = &custom_fields.fields[0];
assert_eq!(email_field.label.as_ref().unwrap(), "Email");
assert_eq!(email_field.value.0, "john@example.com");
if let EditableFieldValue::String(email_field) = email_field {
assert_eq!(email_field.label.as_ref().unwrap(), "Email");
assert_eq!(email_field.value.0, "john@example.com");
} else {
panic!("Expected email field to be of type String");
}

// Check username field
let username_field = &custom_fields.fields[1];
assert_eq!(username_field.label.as_ref().unwrap(), "Username");
assert_eq!(username_field.value.0, "johndoe");
if let EditableFieldValue::String(username_field) = username_field {
assert_eq!(username_field.label.as_ref().unwrap(), "Username");
assert_eq!(username_field.value.0, "johndoe");
} else {
panic!("Expected username field to be of type String");
}
} else {
panic!("Expected CustomFields credential");
}
Expand Down
Loading