models/token: Inline ApiToken::insert_with_scopes() fn

Author: Turbo87

src/controllers/token.rs

@@ -7,6 +7,7 @@ use crate::app::AppState;
 use crate::auth::AuthCheck;
 use crate::models::token::{CrateScope, EndpointScope};
 use crate::util::errors::{bad_request, AppResult};
+use crate::util::token::PlainToken;
 use axum::extract::{Path, Query};
 use axum::response::{IntoResponse, Response};
 use axum::Json;
@@ -148,15 +149,16 @@ pub async fn create_api_token(
 
     let recipient = user.email(&mut conn).await?;
 
-    let api_token = ApiToken::insert_with_scopes(
-        &mut conn,
-        user.id,
-        &new.api_token.name,
-        crate_scopes,
-        endpoint_scopes,
-        new.api_token.expired_at,
-    )
-    .await?;
+    let plaintext = PlainToken::generate();
+
+    let new_token = crate::models::token::NewApiToken::builder()
+        .user_id(user.id)
+        .name(&new.api_token.name)
+        .token(plaintext.hashed())
+        .maybe_crate_scopes(crate_scopes)
+        .maybe_endpoint_scopes(endpoint_scopes)
+        .maybe_expired_at(new.api_token.expired_at)
+        .build();
 
     if let Some(recipient) = recipient {
         let email = NewTokenEmail {
@@ -174,11 +176,22 @@ pub async fn create_api_token(
         }
     }
 
-    let api_token = EncodableApiTokenWithToken::from(api_token);
+    let created_token = CreatedApiToken {
+        plaintext,
+        model: new_token.insert(&mut conn).await?,
+    };
+
+    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/models.rs

@@ -14,7 +14,7 @@ pub use self::krate::{Crate, CrateName, NewCrate, RecentCrateDownloads};
 pub use self::owner::{CrateOwner, Owner, OwnerKind};
 pub use self::rights::Rights;
 pub use self::team::{NewTeam, Team};
-pub use self::token::{ApiToken, CreatedApiToken};
+pub use self::token::ApiToken;
 pub use self::user::{NewUser, User};
 pub use self::version::{NewVersion, TopVersions, Version};
 

src/models/token.rs

@@ -61,31 +61,6 @@ pub struct ApiToken {
 }
 
 impl ApiToken {
-    pub async fn insert_with_scopes(
-        conn: &mut AsyncPgConnection,
-        user_id: i32,
-        name: &str,
-        crate_scopes: Option<Vec<CrateScope>>,
-        endpoint_scopes: Option<Vec<EndpointScope>>,
-        expired_at: Option<NaiveDateTime>,
-    ) -> QueryResult<CreatedApiToken> {
-        let token = PlainToken::generate();
-
-        let new_token = NewApiToken::builder()
-            .user_id(user_id)
-            .name(name)
-            .token(token.hashed())
-            .maybe_crate_scopes(crate_scopes)
-            .maybe_endpoint_scopes(endpoint_scopes)
-            .maybe_expired_at(expired_at)
-            .build();
-
-        Ok(CreatedApiToken {
-            plaintext: token,
-            model: new_token.insert(conn).await?,
-        })
-    }
-
     pub async fn find_by_api_token(
         conn: &mut AsyncPgConnection,
         token: &HashedToken,
@@ -120,12 +95,6 @@ impl ApiToken {
     }
 }
 
-#[derive(Debug)]
-pub struct CreatedApiToken {
-    pub model: ApiToken,
-    pub plaintext: PlainToken,
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

src/tests/util.rs

@@ -19,7 +19,7 @@
 //! `MockCookieUser` and `MockTokenUser` provide an `as_model` function which returns a reference
 //! to the underlying database model value (`User` and `ApiToken` respectively).
 
-use crate::models::{ApiToken, CreatedApiToken, User};
+use crate::models::{ApiToken, User};
 use crate::tests::{
     CategoryListResponse, CategoryResponse, CrateList, CrateResponse, GoodCrate, OwnerResp,
     OwnersResponse, VersionResponse,
@@ -28,7 +28,7 @@ use std::future::Future;
 
 use http::{Method, Request};
 
-use crate::models::token::{CrateScope, EndpointScope};
+use crate::models::token::{CrateScope, EndpointScope, NewApiToken};
 use crate::util::token::PlainToken;
 use axum::body::{Body, Bytes};
 use axum::extract::connect_info::MockConnectInfo;
@@ -50,6 +50,7 @@ mod mock_request;
 mod response;
 mod test_app;
 
+use crate::controllers::token::CreatedApiToken;
 use mock_request::MockRequest;
 pub use mock_request::MockRequestExt;
 pub use response::Response;
@@ -320,16 +321,21 @@ impl MockCookieUser {
     ) -> MockTokenUser {
         let mut conn = self.app().db_conn().await;
 
-        let token = ApiToken::insert_with_scopes(
-            &mut conn,
-            self.user.id,
-            name,
-            crate_scopes,
-            endpoint_scopes,
-            expired_at,
-        )
-        .await
-        .unwrap();
+        let plaintext = PlainToken::generate();
+
+        let new_token = NewApiToken::builder()
+            .user_id(self.user.id)
+            .name(name)
+            .token(plaintext.hashed())
+            .maybe_crate_scopes(crate_scopes)
+            .maybe_endpoint_scopes(endpoint_scopes)
+            .maybe_expired_at(expired_at)
+            .build();
+
+        let token = CreatedApiToken {
+            plaintext,
+            model: new_token.insert(&mut conn).await.unwrap(),
+        };
 
         MockTokenUser {
             app: self.app.clone(),

src/views.rs

@@ -1,11 +1,11 @@
 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, CreatedApiToken, Dependency, DependencyKind,
-    Keyword, Owner, ReverseDependency, Team, TopVersions, User, Version, VersionDownload,
-    VersionOwnerAction,
+    ApiToken, Category, Crate, CrateOwnerInvitation, Dependency, DependencyKind, Keyword, Owner,
+    ReverseDependency, Team, TopVersions, User, Version, VersionDownload, VersionOwnerAction,
 };
 use crate::util::rfc3339;
 use crates_io_github as github;