Merge pull request #175 from grafbase/brabier/vxysvopuvpyr

update SDK to 0.22

Author: Finistere

Cargo.lock

@@ -60,7 +60,7 @@ base64 = "0.22.1"
 bytes = { version = "1.10.1", features = ["serde"] }
 chrono = "0.4.40"
 clap = "4.5.36"
-ctor = "0.4"
+ctor = "0.5"
 duration-str = "0.17"
 enumflags2 = "0.7.11"
 field-selection-map = { git = "https://github.com/grafbase/grafbase", package = "engine-field-selection-map" }
@@ -69,7 +69,7 @@ futures-util = "0.3.31"
 fxhash = "0.2.1"
 grafbase-database-definition = { version = "0.1.0", path = "crates/database-definition" }
 grafbase-postgres-introspection = { version = "0.1.0", path = "crates/postgres-introspection" }
-grafbase-sdk = "0.21.1"
+grafbase-sdk = "0.22.1"
 hashbrown = "0.15"
 http = "1.3"
 indexmap = "2.9.0"

Cargo.toml

@@ -121,15 +121,17 @@ impl AuthenticationExtension for Jwt {
 
 impl Jwt {
     fn decoder(&mut self) -> Result<Decoder<'_>, ErrorResponse> {
+        // If we don't have the JWKS yet or poll interval expired, we try to load the JWKS.
         if self
             .jwks
             .as_ref()
             .is_none_or(|(_, ts)| ts.elapsed() > self.config.poll_interval)
         {
             let ts = Instant::now();
-            let (jwks, bytes) = self
+            let (on_cache_miss, bytes) = self
                 .jwks_cache
-                .get_or_insert(self.config.url.as_str(), || {
+                .try_get_or_insert(self.config.url.as_str(), || {
+                    log::debug!("Fetching JWKS from {}", self.config.url);
                     let request = HttpRequest::get(self.config.url.clone()).build();
                     let response = http::execute(request)?;
                     let bytes = response.into_bytes();
@@ -140,7 +142,9 @@ impl Jwt {
                     log::error!("Failed to retrieve JWKS: {err}");
                     ErrorResponse::internal_server_error()
                 })?;
-            let jwks: Jwks = match jwks {
+            // Either it's a cache hit and we need to parse the bytes or it's a cache miss and we
+            // parsed the JWKS already.
+            let jwks: Jwks = match on_cache_miss {
                 Some(jwks) => jwks,
                 _ => serde_json::from_slice(&bytes).map_err(|err| {
                     log::error!("Failed to parse JWKS: {err}");