From 35528b4c0b711b104f2b3757ceadbd875e904fe1 Mon Sep 17 00:00:00 2001
From: Jose Celano <josecelano@gmail.com>
Date: Thu, 11 Jul 2024 15:44:20 +0100
Subject: [PATCH] feat: [#674] rename email config option

From:

```toml
[registration]

[registration.email]
required = true
verified = true
```

To:

```toml
[registration]

[registration.email]
required = true
verification_required = true
```
---
 src/config/v2/registration.rs         | 4 ++--
 src/services/authentication.rs        | 2 +-
 src/services/user.rs                  | 2 +-
 tests/common/contexts/settings/mod.rs | 4 ++--
 tests/environments/isolated.rs        | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/config/v2/registration.rs b/src/config/v2/registration.rs
index 5052fb75..fa1fac07 100644
--- a/src/config/v2/registration.rs
+++ b/src/config/v2/registration.rs
@@ -31,14 +31,14 @@ pub struct Email {
 
     /// Whether or not email is verified.
     #[serde(default = "Email::default_verified")]
-    pub verified: bool,
+    pub verification_required: bool,
 }
 
 impl Default for Email {
     fn default() -> Self {
         Self {
             required: Self::default_required(),
-            verified: Self::default_verified(),
+            verification_required: Self::default_verified(),
         }
     }
 }
diff --git a/src/services/authentication.rs b/src/services/authentication.rs
index f347a857..3c4ecbd1 100644
--- a/src/services/authentication.rs
+++ b/src/services/authentication.rs
@@ -72,7 +72,7 @@ impl Service {
         // Fail login if email verification is required and this email is not verified
         if let Some(registration) = &settings.registration {
             if let Some(email) = &registration.email {
-                if email.verified && !user_profile.email_verified {
+                if email.verification_required && !user_profile.email_verified {
                     return Err(ServiceError::EmailNotVerified);
                 }
             }
diff --git a/src/services/user.rs b/src/services/user.rs
index 63560642..cbb83ca8 100644
--- a/src/services/user.rs
+++ b/src/services/user.rs
@@ -136,7 +136,7 @@ impl RegistrationService {
 
                 match &registration.email {
                     Some(email) => {
-                        if email.verified {
+                        if email.verification_required {
                             // Email verification is enabled
                             if let Some(email) = opt_email {
                                 let mail_res = self
diff --git a/tests/common/contexts/settings/mod.rs b/tests/common/contexts/settings/mod.rs
index baa17610..636599bf 100644
--- a/tests/common/contexts/settings/mod.rs
+++ b/tests/common/contexts/settings/mod.rs
@@ -113,7 +113,7 @@ pub struct Registration {
 #[derive(Deserialize, Serialize, PartialEq, Debug, Clone)]
 pub struct Email {
     pub required: bool,
-    pub verified: bool,
+    pub verification_required: bool,
 }
 
 #[derive(Deserialize, Serialize, PartialEq, Debug, Clone)]
@@ -264,7 +264,7 @@ impl From<DomainEmail> for Email {
     fn from(email: DomainEmail) -> Self {
         Self {
             required: email.required,
-            verified: email.verified,
+            verification_required: email.verification_required,
         }
     }
 }
diff --git a/tests/environments/isolated.rs b/tests/environments/isolated.rs
index 12c04803..fb25f0cf 100644
--- a/tests/environments/isolated.rs
+++ b/tests/environments/isolated.rs
@@ -92,7 +92,7 @@ fn ephemeral(temp_dir: &TempDir) -> config::Settings {
     configuration.registration = Some(Registration {
         email: Some(Email {
             required: false,
-            verified: false,
+            verification_required: false,
         }),
     });