From d15cf42a0d41e5a35770a31d28f70e435179c481 Mon Sep 17 00:00:00 2001
From: Tobias Bieniek <tobias@bieniek.cloud>
Date: Fri, 4 Oct 2024 10:45:24 +0200
Subject: [PATCH] controllers/token: Move `name` check outside of
 `spawn_blocking()` callback (#9574)

---
 src/controllers/token.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/controllers/token.rs b/src/controllers/token.rs
index 8bd7f41ea2..cc98b06137 100644
--- a/src/controllers/token.rs
+++ b/src/controllers/token.rs
@@ -86,15 +86,14 @@ pub async fn new(
     parts: Parts,
     Json(new): Json<NewApiTokenRequest>,
 ) -> AppResult<Json<Value>> {
+    if new.api_token.name.is_empty() {
+        return Err(bad_request("name must have a value"));
+    }
+
     let conn = app.db_write().await?;
     spawn_blocking(move || {
         let conn: &mut AsyncConnectionWrapper<_> = &mut conn.into();
 
-        let name = &new.api_token.name;
-        if name.is_empty() {
-            return Err(bad_request("name must have a value"));
-        }
-
         let auth = AuthCheck::default().check(&parts, conn)?;
         if auth.api_token_id().is_some() {
             return Err(bad_request(
@@ -141,7 +140,7 @@ pub async fn new(
         let api_token = ApiToken::insert_with_scopes(
             conn,
             user.id,
-            name,
+            &new.api_token.name,
             crate_scopes,
             endpoint_scopes,
             new.api_token.expired_at,
@@ -149,7 +148,7 @@ pub async fn new(
 
         if let Some(recipient) = recipient {
             let email = NewTokenEmail {
-                token_name: name,
+                token_name: &new.api_token.name,
                 user_name: &user.gh_login,
                 domain: &app.emails.domain,
             };