Merge pull request #886 from tursodatabase/fix_ref

Fix error handling of Ref
tursodatabase · Jan 11, 2024 · ae9a0e4 · ae9a0e4
2 parents f6577e1 + 3db9965
commit ae9a0e4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/libsql-server/src/rpc/proxy.rs b/libsql-server/src/rpc/proxy.rs
@@ -311,11 +311,13 @@ impl ProxyService {
         let namespace_jwt_key = self.namespaces.with(namespace, |ns| ns.jwt_key()).await;
         let namespace_jwt_key = match namespace_jwt_key {
             Ok(Ok(jwt_key)) => Ok(jwt_key),
-            Err(crate::error::Error::NamespaceDoesntExist(_)) => Ok(None),
-            Err(e) => Err(tonic::Status::internal(format!(
-                "Error fetching jwt key for a namespace: {}",
-                e
-            ))),
+            Err(e) => match e.as_ref() {
+                crate::error::Error::NamespaceDoesntExist(_) => Ok(None),
+                _ => Err(tonic::Status::internal(format!(
+                    "Error fetching jwt key for a namespace: {}",
+                    e
+                ))),
+            },
             Ok(Err(e)) => Err(tonic::Status::internal(format!(
                 "Error fetching jwt key for a namespace: {}",
                 e

diff --git a/libsql-server/src/rpc/replica_proxy.rs b/libsql-server/src/rpc/replica_proxy.rs
@@ -46,15 +46,17 @@ impl ReplicaProxyService {
                 authenticated.upgrade_grpc_request(req);
                 Ok(())
             }
-            Err(crate::error::Error::NamespaceDoesntExist(_)) => {
-                let authenticated = self.auth.authenticate_grpc(req, false, None)?;
-                authenticated.upgrade_grpc_request(req);
-                Ok(())
-            }
-            Err(e) => Err(Status::internal(format!(
-                "Error fetching jwt key for a namespace: {}",
-                e
-            ))),
+            Err(e) => match e.as_ref() {
+                crate::error::Error::NamespaceDoesntExist(_) => {
+                    let authenticated = self.auth.authenticate_grpc(req, false, None)?;
+                    authenticated.upgrade_grpc_request(req);
+                    Ok(())
+                }
+                _ => Err(Status::internal(format!(
+                    "Error fetching jwt key for a namespace: {}",
+                    e
+                ))),
+            },
             Ok(Err(e)) => Err(Status::internal(format!(
                 "Error fetching jwt key for a namespace: {}",
                 e