chore(registry): bump clerk-rs, clippy lint (#477)

tembo-io · Oct 10, 2023 · fabd050 · fabd050
1 parent ed8e5af
commit fabd050
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/registry/Cargo.lock b/registry/Cargo.lock
diff --git a/registry/Cargo.toml b/registry/Cargo.toml
@@ -26,7 +26,7 @@ env_logger = "0.10.0"
 reqwest = "0.11.14"
 aws-config = "0.55.0"
 aws-sdk-s3 = "0.25.0"
-clerk-rs = "0.1.7"
+clerk-rs = "0.1.8"
 rand = "0.8.5"
 sha2 = "0.10.6"
 tracing = "0.1.37"

diff --git a/registry/src/categories.rs b/registry/src/categories.rs
@@ -94,11 +94,11 @@ pub async fn get_category_ids(
 ) -> Result<Vec<i64>, ExtensionRegistryError> {
     let mut ids: Vec<i64> = Vec::new();
     for slug in categories {
-        let id = sqlx::query!("SELECT id FROM categories WHERE slug = $1", slug)
+        let maybe_entry = sqlx::query!("SELECT id FROM categories WHERE slug = $1", slug)
             .fetch_optional(conn.as_ref())
             .await?;
-        if id.is_some() {
-            ids.push(id.unwrap().id)
+        if let Some(entry) = maybe_entry {
+            ids.push(entry.id)
         }
     }
     Ok(ids)

diff --git a/registry/src/server.rs b/registry/src/server.rs
@@ -19,12 +19,12 @@ pub fn routes_config(configuration: &mut web::ServiceConfig) {
         .service(routes::download::download)
         .service(
             web::scope("/token")
-                .wrap(ClerkMiddleware::new(clerk_cfg.clone(), None))
+                .wrap(ClerkMiddleware::new(clerk_cfg.clone(), None, false))
                 .service(new_token),
         )
         .service(
             web::scope("/admin")
-                .wrap(ClerkMiddleware::new(clerk_cfg, None))
+                .wrap(ClerkMiddleware::new(clerk_cfg, None, false))
                 .service(routes::root::auth_ok)
                 .service(routes::extensions::delete_extension)
                 .service(routes::extensions::put_shared_preload_libraries),