controllers/user/update: Move regenerate_token_and_send() to a dedicated module

Author: Turbo87

src/controllers/user.rs

@@ -1,6 +1,8 @@
 pub mod me;
 pub mod other;
+mod resend;
 pub mod session;
 pub mod update;
 
+pub use resend::regenerate_token_and_send;
 pub use update::update_user;

src/controllers/user/resend.rs

@@ -0,0 +1,54 @@
+use super::update::UserConfirmEmail;
+use crate::app::AppState;
+use crate::auth::AuthCheck;
+use crate::controllers::helpers::ok_true;
+use crate::models::Email;
+use crate::tasks::spawn_blocking;
+use crate::util::errors::bad_request;
+use crate::util::errors::AppResult;
+use axum::extract::Path;
+use axum::response::Response;
+use crates_io_database::schema::emails;
+use diesel::dsl::sql;
+use diesel::prelude::*;
+use diesel_async::async_connection_wrapper::AsyncConnectionWrapper;
+use http::request::Parts;
+
+/// Handles `PUT /user/:user_id/resend` route
+pub async fn regenerate_token_and_send(
+    state: AppState,
+    Path(param_user_id): Path<i32>,
+    req: Parts,
+) -> AppResult<Response> {
+    let mut conn = state.db_write().await?;
+    let auth = AuthCheck::default().check(&req, &mut conn).await?;
+    spawn_blocking(move || {
+        let conn: &mut AsyncConnectionWrapper<_> = &mut conn.into();
+
+        let user = auth.user();
+
+        // need to check if current user matches user to be updated
+        if user.id != param_user_id {
+            return Err(bad_request("current user does not match requested user"));
+        }
+
+        conn.transaction(|conn| -> AppResult<_> {
+            let email: Email = diesel::update(Email::belonging_to(user))
+                .set(emails::token.eq(sql("DEFAULT")))
+                .get_result(conn)
+                .optional()?
+                .ok_or_else(|| bad_request("Email could not be found"))?;
+
+            let email1 = UserConfirmEmail {
+                user_name: &user.gh_login,
+                domain: &state.emails.domain,
+                token: email.token,
+            };
+
+            state.emails.send(&email.email, email1).map_err(Into::into)
+        })?;
+
+        ok_true()
+    })
+    .await
+}

src/controllers/user/update.rs

@@ -1,15 +1,14 @@
 use crate::app::AppState;
 use crate::auth::AuthCheck;
 use crate::controllers::helpers::ok_true;
-use crate::models::{Email, NewEmail};
+use crate::models::NewEmail;
 use crate::schema::{emails, users};
 use crate::tasks::spawn_blocking;
 use crate::util::diesel::prelude::*;
 use crate::util::errors::{bad_request, server_error, AppResult};
 use axum::extract::Path;
 use axum::response::Response;
 use axum::Json;
-use diesel::dsl::sql;
 use diesel_async::async_connection_wrapper::AsyncConnectionWrapper;
 use http::request::Parts;
 use lettre::Address;
@@ -114,47 +113,6 @@ pub async fn update_user(
     .await
 }
 
-/// Handles `PUT /user/:user_id/resend` route
-pub async fn regenerate_token_and_send(
-    state: AppState,
-    Path(param_user_id): Path<i32>,
-    req: Parts,
-) -> AppResult<Response> {
-    let mut conn = state.db_write().await?;
-    let auth = AuthCheck::default().check(&req, &mut conn).await?;
-    spawn_blocking(move || {
-        use diesel::RunQueryDsl;
-
-        let conn: &mut AsyncConnectionWrapper<_> = &mut conn.into();
-
-        let user = auth.user();
-
-        // need to check if current user matches user to be updated
-        if user.id != param_user_id {
-            return Err(bad_request("current user does not match requested user"));
-        }
-
-        conn.transaction(|conn| -> AppResult<_> {
-            let email: Email = diesel::update(Email::belonging_to(user))
-                .set(emails::token.eq(sql("DEFAULT")))
-                .get_result(conn)
-                .optional()?
-                .ok_or_else(|| bad_request("Email could not be found"))?;
-
-            let email1 = UserConfirmEmail {
-                user_name: &user.gh_login,
-                domain: &state.emails.domain,
-                token: email.token,
-            };
-
-            state.emails.send(&email.email, email1).map_err(Into::into)
-        })?;
-
-        ok_true()
-    })
-    .await
-}
-
 pub struct UserConfirmEmail<'a> {
     pub user_name: &'a str,
     pub domain: &'a str,

src/router.rs

@@ -133,7 +133,7 @@ pub fn build_axum_router(state: AppState) -> Router<()> {
         )
         .route(
             "/api/v1/users/:user_id/resend",
-            put(user::update::regenerate_token_and_send),
+            put(user::regenerate_token_and_send),
         )
         .route(
             "/api/v1/site_metadata",