Fix identifiers report function (#1739)

* group fix

* wip

* report members

* revert compose file

* cleanup

* lint

Author: codabrink

bindings_ffi/src/identity.rs

@@ -4,13 +4,13 @@ use xmtp_id::associations::{ident, Identifier};
 
 use crate::GenericError;
 
-#[derive(uniffi::Record, Hash, PartialEq, Eq, Clone)]
+#[derive(uniffi::Record, Hash, PartialEq, Eq, Clone, Debug)]
 pub struct FfiIdentifier {
     pub identifier: String,
     pub identifier_kind: FfiIdentifierKind,
 }
 
-#[derive(uniffi::Enum, Hash, PartialEq, Eq, Clone)]
+#[derive(uniffi::Enum, Hash, PartialEq, Eq, Clone, Debug)]
 pub enum FfiIdentifierKind {
     Ethereum,
     Passkey,

bindings_ffi/src/mls.rs

@@ -1491,7 +1491,7 @@ impl FfiConversationListItem {
     }
 }
 
-#[derive(uniffi::Record)]
+#[derive(uniffi::Record, Debug)]
 pub struct FfiUpdateGroupMembershipResult {
     added_members: HashMap<String, u64>,
     removed_members: Vec<String>,
@@ -3336,7 +3336,7 @@ mod tests {
             identifier_kind: FfiIdentifierKind::Passkey,
         };
         let inbox_id = ident.inbox_id(nonce).unwrap();
-        let client = create_client(
+        let client2 = create_client(
             connect_to_backend(xmtp_api_grpc::LOCALHOST_ADDRESS.to_string(), false)
                 .await
                 .unwrap(),
@@ -3351,7 +3351,7 @@ mod tests {
         .await
         .unwrap();
 
-        let sig_request = client.signature_request().unwrap().clone();
+        let sig_request = client2.signature_request().unwrap().clone();
         let challenge = sig_request.signature_text().await.unwrap();
         let challenge_bytes = challenge.as_bytes().to_vec();
 
@@ -3387,7 +3387,29 @@ mod tests {
             // should be good
             .unwrap();
 
-        client.register_identity(sig_request).await.unwrap();
+        client2.register_identity(sig_request).await.unwrap();
+
+        let bob = new_test_client().await;
+        let fernando = new_test_client().await;
+        let group = client2
+            .conversations()
+            .create_group_with_inbox_ids(vec![bob.inbox_id()], FfiCreateGroupOptions::default())
+            .await
+            .unwrap();
+
+        let result = group
+            .add_members_by_inbox_id(vec![fernando.inbox_id(), alex.inbox_id()])
+            .await
+            .unwrap();
+
+        assert_eq!(result.added_members.len(), 2);
+
+        let members = group.list_members().await.unwrap();
+        let passkey_ident = client2.account_identifier.identifier.clone();
+        assert!(members.into_iter().any(|m| m
+            .account_identifiers
+            .into_iter()
+            .any(|i| i.identifier == passkey_ident)));
     }
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 1)]

xmtp_id/src/associations/state.rs

@@ -139,8 +139,9 @@ impl AssociationState {
     }
 
     pub fn identifiers(&self) -> Vec<Identifier> {
-        self.members_by_kind(MemberKind::Ethereum)
-            .into_iter()
+        self.members
+            .values()
+            .cloned()
             .filter_map(|member| match member.identifier {
                 MemberIdentifier::Ethereum(eth) => Some(Identifier::Ethereum(eth)),
                 MemberIdentifier::Passkey(pk) => Some(Identifier::Passkey(pk)),