Rename Mandatory Emails Flag

.github/workflows/rust.yml

@@ -87,8 +87,7 @@ jobs:
 
       - name: Install wasm-pack
         run: |
-          cd scripts
-          bash install-wasm-pack.sh
+          cargo install wasm-pack --version 0.14.0
 
       - name: Build WASM version
         run: |

.github/workflows/wasm_release.yml

@@ -73,8 +73,7 @@ jobs:
 
       - name: Install wasm-pack
         run: |
-          cd scripts
-          bash install-wasm-pack.sh
+          cargo install wasm-pack --version 0.14.0
 
       - name: Build with wasm-pack
         env:

CHANGELOG.md

@@ -1,6 +1,7 @@
 # 0.5.10
 
 * Fix company creation with identity upload and missing nostr node id during block propagation
+* rename `disable_mandatory_email_confirmations` to `mandatory_email_confirmations` with default = `true` (breaking CONFIG change)
 
 # 0.5.9
 

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

@@ -73,12 +73,12 @@ pub struct CourtConfig {
 }
 
 /// Developer Mode specific configuration
-#[derive(Debug, Clone, Default)]
+#[derive(Debug, Clone)]
 pub struct DevModeConfig {
     /// Whether dev mode is on
     pub on: bool,
     /// Whether mandatory email confirmations should be enabled (disable for easier testing)
-    pub disable_mandatory_email_confirmations: bool,
+    pub mandatory_email_confirmations: bool,
 }
 
 /// Payment specific configuration

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

@@ -173,10 +173,7 @@ impl BillService {
                     .iter()
                     .find(|ec| {
                         &ec.0.witness
-                            == if get_config()
-                                .dev_mode_config
-                                .disable_mandatory_email_confirmations
-                            {
+                            == if !get_config().dev_mode_config.mandatory_email_confirmations {
                                 &identified.node_id
                             } else {
                                 witness
@@ -190,10 +187,7 @@ impl BillService {
                     .iter()
                     .find(|ec| {
                         &ec.0.witness
-                            == if get_config()
-                                .dev_mode_config
-                                .disable_mandatory_email_confirmations
-                            {
+                            == if !get_config().dev_mode_config.mandatory_email_confirmations {
                                 &signatory_identity.identity.node_id
                             } else {
                                 witness

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

@@ -370,10 +370,7 @@ impl CompanyService {
         company_id: &NodeId,
         email: &Email,
     ) -> Result<(SignedIdentityProof, EmailIdentityProofData)> {
-        if !get_config()
-            .dev_mode_config
-            .disable_mandatory_email_confirmations
-        {
+        if get_config().dev_mode_config.mandatory_email_confirmations {
             // Make sure there is a confirmed email
             let email_confirmations = self.store.get_email_confirmations(company_id).await?;
             if email_confirmations.is_empty() {

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

@@ -311,10 +311,7 @@ impl IdentityService {
                     return Err(ProtocolValidationError::FieldEmpty(Field::Email).into());
                 };
 
-                if !get_config()
-                    .dev_mode_config
-                    .disable_mandatory_email_confirmations
-                {
+                if get_config().dev_mode_config.mandatory_email_confirmations {
                     // Make sure there is a confirmed email
                     let email_confirmations = self.store.get_email_confirmations().await?;
                     if email_confirmations.is_empty() {

crates/bcr-ebill-api/src/tests/mod.rs

@@ -558,7 +558,7 @@ pub mod tests {
                     },
                     dev_mode_config: DevModeConfig {
                         on: false,
-                        disable_mandatory_email_confirmations: false,
+                        mandatory_email_confirmations: true,
                     },
                     court_config: CourtConfig {
                         default_url: url::Url::parse("https://court-dev.minibill.tech").unwrap(),

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

@@ -150,7 +150,7 @@ pub fn init_test_cfg() {
                 },
                 dev_mode_config: DevModeConfig {
                     on: false,
-                    disable_mandatory_email_confirmations: false,
+                    mandatory_email_confirmations: true,
                 },
                 court_config: CourtConfig {
                     default_url: url::Url::parse("https://court-dev.minibill.tech").unwrap(),

crates/bcr-ebill-wasm/main.js

@@ -136,7 +136,7 @@ let config = {
   default_mint_node_id: "bitcrt020e50d48b6b2897743ca257c82684e984509c05c9bf812176c717005698e57023", //wildcat0 clowder-dev
   num_confirmations_for_payment: 1,
   dev_mode: true,
-  disable_mandatory_email_confirmations: true,
+  mandatory_email_confirmations: false,
   // default_court_url: "http://localhost:8000",
   default_court_url: "https://bcr-court-dev.minibill.tech"
 };

crates/bcr-ebill-wasm/src/lib.rs

@@ -74,7 +74,7 @@ pub struct Config {
     pub default_mint_node_id: String,
     pub num_confirmations_for_payment: usize,
     pub dev_mode: bool,
-    pub disable_mandatory_email_confirmations: bool,
+    pub mandatory_email_confirmations: bool,
     pub default_court_url: String,
 }
 
@@ -238,7 +238,7 @@ pub async fn initialize_api(
         },
         dev_mode_config: DevModeConfig {
             on: config.dev_mode,
-            disable_mandatory_email_confirmations: config.disable_mandatory_email_confirmations,
+            mandatory_email_confirmations: config.mandatory_email_confirmations,
         },
         court_config: CourtConfig {
             default_url: url::Url::parse(&config.default_court_url)