fix(rust/signed-doc): update KID to use catalyst-id type

Author: saibatizoku

rust/signed_doc/examples/mk_signed_doc.rs

@@ -8,7 +8,7 @@ use std::{
     path::PathBuf,
 };
 
-use catalyst_signed_doc::{Builder, CatalystSignedDocument, KidUri, Metadata};
+use catalyst_signed_doc::{Builder, CatalystSignedDocument, IdUri, Metadata};
 use clap::Parser;
 use ed25519_dalek::pkcs8::{DecodePrivateKey, DecodePublicKey};
 
@@ -39,7 +39,7 @@ enum Cli {
         /// Path to the secret key in PEM format
         sk: PathBuf,
         /// Signer kid
-        kid: KidUri,
+        kid: IdUri,
     },
     /// Inspects Catalyst Signed Document
     Inspect {
@@ -59,7 +59,7 @@ enum Cli {
         /// Path to the verifying key in PEM format
         pk: PathBuf,
         /// Signer kid
-        kid: KidUri,
+        kid: IdUri,
     },
 }
 

rust/signed_doc/src/builder.rs

@@ -1,5 +1,5 @@
 //! Catalyst Signed Document Builder.
-use catalyst_types::kid_uri::KidUri;
+use catalyst_types::id_uri::IdUri;
 use ed25519_dalek::{ed25519::signature::Signer, SecretKey};
 
 use crate::{CatalystSignedDocument, Content, InnerCatalystSignedDocument, Metadata, Signatures};
@@ -50,7 +50,7 @@ impl Builder {
     /// Fails if a `CatalystSignedDocument` cannot be created due to missing metadata or
     /// content, due to malformed data, or when the signed document cannot be
     /// converted into `coset::CoseSign`.
-    pub fn add_signature(self, sk: SecretKey, kid: KidUri) -> anyhow::Result<Self> {
+    pub fn add_signature(self, sk: SecretKey, kid: IdUri) -> anyhow::Result<Self> {
         let cose_sign = self
             .clone()
             .build()

rust/signed_doc/src/lib.rs

@@ -21,7 +21,7 @@ use ed25519_dalek::VerifyingKey;
 use error::CatalystSignedDocError;
 pub use metadata::{DocumentRef, ExtraFields, Metadata, UuidV4, UuidV7};
 pub use minicbor::{decode, encode, Decode, Decoder, Encode};
-pub use signature::{KidUri, Signatures};
+pub use signature::{IdUri, Signatures};
 use utils::context::DecodeSignDocCtx;
 
 /// Inner type that holds the Catalyst Signed Document with parsing errors.
@@ -114,7 +114,7 @@ impl CatalystSignedDocument {
     /// Returns a report of verification failures and the source error.
     #[allow(clippy::indexing_slicing)]
     pub fn verify<P>(&self, pk_getter: P) -> Result<(), CatalystSignedDocError>
-    where P: Fn(&KidUri) -> VerifyingKey {
+    where P: Fn(&IdUri) -> VerifyingKey {
         let error_report = ProblemReport::new("Catalyst Signed Document Verification");
 
         match self.as_cose_sign() {
@@ -386,11 +386,11 @@ mod tests {
         let pk = sk.verifying_key();
 
         let kid_str = format!(
-            "kid.catalyst-rbac://cardano/{}/0/0",
+            "id.catalyst://cardano/{}/0/0",
             base64_url::encode(pk.as_bytes())
         );
 
-        let kid = KidUri::from_str(&kid_str).unwrap();
+        let kid = IdUri::from_str(&kid_str).unwrap();
         let (_, _, metadata) = test_metadata().unwrap();
         let signed_doc = Builder::new()
             .with_decoded_content(content)

rust/signed_doc/src/signature/mod.rs

@@ -1,15 +1,15 @@
 //! Catalyst Signed Document COSE Signature information.
 
 use anyhow::bail;
-pub use catalyst_types::kid_uri::KidUri;
+pub use catalyst_types::id_uri::IdUri;
 use catalyst_types::problem_report::ProblemReport;
 use coset::CoseSignature;
 
 /// Catalyst Signed Document COSE Signature.
 #[derive(Debug, Clone)]
 pub struct Signature {
     /// Key ID
-    kid: KidUri,
+    kid: IdUri,
     /// COSE Signature
     signature: CoseSignature,
 }
@@ -27,7 +27,7 @@ impl Signatures {
 
     /// List of signature Key IDs.
     #[must_use]
-    pub fn kids(&self) -> Vec<KidUri> {
+    pub fn kids(&self) -> Vec<IdUri> {
         self.0.iter().map(|sig| sig.kid.clone()).collect()
     }
 
@@ -38,7 +38,7 @@ impl Signatures {
     }
 
     /// Add a new signature
-    pub fn push(&mut self, kid: KidUri, signature: CoseSignature) {
+    pub fn push(&mut self, kid: IdUri, signature: CoseSignature) {
         self.0.push(Signature { kid, signature });
     }
 
@@ -65,14 +65,14 @@ impl Signatures {
             .cloned()
             .enumerate()
             .for_each(|(idx, signature)| {
-                match KidUri::try_from(signature.protected.header.key_id.as_ref()) {
+                match IdUri::try_from(signature.protected.header.key_id.as_ref()) {
                     Ok(kid) => signatures.push(Signature { kid, signature }),
                     Err(e) => {
                         error_report.conversion_error(
                             &format!("COSE signature protected header key ID at id {idx}"),
                             &format!("{:?}", &signature.protected.header.key_id),
                             &format!("{e:?}"),
-                            "Converting COSE signature header key ID to KidUri",
+                            "Converting COSE signature header key ID to IdUri",
                         );
                     },
                 }