auth: Remove obsolete async_ prefixes from fns

We don't use blocking check implementations anymore, so we remove these
temporary prefixes.

Author: eth3lbert

src/auth.rs

@@ -57,13 +57,13 @@ impl AuthCheck {
         }
     }
 
-    #[instrument(name = "auth.async_check", skip_all)]
-    pub async fn async_check(
+    #[instrument(name = "auth.check", skip_all)]
+    pub async fn check(
         &self,
         parts: &Parts,
         conn: &mut AsyncPgConnection,
     ) -> AppResult<Authentication> {
-        let auth = async_authenticate(parts, conn).await?;
+        let auth = authenticate(parts, conn).await?;
 
         if let Some(token) = auth.api_token() {
             if !self.allow_token {
@@ -172,7 +172,7 @@ impl Authentication {
 }
 
 #[instrument(skip_all)]
-async fn async_authenticate_via_cookie(
+async fn authenticate_via_cookie(
     parts: &Parts,
     conn: &mut AsyncPgConnection,
 ) -> AppResult<Option<CookieAuthentication>> {
@@ -198,7 +198,7 @@ async fn async_authenticate_via_cookie(
 }
 
 #[instrument(skip_all)]
-async fn async_authenticate_via_token(
+async fn authenticate_via_token(
     parts: &Parts,
     conn: &mut AsyncPgConnection,
 ) -> AppResult<Option<TokenAuthentication>> {
@@ -237,19 +237,19 @@ async fn async_authenticate_via_token(
 }
 
 #[instrument(skip_all)]
-async fn async_authenticate(
+async fn authenticate(
     parts: &Parts,
     conn: &mut AsyncPgConnection,
 ) -> AppResult<Authentication> {
     controllers::util::verify_origin(parts)?;
 
-    match async_authenticate_via_cookie(parts, conn).await {
+    match authenticate_via_cookie(parts, conn).await {
         Ok(None) => {}
         Ok(Some(auth)) => return Ok(Authentication::Cookie(auth)),
         Err(err) => return Err(err),
     }
 
-    match async_authenticate_via_token(parts, conn).await {
+    match authenticate_via_token(parts, conn).await {
         Ok(None) => {}
         Ok(Some(auth)) => return Ok(Authentication::Token(auth)),
         Err(err) => return Err(err),

src/controllers/crate_owner_invitation.rs

@@ -29,7 +29,7 @@ use tokio::runtime::Handle;
 pub async fn list(app: AppState, req: Parts) -> AppResult<Json<Value>> {
     let mut conn = app.db_read().await?;
     let auth = AuthCheck::only_cookie()
-        .async_check(&req, &mut conn)
+        .check(&req, &mut conn)
         .await?;
     spawn_blocking(move || {
         let conn: &mut AsyncConnectionWrapper<_> = &mut conn.into();
@@ -73,7 +73,7 @@ pub async fn list(app: AppState, req: Parts) -> AppResult<Json<Value>> {
 pub async fn private_list(app: AppState, req: Parts) -> AppResult<Json<PrivateListResponse>> {
     let mut conn = app.db_read().await?;
     let auth = AuthCheck::only_cookie()
-        .async_check(&req, &mut conn)
+        .check(&req, &mut conn)
         .await?;
     spawn_blocking(move || {
         let conn: &mut AsyncConnectionWrapper<_> = &mut conn.into();
@@ -288,7 +288,7 @@ pub async fn handle_invite(state: AppState, req: BytesRequest) -> AppResult<Json
     let crate_invite = crate_invite.crate_owner_invite;
 
     let mut conn = state.db_write().await?;
-    let auth = AuthCheck::default().async_check(&parts, &mut conn).await?;
+    let auth = AuthCheck::default().check(&parts, &mut conn).await?;
     spawn_blocking(move || {
         let conn: &mut AsyncConnectionWrapper<_> = &mut conn.into();
 

src/controllers/krate/follow.rs

@@ -36,7 +36,7 @@ pub async fn follow(
 ) -> AppResult<Response> {
     let mut conn = app.db_write().await?;
     let user_id = AuthCheck::default()
-        .async_check(&req, &mut conn)
+        .check(&req, &mut conn)
         .await?
         .user_id();
     spawn_blocking(move || {
@@ -63,7 +63,7 @@ pub async fn unfollow(
 ) -> AppResult<Response> {
     let mut conn = app.db_write().await?;
     let user_id = AuthCheck::default()
-        .async_check(&req, &mut conn)
+        .check(&req, &mut conn)
         .await?
         .user_id();
     spawn_blocking(move || {
@@ -87,7 +87,7 @@ pub async fn following(
 ) -> AppResult<Json<Value>> {
     let mut conn = app.db_read_prefer_primary().await?;
     let user_id = AuthCheck::only_cookie()
-        .async_check(&req, &mut conn)
+        .check(&req, &mut conn)
         .await?
         .user_id();
     spawn_blocking(move || {

src/controllers/krate/owners.rs

@@ -134,7 +134,7 @@ async fn modify_owners(
     let auth = AuthCheck::default()
         .with_endpoint_scope(EndpointScope::ChangeOwners)
         .for_crate(&crate_name)
-        .async_check(&parts, &mut conn)
+        .check(&parts, &mut conn)
         .await?;
     spawn_blocking(move || {
         use diesel::RunQueryDsl;

src/controllers/krate/publish.rs

@@ -102,7 +102,7 @@ pub async fn publish(app: AppState, req: BytesRequest) -> AppResult<Json<GoodCra
         let auth = AuthCheck::default()
             .with_endpoint_scope(endpoint_scope)
             .for_crate(&metadata.name)
-            .async_check(&req, &mut conn)
+            .check(&req, &mut conn)
             .await?;
         (existing_crate, auth)
     };

src/controllers/krate/search.rs

@@ -310,7 +310,7 @@ impl<'a> FilterParams<'a> {
         }
 
         let user_id = Handle::current()
-            .block_on(AuthCheck::default().async_check(req, conn))?
+            .block_on(AuthCheck::default().check(req, conn))?
             .user_id();
 
         // This should not fail, because of the `get()` check above

src/controllers/token.rs

@@ -43,7 +43,7 @@ pub async fn list(
 ) -> AppResult<Json<Value>> {
     let mut conn = app.db_read_prefer_primary().await?;
     let auth = AuthCheck::only_cookie()
-        .async_check(&req, &mut conn)
+        .check(&req, &mut conn)
         .await?;
     spawn_blocking(move || {
         use diesel::RunQueryDsl;
@@ -95,7 +95,7 @@ pub async fn new(
     }
 
     let mut conn = app.db_write().await?;
-    let auth = AuthCheck::default().async_check(&parts, &mut conn).await?;
+    let auth = AuthCheck::default().check(&parts, &mut conn).await?;
     spawn_blocking(move || {
         use diesel::RunQueryDsl;
 
@@ -178,7 +178,7 @@ pub async fn new(
 /// Handles the `GET /me/tokens/:id` route.
 pub async fn show(app: AppState, Path(id): Path<i32>, req: Parts) -> AppResult<Json<Value>> {
     let mut conn = app.db_write().await?;
-    let auth = AuthCheck::default().async_check(&req, &mut conn).await?;
+    let auth = AuthCheck::default().check(&req, &mut conn).await?;
     spawn_blocking(move || {
         use diesel::RunQueryDsl;
 
@@ -198,7 +198,7 @@ pub async fn show(app: AppState, Path(id): Path<i32>, req: Parts) -> AppResult<J
 /// Handles the `DELETE /me/tokens/:id` route.
 pub async fn revoke(app: AppState, Path(id): Path<i32>, req: Parts) -> AppResult<Json<Value>> {
     let mut conn = app.db_write().await?;
-    let auth = AuthCheck::default().async_check(&req, &mut conn).await?;
+    let auth = AuthCheck::default().check(&req, &mut conn).await?;
     spawn_blocking(move || {
         use diesel::RunQueryDsl;
 
@@ -217,7 +217,7 @@ pub async fn revoke(app: AppState, Path(id): Path<i32>, req: Parts) -> AppResult
 /// Handles the `DELETE /tokens/current` route.
 pub async fn revoke_current(app: AppState, req: Parts) -> AppResult<Response> {
     let mut conn = app.db_write().await?;
-    let auth = AuthCheck::default().async_check(&req, &mut conn).await?;
+    let auth = AuthCheck::default().check(&req, &mut conn).await?;
     spawn_blocking(move || {
         use diesel::RunQueryDsl;
 

src/controllers/user/me.rs

@@ -23,7 +23,7 @@ use crate::views::{EncodableMe, EncodablePrivateUser, EncodableVersion, OwnedCra
 pub async fn me(app: AppState, req: Parts) -> AppResult<Json<EncodableMe>> {
     let mut conn = app.db_read_prefer_primary().await?;
     let user_id = AuthCheck::only_cookie()
-        .async_check(&req, &mut conn)
+        .check(&req, &mut conn)
         .await?
         .user_id();
     spawn_blocking(move || {
@@ -71,7 +71,7 @@ pub async fn me(app: AppState, req: Parts) -> AppResult<Json<EncodableMe>> {
 pub async fn updates(app: AppState, req: Parts) -> AppResult<Json<Value>> {
     let mut conn = app.db_read_prefer_primary().await?;
     let auth = AuthCheck::only_cookie()
-        .async_check(&req, &mut conn)
+        .check(&req, &mut conn)
         .await?;
     spawn_blocking(move || {
         let conn: &mut AsyncConnectionWrapper<_> = &mut conn.into();
@@ -151,7 +151,7 @@ pub async fn update_email_notifications(app: AppState, req: BytesRequest) -> App
 
     let mut conn = app.db_write().await?;
     let user_id = AuthCheck::default()
-        .async_check(&parts, &mut conn)
+        .check(&parts, &mut conn)
         .await?
         .user_id();
     spawn_blocking(move || {

src/controllers/user/update.rs

@@ -34,7 +34,7 @@ pub async fn update_user(
     Json(user_update): Json<UserUpdate>,
 ) -> AppResult<Response> {
     let mut conn = state.db_write().await?;
-    let auth = AuthCheck::default().async_check(&req, &mut conn).await?;
+    let auth = AuthCheck::default().check(&req, &mut conn).await?;
     spawn_blocking(move || {
         use diesel::RunQueryDsl;
 
@@ -121,7 +121,7 @@ pub async fn regenerate_token_and_send(
     req: Parts,
 ) -> AppResult<Response> {
     let mut conn = state.db_write().await?;
-    let auth = AuthCheck::default().async_check(&req, &mut conn).await?;
+    let auth = AuthCheck::default().check(&req, &mut conn).await?;
     spawn_blocking(move || {
         use diesel::RunQueryDsl;
 

src/controllers/version/metadata.rs

@@ -176,7 +176,7 @@ pub async fn authenticate(
     AuthCheck::default()
         .with_endpoint_scope(EndpointScope::Yank)
         .for_crate(name)
-        .async_check(req, conn)
+        .check(req, conn)
         .await
 }