controllers/token: Remove redundant CreatedApiToken struct

Author: Turbo87

src/controllers/token.rs

@@ -20,6 +20,7 @@ use diesel::prelude::*;
 use diesel_async::RunQueryDsl;
 use http::request::Parts;
 use http::StatusCode;
+use secrecy::ExposeSecret;
 
 #[derive(Deserialize)]
 pub struct GetParams {
@@ -176,22 +177,14 @@ pub async fn create_api_token(
         }
     }
 
-    let created_token = CreatedApiToken {
-        plaintext,
-        model: new_token.insert(&mut conn).await?,
+    let api_token = EncodableApiTokenWithToken {
+        token: new_token.insert(&mut conn).await?,
+        plaintext: plaintext.expose_secret().to_string(),
     };
 
-    let api_token = EncodableApiTokenWithToken::from(created_token);
-
     Ok(json!({ "api_token": api_token }))
 }
 
-#[derive(Debug)]
-pub struct CreatedApiToken {
-    pub model: ApiToken,
-    pub plaintext: PlainToken,
-}
-
 /// Find API token by id.
 #[utoipa::path(
     get,

src/views.rs

@@ -1,7 +1,5 @@
 use chrono::NaiveDateTime;
-use secrecy::ExposeSecret;
 
-use crate::controllers::token::CreatedApiToken;
 use crate::external_urls::remove_blocked_urls;
 use crate::models::{
     ApiToken, Category, Crate, CrateOwnerInvitation, Dependency, DependencyKind, Keyword, Owner,
@@ -445,15 +443,6 @@ pub struct EncodableApiTokenWithToken {
     pub plaintext: String,
 }
 
-impl From<CreatedApiToken> for EncodableApiTokenWithToken {
-    fn from(token: CreatedApiToken) -> Self {
-        EncodableApiTokenWithToken {
-            token: token.model,
-            plaintext: token.plaintext.expose_secret().to_string(),
-        }
-    }
-}
-
 #[derive(Deserialize, Serialize, Debug)]
 pub struct OwnedCrate {
     pub id: i32,