controllers/user/update: Reduce spawn_blocking() scope

The email sending code is still sync and needs to be in a `spawn_blocking()` block for now, but the rest of the `regenerate_token_and_send()` can be converted to use async database queries.

Author: Turbo87

src/controllers/user/update.rs

@@ -5,12 +5,14 @@ use crate::models::{Email, 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 crate::util::errors::{bad_request, server_error, AppResult, BoxedAppError};
 use axum::extract::Path;
 use axum::response::Response;
 use axum::Json;
 use diesel::dsl::sql;
 use diesel_async::async_connection_wrapper::AsyncConnectionWrapper;
+use diesel_async::scoped_futures::ScopedFutureExt;
+use diesel_async::AsyncConnection;
 use http::request::Parts;
 use lettre::Address;
 use secrecy::{ExposeSecret, SecretString};
@@ -120,39 +122,44 @@ pub async fn regenerate_token_and_send(
     Path(param_user_id): Path<i32>,
     req: Parts,
 ) -> AppResult<Response> {
+    use diesel_async::RunQueryDsl;
+
     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"));
-        }
+    // need to check if current user matches user to be updated
+    if auth.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))
+    conn.transaction(|conn| {
+        async move {
+            let email: Email = diesel::update(Email::belonging_to(auth.user()))
                 .set(emails::token.eq(sql("DEFAULT")))
                 .get_result(conn)
+                .await
                 .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()
+            spawn_blocking(move || {
+                let email1 = UserConfirmEmail {
+                    user_name: &auth.user().gh_login,
+                    domain: &state.emails.domain,
+                    token: email.token,
+                };
+
+                state
+                    .emails
+                    .send(&email.email, email1)
+                    .map_err(BoxedAppError::from)
+            })
+            .await
+        }
+        .scope_boxed()
     })
-    .await
+    .await?;
+
+    ok_true()
 }
 
 pub struct UserConfirmEmail<'a> {