node relying partner

Author: codabrink

bindings_node/src/consent_state.rs

@@ -155,7 +155,7 @@ impl Client {
           return Err(ErrorWrapper::from(MissingRequired::IdentifierKind))?;
         };
         let ident = match kind {
-          ConsentIdentityKind::Passkey => PublicIdentifier::passkey_str(&entity),
+          ConsentIdentityKind::Passkey => PublicIdentifier::passkey_str(&entity, None),
           ConsentIdentityKind::Ethereum => PublicIdentifier::eth(&entity),
         }
         .map_err(ErrorWrapper::from)?;

bindings_node/src/identity.rs

@@ -8,6 +8,7 @@ use xmtp_id::associations::{ident, PublicIdentifier as XMTPPublicIdentifier};
 pub struct PublicIdentifier {
   pub identifier: String,
   pub identifier_kind: PublicIdentifierKind,
+  pub relying_partner: Option<String>,
 }
 
 #[napi]
@@ -26,6 +27,7 @@ pub enum PublicIdentifierKind {
 pub struct RootIdentifier {
   pub identifier: String,
   pub identifier_kind: RootIdentifierKind,
+  pub relying_partner: Option<String>,
 }
 #[napi]
 pub enum RootIdentifierKind {
@@ -44,6 +46,7 @@ impl From<RootIdentifier> for PublicIdentifier {
     Self {
       identifier: ident.identifier,
       identifier_kind: ident.identifier_kind.into(),
+      relying_partner: ident.relying_partner,
     }
   }
 }
@@ -52,6 +55,7 @@ impl From<PublicIdentifier> for RootIdentifier {
     Self {
       identifier: ident.identifier,
       identifier_kind: ident.identifier_kind.into(),
+      relying_partner: ident.relying_partner,
     }
   }
 }
@@ -79,10 +83,15 @@ impl From<XMTPPublicIdentifier> for PublicIdentifier {
       XMTPPublicIdentifier::Ethereum(ident::Ethereum(addr)) => Self {
         identifier: addr,
         identifier_kind: PublicIdentifierKind::Ethereum,
+        relying_partner: None,
       },
-      XMTPPublicIdentifier::Passkey(ident::Passkey(key)) => Self {
+      XMTPPublicIdentifier::Passkey(ident::Passkey {
+        key,
+        relying_partner,
+      }) => Self {
         identifier: hex::encode(key),
         identifier_kind: PublicIdentifierKind::Passkey,
+        relying_partner,
       },
     }
   }
@@ -93,7 +102,7 @@ impl TryFrom<PublicIdentifier> for XMTPPublicIdentifier {
   fn try_from(ident: PublicIdentifier) -> Result<Self, Self::Error> {
     let ident = match ident.identifier_kind {
       PublicIdentifierKind::Ethereum => Self::eth(ident.identifier)?,
-      PublicIdentifierKind::Passkey => Self::passkey_str(&ident.identifier)?,
+      PublicIdentifierKind::Passkey => Self::passkey_str(&ident.identifier, ident.relying_partner)?,
     };
     Ok(ident)
   }

xmtp_id/src/associations/member.rs

@@ -127,12 +127,12 @@ impl PublicIdentifier {
     }
 
     pub fn passkey_str(
-        key: impl AsRef<str>,
-        relying_partner: Option<impl ToString>,
+        key: &str,
+        relying_partner: Option<String>,
     ) -> Result<Self, IdentifierValidationError> {
         Ok(Self::Passkey(ident::Passkey {
-            key: hex::decode(key.as_ref())?,
-            relying_partner: relying_partner.map(|rp| rp.to_string()),
+            key: hex::decode(key)?,
+            relying_partner: relying_partner,
         }))
     }