Fix deserialization for Algorithm::None (#624)

* Bump ssi-jwk version
spruceid · Oct 30, 2024 · 164ac45 · 164ac45
1 parent 3eaa9b0
commit 164ac45
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -28,7 +28,7 @@ ssi-multicodec = { path = "./crates/multicodec", version = "0.2", default-featur
 ssi-crypto = { path = "./crates/crypto", version = "0.2.1", default-features = false }
 ssi-verification-methods-core = { path = "./crates/verification-methods/core", version = "0.1.1", default-features = false }
 ssi-verification-methods = { path = "./crates/verification-methods", version = "0.1.1", default-features = false }
-ssi-jwk = { path = "./crates/jwk", version = "0.3", default-features = false }
+ssi-jwk = { path = "./crates/jwk", version = "0.3.1", default-features = false }
 ssi-tzkey = { path = "./crates/tzkey", version = "0.2.1", default-features = false }
 ssi-eip712 = { path = "./crates/eip712", version = "0.1", default-features = false }
 ssi-rdf = { path = "./crates/rdf", version = "0.1", default-features = false }

diff --git a/crates/jwk/Cargo.toml b/crates/jwk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ssi-jwk"
-version = "0.3.0"
+version = "0.3.1"
 edition = "2021"
 authors = ["Spruce Systems, Inc."]
 license = "Apache-2.0"

diff --git a/crates/jwk/src/algorithm.rs b/crates/jwk/src/algorithm.rs
@@ -26,7 +26,7 @@ macro_rules! algorithms {
             ///
             /// Per the specs it should only be `none` but `None` is kept for backwards
             /// compatibility.
-            #[serde(alias = "None")]
+            #[serde(alias = "None", rename = "none")]
             None
         }
 
@@ -292,3 +292,28 @@ impl From<ES256OrES384> for Algorithm {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::Algorithm;
+
+    #[test]
+    fn none_serializes() {
+        assert_eq!(
+            serde_json::to_string(&Algorithm::None).unwrap(),
+            r#""none""#
+        )
+    }
+
+    #[test]
+    fn none_deserializes() {
+        assert_eq!(
+            serde_json::from_str::<Algorithm>(r#""none""#).unwrap(),
+            Algorithm::None
+        );
+        assert_eq!(
+            serde_json::from_str::<Algorithm>(r#""None""#).unwrap(),
+            Algorithm::None
+        )
+    }
+}