Skip to content

Commit d15cf42

Browse files
authored
controllers/token: Move name check outside of spawn_blocking() callback (#9574)
1 parent 2e5a4fe commit d15cf42

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/controllers/token.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,14 @@ pub async fn new(
8686
parts: Parts,
8787
Json(new): Json<NewApiTokenRequest>,
8888
) -> AppResult<Json<Value>> {
89+
if new.api_token.name.is_empty() {
90+
return Err(bad_request("name must have a value"));
91+
}
92+
8993
let conn = app.db_write().await?;
9094
spawn_blocking(move || {
9195
let conn: &mut AsyncConnectionWrapper<_> = &mut conn.into();
9296

93-
let name = &new.api_token.name;
94-
if name.is_empty() {
95-
return Err(bad_request("name must have a value"));
96-
}
97-
9897
let auth = AuthCheck::default().check(&parts, conn)?;
9998
if auth.api_token_id().is_some() {
10099
return Err(bad_request(
@@ -141,15 +140,15 @@ pub async fn new(
141140
let api_token = ApiToken::insert_with_scopes(
142141
conn,
143142
user.id,
144-
name,
143+
&new.api_token.name,
145144
crate_scopes,
146145
endpoint_scopes,
147146
new.api_token.expired_at,
148147
)?;
149148

150149
if let Some(recipient) = recipient {
151150
let email = NewTokenEmail {
152-
token_name: name,
151+
token_name: &new.api_token.name,
153152
user_name: &user.gh_login,
154153
domain: &app.emails.domain,
155154
};

0 commit comments

Comments
 (0)