Couple more changes to usages of User

Uses the new type that does not the email variable which will be
dropped from the table soon.

Author: hbina

src/controllers/krate/metadata.rs

@@ -5,7 +5,8 @@
 //! `Cargo.toml` file.
 
 use crate::controllers::prelude::*;
-use crate::models::user::{UserNoEmailType, USER_NO_EMAIL};
+use crate::models::user;
+use crate::models::user::UserNoEmailType;
 use crate::models::{
     Category, Crate, CrateCategory, CrateKeyword, CrateVersions, Keyword, RecentCrateDownloads,
     User, Version,
@@ -231,7 +232,7 @@ pub fn reverse_dependencies(req: &mut dyn Request) -> CargoResult<Response> {
         .select((
             versions::all_columns,
             crates::name,
-            USER_NO_EMAIL.nullable(),
+            user::ALL_COLUMNS.nullable(),
         ))
         .load::<(Version, String, Option<UserNoEmailType>)>(&*conn)?
         .into_iter()

src/controllers/user/me.rs

@@ -5,7 +5,7 @@ use crate::email;
 use crate::util::bad_request;
 use crate::util::errors::CargoError;
 
-use crate::models::user::{UserNoEmailType, USER_NO_EMAIL};
+use crate::models::user::{UserNoEmailType, ALL_COLUMNS};
 use crate::models::{Email, Follow, NewEmail, User, Version};
 use crate::schema::{crates, emails, follows, users, versions};
 use crate::views::{EncodableMe, EncodableVersion};
@@ -30,7 +30,7 @@ pub fn me(req: &mut dyn Request) -> CargoResult<Response> {
         .find(id)
         .left_join(emails::table)
         .select((
-            USER_NO_EMAIL,
+            ALL_COLUMNS,
             emails::verified.nullable(),
             emails::email.nullable(),
             emails::token_generated_at.nullable().is_not_null(),
@@ -71,11 +71,7 @@ pub fn updates(req: &mut dyn Request) -> CargoResult<Response> {
         .left_outer_join(users::table)
         .filter(crates::id.eq(any(followed_crates)))
         .order(versions::created_at.desc())
-        .select((
-            versions::all_columns,
-            crates::name,
-            USER_NO_EMAIL.nullable(),
-        ))
+        .select((versions::all_columns, crates::name, ALL_COLUMNS.nullable()))
         .paginate(&req.query())?
         .load::<(Version, String, Option<UserNoEmailType>)>(&*conn)?;
 

src/middleware/current_user.rs

@@ -6,7 +6,7 @@ use diesel::prelude::*;
 use crate::db::RequestTransaction;
 use crate::util::errors::{std_error, CargoResult, ChainError, Unauthorized};
 
-use crate::models::user::{UserNoEmailType, USER_NO_EMAIL};
+use crate::models::user::{UserNoEmailType, ALL_COLUMNS};
 use crate::models::User;
 use crate::schema::users;
 
@@ -33,7 +33,7 @@ impl Middleware for CurrentUser {
         if let Some(id) = id {
             // If it did, look for a user in the database with the given `user_id`
             let maybe_user = users::table
-                .select(USER_NO_EMAIL)
+                .select(ALL_COLUMNS)
                 .find(id)
                 .first::<UserNoEmailType>(&*conn);
             drop(conn);

src/models.rs

@@ -31,5 +31,5 @@ mod owner;
 mod rights;
 mod team;
 mod token;
-pub(crate) mod user;
+pub mod user;
 mod version;

src/models/krate.rs

@@ -7,7 +7,8 @@ use indexmap::IndexMap;
 use url::Url;
 
 use crate::app::App;
-use crate::models::user::{UserNoEmailType, USER_NO_EMAIL};
+use crate::models::user;
+use crate::models::user::UserNoEmailType;
 use crate::util::{human, CargoResult};
 
 use crate::models::{
@@ -400,19 +401,18 @@ impl Crate {
         Ok(Version::max(vs))
     }
 
-    //  FIXME   ::  This function takes the result from user table so we must check
-    //              if its using the email variable...
     pub fn owners(&self, conn: &PgConnection) -> CargoResult<Vec<Owner>> {
         let base_query = CrateOwner::belonging_to(self).filter(crate_owners::deleted.eq(false));
         let users = base_query
             .inner_join(users::table)
-            .select(USER_NO_EMAIL)
+            .select(user::ALL_COLUMNS)
             .filter(crate_owners::owner_kind.eq(OwnerKind::User as i32))
             .load::<UserNoEmailType>(conn)?
             .into_iter()
             .map(|user| User {
                 id: user.0,
-                email: None,
+                email: None, // <-- Because user _should not_ contain the email column.
+                // This hack should be fixed in the future.
                 gh_access_token: user.1,
                 gh_login: user.2,
                 name: user.3,

src/models/owner.rs

@@ -4,7 +4,7 @@ use crate::app::App;
 use crate::github;
 use crate::util::{human, CargoResult};
 
-use crate::models::user::{UserNoEmailType, USER_NO_EMAIL};
+use crate::models::user::{UserNoEmailType, ALL_COLUMNS};
 use crate::models::{Crate, Team, User};
 use crate::schema::{crate_owners, users};
 use crate::views::EncodableOwner;
@@ -55,7 +55,7 @@ impl Owner {
             )?))
         } else {
             users::table
-                .select(USER_NO_EMAIL)
+                .select(ALL_COLUMNS)
                 .filter(users::gh_login.eq(name))
                 .first::<UserNoEmailType>(conn)
                 .map(|user| User {

src/models/user.rs

@@ -49,7 +49,7 @@ pub type UserNoEmailType = (
     i32,
 );
 
-pub type UserNoEmail = (
+pub type AllColumns = (
     users::id,
     users::gh_access_token,
     users::gh_login,
@@ -58,7 +58,7 @@ pub type UserNoEmail = (
     users::gh_id,
 );
 
-pub const USER_NO_EMAIL: UserNoEmail = (
+pub const ALL_COLUMNS: AllColumns = (
     users::id,
     users::gh_access_token,
     users::gh_login,
@@ -116,7 +116,7 @@ impl<'a> NewUser<'a> {
                 .get_result::<User>(conn)?;
 
             // To send the user an account verification email...
-            if let Some(user_email) = user.email.as_ref() {
+            if let Some(user_email) = self.email {
                 let new_email = NewEmail {
                     user_id: user.id,
                     email: user_email,
@@ -167,10 +167,19 @@ impl User {
         let base_query = CrateOwner::belonging_to(krate).filter(crate_owners::deleted.eq(false));
         let users = base_query
             .inner_join(users::table)
-            .select(users::all_columns)
+            .select(ALL_COLUMNS)
             .filter(crate_owners::owner_kind.eq(OwnerKind::User as i32))
-            .load(conn)?
+            .load::<UserNoEmailType>(conn)?
             .into_iter()
+            .map(|user| User {
+                id: user.0,
+                email: None,
+                gh_access_token: user.1,
+                gh_login: user.2,
+                name: user.3,
+                gh_avatar: user.4,
+                gh_id: user.5,
+            })
             .map(Owner::User);
 
         Ok(users.collect())