rename Login:EMAIL to Login::Email + remove use of email prefix

Author: mcalinghee

crates/data-model/Cargo.toml

@@ -24,9 +24,9 @@ rand.workspace = true
 regex = "1.11.1"
 woothee = "0.13.0"
 ruma-common.workspace = true
+lettre.workspace = true
 
 mas-iana.workspace = true
 mas-jose.workspace = true
 oauth2-types.workspace = true
-# Emails
-lettre.workspace = true
+

crates/data-model/src/oauth2/authorization_grant.rs

@@ -144,7 +144,7 @@ impl AuthorizationGrantStage {
 
 pub enum LoginHint<'a> {
     MXID(&'a UserId),
-    EMAIL(lettre::Address),
+    Email(lettre::Address),
     None,
 }
 
@@ -183,6 +183,15 @@ impl AuthorizationGrant {
 
         // Return none if the format is incorrect
         let Some((prefix, value)) = login_hint.split_once(':') else {
+            // If email supports for login_hint supports is enabled
+            if login_with_email_allowed {
+                // Validate the email
+                let Ok(address) = lettre::Address::from_str(login_hint) else {
+                    return LoginHint::None;
+                };
+                return LoginHint::Email(address);
+            }
+            // Unknown hint type, treat as none
             return LoginHint::None;
         };
 
@@ -200,16 +209,6 @@ impl AuthorizationGrant {
 
                 LoginHint::MXID(mxid)
             }
-            "email" => {
-                if !login_with_email_allowed {
-                    return LoginHint::None;
-                }
-                // Validate the email
-                let Ok(address) = lettre::Address::from_str(value) else {
-                    return LoginHint::None;
-                };
-                LoginHint::EMAIL(address)
-            }
             // Unknown hint type, treat as none
             _ => LoginHint::None,
         }
@@ -333,13 +332,13 @@ mod tests {
         let now = Utc::now();
 
         let grant = AuthorizationGrant {
-            login_hint: Some(String::from("email:example@user")),
+            login_hint: Some(String::from("example@user")),
             ..AuthorizationGrant::sample(now, &mut rng)
         };
 
         let hint = grant.parse_login_hint("example.com", true);
 
-        assert!(matches!(hint, LoginHint::EMAIL(email) if email.to_string() == "example@user"));
+        assert!(matches!(hint, LoginHint::Email(email) if email.to_string() == "example@user"));
     }
 
     #[test]
@@ -351,7 +350,7 @@ mod tests {
         let now = Utc::now();
 
         let grant = AuthorizationGrant {
-            login_hint: Some(String::from("email:example@user")),
+            login_hint: Some(String::from("example@user")),
             ..AuthorizationGrant::sample(now, &mut rng)
         };
 

crates/handlers/src/views/login.rs

@@ -385,7 +385,7 @@ fn handle_login_hint(
             site_config.login_with_email_allowed,
         ) {
             LoginHint::MXID(mxid) => Some(mxid.localpart().to_owned()),
-            LoginHint::EMAIL(email) => Some(email.to_string()),
+            LoginHint::Email(email) => Some(email.to_string()),
             LoginHint::None => None,
         };
         form_state.set_value(LoginFormField::Username, value);