Remove email for anon identity and contact (#733)

Author: zupzup

CHANGELOG.md

@@ -12,6 +12,7 @@
 * Remove file-based `FileUpload` - we use surreal/nostr-based everywhere
 * Refactoring & Restructuring, removing cross-crate exports (breaking for Library dependents)
 * Properly separate `protocol` parts from `application` in `bcr-ebill-core` (breaking for Library dependents, breaking DB change)
+* Remove email from anon identities and contacts
 
 # 0.4.12
 

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

@@ -153,12 +153,11 @@ impl BillService {
                 .await,
             ),
             BillParticipantBlockData::Anon(data) => {
-                let (email, nostr_relays) = self
+                let (_, nostr_relays) = self
                     .get_email_and_nostr_relay(&data.node_id, ContactType::Anon, identity, contacts)
                     .await;
                 BillParticipant::Anon(BillAnonParticipant {
                     node_id: data.node_id,
-                    email,
                     nostr_relays,
                 })
             }
@@ -685,7 +684,6 @@ impl BillService {
         };
         BillParticipant::Anon(BillAnonParticipant {
             node_id: mint_node_id.to_owned(),
-            email: None,
             nostr_relays: relays,
         })
     }

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

@@ -337,10 +337,8 @@ impl ContactServiceApi for ContactService {
 
         let identity = self.identity_store.get_full().await?;
 
-        // for anonymous contact, we only consider email and name
-        if contact.t == ContactType::Anon {
-            util::update_optional_field(&mut contact.email, &email, &mut changed);
-        } else {
+        // for anonymous contact, we only consider name
+        if contact.t != ContactType::Anon {
             if let Some(ref email_to_set) = email {
                 contact.email = Some(email_to_set.clone());
                 changed = true;
@@ -533,7 +531,7 @@ impl ContactServiceApi for ContactService {
                     node_id: node_id.clone(),
                     t: t.clone(),
                     name,
-                    email,
+                    email: None,
                     postal_address: None,
                     date_of_birth_or_registration: None,
                     country_of_birth_or_registration: None,
@@ -1146,6 +1144,8 @@ pub mod tests {
         )
         .await;
         assert!(result.is_ok());
+        // email is not set, even if it's provided
+        assert!(result.as_ref().unwrap().email.is_none());
     }
 
     #[tokio::test]

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

@@ -278,10 +278,8 @@ impl IdentityServiceApi for IdentityService {
             changed = true;
         }
 
-        // for anonymous identity, we only consider email and name
-        if identity.t == IdentityType::Anon {
-            util::update_optional_field(&mut identity.email, &email, &mut changed);
-        } else {
+        // for anonymous identity, we only consider name
+        if identity.t == IdentityType::Ident {
             if let Some(ref email_to_set) = email
                 && identity.email.as_ref() != Some(email_to_set)
             {
@@ -488,7 +486,7 @@ impl IdentityServiceApi for IdentityService {
                 t: t.clone(),
                 node_id: node_id.clone(),
                 name,
-                email,
+                email: None,
                 postal_address: OptionalPostalAddress::empty(),
                 date_of_birth: None,
                 country_of_birth: None,

crates/bcr-ebill-core/src/application/contact/mod.rs

@@ -189,7 +189,6 @@ impl TryFrom<Contact> for BillParticipant {
             }
             ContactType::Anon => Ok(BillParticipant::Anon(BillAnonParticipant {
                 node_id: value.node_id.clone(),
-                email: value.email,
                 nostr_relays: value.nostr_relays,
             })),
         }
@@ -232,7 +231,6 @@ impl BillAnonParticipant {
     pub fn new(identity: Identity) -> Self {
         Self {
             node_id: identity.node_id,
-            email: identity.email,
             nostr_relays: identity.nostr_relays,
         }
     }

crates/bcr-ebill-core/src/protocol/blockchain/bill/participant.rs

@@ -39,7 +39,7 @@ impl BillParticipant {
     pub fn email(&self) -> Option<Email> {
         match self {
             BillParticipant::Ident(data) => data.email.to_owned(),
-            BillParticipant::Anon(data) => data.email.to_owned(),
+            BillParticipant::Anon(_) => None,
         }
     }
 
@@ -66,8 +66,6 @@ impl BillParticipant {
 pub struct BillAnonParticipant {
     /// The node id of the participant
     pub node_id: NodeId,
-    /// email address of the participant
-    pub email: Option<Email>,
     /// The preferred Nostr relay to deliver Nostr messages to
     pub nostr_relays: Vec<url::Url>,
 }
@@ -76,7 +74,6 @@ impl From<BillIdentParticipant> for BillAnonParticipant {
     fn from(value: BillIdentParticipant) -> Self {
         Self {
             node_id: value.node_id,
-            email: value.email,
             nostr_relays: value.nostr_relays,
         }
     }
@@ -170,7 +167,6 @@ impl From<BillParticipantBlockData> for BillParticipant {
             }),
             BillParticipantBlockData::Anon(data) => Self::Anon(BillAnonParticipant {
                 node_id: data.node_id,
-                email: None,
                 nostr_relays: vec![],
             }),
         }

crates/bcr-ebill-persistence/src/db/bill.rs

@@ -1149,7 +1149,6 @@ impl From<BillAnonParticipantDb> for BillAnonParticipant {
     fn from(value: BillAnonParticipantDb) -> Self {
         Self {
             node_id: value.node_id,
-            email: None,
             nostr_relays: vec![],
         }
     }

crates/bcr-ebill-transport/src/nostr_transport.rs

@@ -121,7 +121,6 @@ impl NostrTransportService {
                     // we have no contact but a nostr contact of a participant
                     Some(BillParticipant::Anon(BillAnonParticipant {
                         node_id: node_id.to_owned(),
-                        email: None,
                         nostr_relays: nostr.relays,
                     }))
                 } else {
@@ -216,7 +215,6 @@ impl NostrTransportService {
         if let Some(transport) = self.get_node_transport(sender).await {
             let recipient = BillParticipant::Anon(BillAnonParticipant {
                 node_id: recipient.to_owned(),
-                email: None,
                 nostr_relays: relays.to_vec(),
             });
             transport.send_private_event(&recipient, message).await?;

crates/bcr-ebill-wasm/main.js

@@ -133,7 +133,6 @@ async function start(create_identity) {
       fail_on_error(await identityApi.create({
         t: 1,
         name: "Cypherpunk",
-        email: "[email protected]",
         postal_address: {},
       }));
 

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

@@ -963,8 +963,6 @@ impl From<BillParticipant> for BillParticipantWeb {
 pub struct BillAnonParticipantWeb {
     #[tsify(type = "string")]
     pub node_id: NodeId,
-    #[tsify(type = "string | undefined")]
-    pub email: Option<Email>,
     #[tsify(type = "string[]")]
     pub nostr_relays: Vec<url::Url>,
 }
@@ -973,7 +971,6 @@ impl From<BillAnonParticipant> for BillAnonParticipantWeb {
     fn from(val: BillAnonParticipant) -> Self {
         BillAnonParticipantWeb {
             node_id: val.node_id,
-            email: val.email,
             nostr_relays: val.nostr_relays,
         }
     }