user: Move has_tokens property from user to a meta object

Author: Turbo87

src/controllers/user/me.rs

@@ -10,7 +10,7 @@ use crate::models::{
     ApiToken, CrateOwner, Email, Follow, NewEmail, OwnerKind, User, Version, VersionOwnerAction,
 };
 use crate::schema::{api_tokens, crate_owners, crates, emails, follows, users, versions};
-use crate::views::{EncodableMe, EncodableVersion, OwnedCrate};
+use crate::views::{EncodableMe, EncodableMeMeta, EncodableVersion, OwnedCrate};
 
 /// Handles the `GET /me` route.
 pub fn me(req: &mut dyn RequestExt) -> EndpointResult {
@@ -52,8 +52,9 @@ pub fn me(req: &mut dyn RequestExt) -> EndpointResult {
     let verified = verified.unwrap_or(false);
     let verification_sent = verified || verification_sent;
     Ok(req.json(&EncodableMe {
-        user: user.encodable_private(email, verified, verification_sent, has_tokens),
+        user: user.encodable_private(email, verified, verification_sent),
         owned_crates,
+        meta: EncodableMeMeta { has_tokens },
     }))
 }
 

src/models/user.rs

@@ -174,7 +174,6 @@ impl User {
         email: Option<String>,
         email_verified: bool,
         email_verification_sent: bool,
-        has_tokens: bool,
     ) -> EncodablePrivateUser {
         let User {
             id,
@@ -190,7 +189,6 @@ impl User {
             email,
             email_verified,
             email_verification_sent,
-            has_tokens,
             avatar: gh_avatar,
             login: gh_login,
             name,

src/tests/user.rs

@@ -7,7 +7,9 @@ use crate::{
 use cargo_registry::{
     models::{ApiToken, Email, NewUser, User},
     schema::crate_owners,
-    views::{EncodablePrivateUser, EncodablePublicUser, EncodableVersion, OwnedCrate},
+    views::{
+        EncodableMeMeta, EncodablePrivateUser, EncodablePublicUser, EncodableVersion, OwnedCrate,
+    },
 };
 
 use diesel::prelude::*;
@@ -27,6 +29,7 @@ pub struct UserShowPublicResponse {
 pub struct UserShowPrivateResponse {
     pub user: EncodablePrivateUser,
     pub owned_crates: Vec<OwnedCrate>,
+    pub meta: EncodableMeMeta,
 }
 
 #[derive(Deserialize)]
@@ -754,7 +757,7 @@ fn shows_that_user_has_tokens() {
     let (app, _, user) = TestApp::init().with_user();
 
     let json = user.show_me();
-    assert!(!json.user.has_tokens);
+    assert!(!json.meta.has_tokens);
 
     let user_id = user.as_model().id;
     app.db(|conn| {
@@ -765,5 +768,5 @@ fn shows_that_user_has_tokens() {
     });
 
     let json = user.show_me();
-    assert!(json.user.has_tokens);
+    assert!(json.meta.has_tokens);
 }

src/views.rs

@@ -161,6 +161,12 @@ pub struct OwnedCrate {
 pub struct EncodableMe {
     pub user: EncodablePrivateUser,
     pub owned_crates: Vec<OwnedCrate>,
+    pub meta: EncodableMeMeta,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, Copy)]
+pub struct EncodableMeMeta {
+    pub has_tokens: bool,
 }
 
 /// The serialization format for the `User` model.
@@ -176,7 +182,6 @@ pub struct EncodablePrivateUser {
     pub email: Option<String>,
     pub avatar: Option<String>,
     pub url: Option<String>,
-    pub has_tokens: bool,
 }
 
 /// The serialization format for the `User` model.