Include whether the user email is verified rather than not including unverified emails

Author: carols10cents

src/controllers/admin.rs

@@ -30,7 +30,7 @@ pub async fn list(
         ));
     }
 
-    let (user, verified, email) = users::table
+    let (user, verified, user_email) = users::table
         .left_join(emails::table)
         .filter(users::gh_login.eq(username))
         .select((
@@ -79,7 +79,6 @@ pub async fn list(
         .load(&mut conn)
         .await?;
 
-    let verified = verified.unwrap_or(false);
     let crates = crates
         .into_iter()
         .map(
@@ -113,14 +112,16 @@ pub async fn list(
         )
         .collect();
     Ok(Json(AdminListResponse {
-        user_email: verified.then_some(email).flatten(),
+        user_email,
+        user_email_verified: verified.unwrap_or_default(),
         crates,
     }))
 }
 
 #[derive(Debug, Serialize)]
 pub struct AdminListResponse {
     user_email: Option<String>,
+    user_email_verified: bool,
     crates: Vec<AdminCrateInfo>,
 }
 

src/tests/mod.rs

@@ -87,6 +87,7 @@ pub struct OkBool {
 #[derive(Deserialize, Debug)]
 pub struct AdminListResponse {
     user_email: Option<String>,
+    user_email_verified: bool,
     crates: Vec<AdminCrateInfo>,
 }
 #[derive(Deserialize, Debug)]

src/tests/routes/crates/admin.rs

@@ -68,6 +68,7 @@ async fn index_include_yanked() -> anyhow::Result<()> {
     let json = admin.admin_list(username).await.good();
 
     assert_eq!(json.user_email.unwrap(), "[email protected]");
+    assert!(json.user_email_verified);
     assert_eq!(json.crates.len(), 2);
 
     let json_crate_0 = &json.crates[0];