Fix DeviceAuth serialization error.

spruceid · Jan 3, 2025 · 28805e1 · 28805e1
1 parent b3a0317
commit 28805e1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 21 deletions.
diff --git a/src/definitions/device_response.rs b/src/definitions/device_response.rs
@@ -191,9 +191,7 @@ mod test {
             },
             device_signed: DeviceSigned {
                 namespaces: device_namespaces_bytes,
-                device_auth: DeviceAuth::Mac {
-                    device_mac: cose_mac0,
-                },
+                device_auth: DeviceAuth::DeviceMac(cose_mac0),
             },
             errors: None,
         };

diff --git a/src/definitions/device_signed.rs b/src/definitions/device_signed.rs
@@ -34,14 +34,10 @@ pub type DeviceSignedItems = NonEmptyMap<String, ciborium::Value>;
 /// This struct contains the device signature in the form of a [CoseSign1] object.  
 /// The [CoseSign1] object represents a `COSE (CBOR Object Signing and Encryption) signature.
 #[derive(Clone, Debug, Deserialize, Serialize)]
-// #[serde(untagged)]
+#[serde(rename_all = "camelCase")]
 pub enum DeviceAuth {
-    #[serde(rename_all = "camelCase")]
-    Signature {
-        device_signature: MaybeTagged<CoseSign1>,
-    },
-    #[serde(rename_all = "camelCase")]
-    Mac { device_mac: MaybeTagged<CoseMac0> },
+    DeviceSignature(MaybeTagged<CoseSign1>),
+    DeviceMac(MaybeTagged<CoseMac0>),
 }
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
@@ -93,9 +89,7 @@ mod tests {
             cbor::from_slice(&bytes).expect("failed to parse COSE_Sign1 from bytes");
         let bytes2 = cbor::to_vec(&cose_sign1).unwrap();
         assert_eq!(bytes, bytes2);
-        let device_auth = DeviceAuth::Signature {
-            device_signature: cose_sign1,
-        };
+        let device_auth = DeviceAuth::DeviceSignature(cose_sign1);
         let bytes = cbor::to_vec(&device_auth).unwrap();
         println!("bytes {}", hex::encode(&bytes));
         let roundtripped: DeviceAuth = cbor::from_slice(&bytes).unwrap();

diff --git a/src/presentation/authentication/mdoc.rs b/src/presentation/authentication/mdoc.rs
@@ -62,7 +62,7 @@ pub fn device_authentication(
             let device_auth: &DeviceAuth = &document.device_signed.device_auth;
 
             match device_auth {
-                DeviceAuth::Signature { device_signature } => {
+                DeviceAuth::DeviceSignature(device_signature) => {
                     let detached_payload = Tag24::new(DeviceAuthentication::new(
                         session_transcript,
                         document.doc_type.clone(),
@@ -82,7 +82,7 @@ pub fn device_authentication(
                         Ok(())
                     }
                 }
-                DeviceAuth::Mac { .. } => {
+                DeviceAuth::DeviceMac(_) => {
                     Err(Error::Unsupported)
                     // send not yet supported error
                 }

diff --git a/src/presentation/device.rs b/src/presentation/device.rs
@@ -737,12 +737,8 @@ impl PreparedDocument {
             ..
         } = self;
         let device_auth = match prepared_cose {
-            PreparedCose::Sign1(inner) => DeviceAuth::Signature {
-                device_signature: inner.finalize(signature),
-            },
-            PreparedCose::Mac0(inner) => DeviceAuth::Mac {
-                device_mac: inner.finalize(signature),
-            },
+            PreparedCose::Sign1(inner) => DeviceAuth::DeviceSignature(inner.finalize(signature)),
+            PreparedCose::Mac0(inner) => DeviceAuth::DeviceMac(inner.finalize(signature)),
         };
         let device_signed = DeviceSigned {
             namespaces: device_namespaces,