feat!: [#591] rename enum variant EmailOnSignup::None to Ignored

josecelano · josecelano · commit 82fc32cd9f31 · 2024-06-12T17:49:20.000+01:00
diff --git a/src/config/v1/auth.rs b/src/config/v1/auth.rs
@@ -58,7 +58,7 @@ pub enum EmailOnSignup {
     /// The email is optional on signup.
     Optional,
     /// The email is not allowed on signup. It will only be ignored if provided.
-    None, // code-review: rename to `Ignored`?
+    Ignored,
 }
 
 impl Default for EmailOnSignup {
@@ -72,7 +72,7 @@ impl fmt::Display for EmailOnSignup {
         let display_str = match self {
             EmailOnSignup::Required => "required",
             EmailOnSignup::Optional => "optional",
-            EmailOnSignup::None => "none",
+            EmailOnSignup::Ignored => "ignored",
         };
         write!(f, "{display_str}")
     }
@@ -85,8 +85,10 @@ impl FromStr for EmailOnSignup {
         match s.to_lowercase().as_str() {
             "required" => Ok(EmailOnSignup::Required),
             "optional" => Ok(EmailOnSignup::Optional),
-            "none" => Ok(EmailOnSignup::None),
-            _ => Err(format!("Unknown config 'email_on_signup' option (required, optional, none): {s}")),
+            "none" => Ok(EmailOnSignup::Ignored),
+            _ => Err(format!(
+                "Unknown config 'email_on_signup' option (required, optional, ignored): {s}"
+            )),
         }
     }
 }
diff --git a/src/services/user.rs b/src/services/user.rs
@@ -86,7 +86,7 @@ impl RegistrationService {
                 }
                 registration_form.email.clone()
             }
-            EmailOnSignup::None => None,
+            EmailOnSignup::Ignored => None,
             EmailOnSignup::Optional => registration_form.email.clone(),
         };
 

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ pub enum EmailOnSignup {`
`58`	`58`	`/// The email is optional on signup.`
`59`	`59`	`Optional,`
`60`	`60`	`/// The email is not allowed on signup. It will only be ignored if provided.`
`61`		- None, // code-review: rename to `Ignored`?
	`61`	`+ Ignored,`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`impl Default for EmailOnSignup {`
`@@ -72,7 +72,7 @@ impl fmt::Display for EmailOnSignup {`
`72`	`72`	`let display_str = match self {`
`73`	`73`	`EmailOnSignup::Required => "required",`
`74`	`74`	`EmailOnSignup::Optional => "optional",`
`75`		`- EmailOnSignup::None => "none",`
	`75`	`+ EmailOnSignup::Ignored => "ignored",`
`76`	`76`	`};`
`77`	`77`	`write!(f, "{display_str}")`
`78`	`78`	`}`
`@@ -85,8 +85,10 @@ impl FromStr for EmailOnSignup {`
`85`	`85`	`match s.to_lowercase().as_str() {`
`86`	`86`	`"required" => Ok(EmailOnSignup::Required),`
`87`	`87`	`"optional" => Ok(EmailOnSignup::Optional),`
`88`		`- "none" => Ok(EmailOnSignup::None),`
`89`		`- _ => Err(format!("Unknown config 'email_on_signup' option (required, optional, none): {s}")),`
	`88`	`+ "none" => Ok(EmailOnSignup::Ignored),`
	`89`	`+ _ => Err(format!(`
	`90`	`+ "Unknown config 'email_on_signup' option (required, optional, ignored): {s}"`
	`91`	`+ )),`
`90`	`92`	`}`
`91`	`93`	`}`
`92`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ impl RegistrationService {`
`86`	`86`	`}`
`87`	`87`	`registration_form.email.clone()`
`88`	`88`	`}`
`89`		`- EmailOnSignup::None => None,`
	`89`	`+ EmailOnSignup::Ignored => None,`
`90`	`90`	`EmailOnSignup::Optional => registration_form.email.clone(),`
`91`	`91`	`};`
`92`	`92`