Minor contact fallback fixes (#669)

Author: tompro

crates/bcr-ebill-api/src/constants.rs

@@ -6,5 +6,5 @@ pub const MAX_FILE_NAME_CHARACTERS: usize = 200;
 pub const VALID_FILE_MIME_TYPES: [&str; 3] = ["image/jpeg", "image/png", "application/pdf"];
 
 // When subscribing events we subtract this from the last received event time
-pub const NOSTR_EVENT_TIME_SLACK: u64 = 3600 * 24; // 1 day
+pub const NOSTR_EVENT_TIME_SLACK: u64 = 3600 * 24 * 7; // 1 week
 pub use bcr_ebill_core::constants::CURRENCY_SAT;

crates/bcr-ebill-api/src/service/company_service.rs

@@ -300,7 +300,8 @@ impl CompanyServiceApi for CompanyService {
                 .iter()
                 .any(|c| c.node_id == identity.node_id)
         {
-            signatory_contacts.push(identity.as_contact());
+            // we force person for this as it will be thrown out in later validation
+            signatory_contacts.push(identity.as_contact(Some(ContactType::Person)));
         }
 
         // if we are still missing some signatory details try to fill them from nostr contacts
@@ -317,7 +318,7 @@ impl CompanyServiceApi for CompanyService {
                 .by_node_ids(missing)
                 .await?
                 .into_iter()
-                .filter_map(|c| c.into_contact())
+                .filter_map(|c| c.into_contact(Some(ContactType::Person)))
                 .collect();
 
             signatory_contacts.extend(nostr_contacts);

crates/bcr-ebill-api/src/service/contact_service.rs

@@ -254,7 +254,7 @@ impl ContactServiceApi for ContactService {
                 .filter_map(|c| {
                     // only return nostr  contacts that are not in contacts and have a name
                     if !lookup.contains(&c.node_id) {
-                        c.into_contact()
+                        c.into_contact(None)
                     } else {
                         None
                     }

crates/bcr-ebill-api/src/service/identity_service.rs

@@ -202,11 +202,10 @@ impl IdentityService {
     }
 
     async fn on_identity_contact_change(&self, identity: &Identity, keys: &BcrKeys) -> Result<()> {
-        debug!("Company change, publishing our company contact to nostr profile");
+        debug!("Identity change, publishing our identity contact to nostr profile");
         let bcr_data = get_bcr_data(identity, keys)?;
         let contact_data =
             NostrContactData::new(&identity.name, identity.nostr_relays.clone(), bcr_data);
-        debug!("Publishing company contact data: {contact_data:?}");
         self.notification_service
             .publish_contact(&identity.node_id, &contact_data)
             .await?;
@@ -217,7 +216,8 @@ impl IdentityService {
 /// Derives a child key, encrypts the contact data with it and returns the bcr metadata
 fn get_bcr_data(identity: &Identity, keys: &BcrKeys) -> Result<BcrMetadata> {
     let derived_keys = keys.derive_keypair()?;
-    let contact = identity.as_contact();
+    let contact = identity.as_contact(None);
+    debug!("Publishing identity contact data: {contact:?}");
     let payload = serde_json::to_string(&contact)?;
     let encrypted = base58_encode(&util::crypto::encrypt_ecies(
         payload.as_bytes(),

crates/bcr-ebill-core/src/identity/mod.rs

@@ -136,11 +136,11 @@ impl Identity {
         }
     }
 
-    pub fn as_contact(&self) -> Contact {
-        let contact_type = match self.t {
+    pub fn as_contact(&self, t: Option<ContactType>) -> Contact {
+        let contact_type = t.unwrap_or(match self.t {
             IdentityType::Ident => ContactType::Person,
             IdentityType::Anon => ContactType::Anon,
-        };
+        });
         Contact {
             t: contact_type,
             node_id: self.node_id.clone(),

crates/bcr-ebill-core/src/nostr_contact.rs

@@ -67,11 +67,11 @@ impl NostrContact {
     }
 
     /// Returns a lightweight version of the contact if all required data is present.
-    pub fn into_contact(self) -> Option<Contact> {
+    pub fn into_contact(self, t: Option<ContactType>) -> Option<Contact> {
         if self.name.is_some() {
             Some(Contact {
                 node_id: self.node_id,
-                t: ContactType::Anon,
+                t: t.unwrap_or(ContactType::Anon),
                 name: self.name.unwrap(),
                 email: None,
                 postal_address: None,

crates/bcr-ebill-transport/src/handler/company_chain_event_processor.rs

@@ -165,6 +165,13 @@ impl CompanyChainEventProcessor {
             self.nostr_contact_processor
                 .ensure_nostr_contact(&company_id)
                 .await;
+
+            // as well as all the company signatories
+            for signatory in company.signatories.iter() {
+                self.nostr_contact_processor
+                    .ensure_nostr_contact(signatory)
+                    .await;
+            }
         } else {
             info!("We are not a signatory for company {company_id} so skipping chain");
         }
@@ -588,7 +595,7 @@ pub mod tests {
             .expect_ensure_nostr_contact()
             .with(eq(node_id.clone()))
             .returning(|_| ())
-            .once();
+            .times(2);
 
         let handler = CompanyChainEventProcessor::new(
             Arc::new(chain_store),

crates/bcr-ebill-wasm/main.js

@@ -339,8 +339,10 @@ async function listCompanies() {
 }
 
 async function listSignatories() {
-  let signatories = await companyApi.list_signatories(document.getElementById("company_update_id").value);
-  console.log("signatories:", signatories);
+  let measured = measure(async () => {
+    return await companyApi.list_signatories(document.getElementById("company_update_id").value);
+  });
+  await measured();
 }
 
 async function triggerContact() {

crates/bcr-ebill-wasm/src/data/company.rs

@@ -115,8 +115,9 @@ pub struct SignatoryResponse {
     #[tsify(type = "string")]
     pub node_id: NodeId,
     pub name: String,
-    pub postal_address: PostalAddressWeb,
+    pub postal_address: Option<PostalAddressWeb>,
     pub avatar_file: Option<FileWeb>,
+    pub is_logical: bool,
 }
 
 impl TryFrom<Contact> for SignatoryResponse {
@@ -130,11 +131,9 @@ impl TryFrom<Contact> for SignatoryResponse {
             t: value.t.into(),
             node_id: value.node_id.clone(),
             name: value.name,
-            postal_address: value
-                .postal_address
-                .ok_or(ValidationError::InvalidContact(value.node_id.to_string()))
-                .map(|pa| pa.into())?,
+            postal_address: value.postal_address.map(|pa| pa.into()),
             avatar_file: value.avatar_file.map(|f| f.into()),
+            is_logical: value.is_logical,
         })
     }
 }