More verbose, but also more consistent.
This commit is contained in:
@@ -44,7 +44,7 @@ async fn issue_token(
|
||||
token_config.access_token_lifetime,
|
||||
)?;
|
||||
|
||||
repository::tokens::insert_access_token(&pool, access_token.clone().into()).await?;
|
||||
repository::tokens::upsert_access_token(&pool, access_token.clone().into()).await?;
|
||||
|
||||
Ok(Json(TokenResponse::new(access_token, None)))
|
||||
}
|
||||
@@ -57,30 +57,13 @@ async fn issue_token(
|
||||
return Err(AppError::InvalidRefreshToken);
|
||||
};
|
||||
|
||||
let new_access_token = access_token.refresh(token_config.access_token_lifetime)?;
|
||||
repository::tokens::update_access_token_by_hash(
|
||||
&pool,
|
||||
&token_hash,
|
||||
&new_access_token.secret.hash(),
|
||||
new_access_token.expires_at,
|
||||
new_access_token.issued_at,
|
||||
)
|
||||
.await?;
|
||||
let new_access = access_token.refresh(token_config.access_token_lifetime)?;
|
||||
repository::tokens::upsert_access_token(&pool, new_access.clone().into()).await?;
|
||||
|
||||
let new_refresh_token = refresh_token.refresh(token_config.refresh_token_lifetime)?;
|
||||
repository::tokens::update_refresh_token_by_hash(
|
||||
&pool,
|
||||
&token_hash,
|
||||
&new_refresh_token.secret.hash(),
|
||||
new_refresh_token.expires_at,
|
||||
new_refresh_token.issued_at,
|
||||
)
|
||||
.await?;
|
||||
let new_refresh = refresh_token.refresh(token_config.refresh_token_lifetime)?;
|
||||
repository::tokens::upsert_refresh_token(&pool, new_refresh.clone().into()).await?;
|
||||
|
||||
Ok(Json(TokenResponse::new(
|
||||
new_access_token,
|
||||
Some(new_refresh_token),
|
||||
)))
|
||||
Ok(Json(TokenResponse::new(new_access, Some(new_refresh))))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user