Merge pull request #22 from alexrudy/feature/header-render-methods

Adds .message() method to header
alexrudy · Dec 26, 2023 · 062a8de · 062a8de
2 parents 2a34f5c + 9f3c2fa
commit 062a8de
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/jose/mod.rs b/src/jose/mod.rs
@@ -336,6 +336,12 @@ where
         map.extend(parameters);
         Ok(map.into())
     }
+
+    /// The JOSE header value, serialized into compact form, used for signing.
+
+    pub(crate) fn message(&self) -> Result<String, serde_json::Error> {
+        Base64JSON(&self).serialized_value()
+    }
 }
 
 #[cfg(feature = "fmt")]

diff --git a/src/token/mod.rs b/src/token/mod.rs
@@ -463,10 +463,9 @@ specified by constraining the type of `key` when calling [`Token::sign`].
         S: SignatureEncoding,
     {
         let header = self.state.header.into_signed_header(algorithm)?;
-        let headers = Base64JSON(&header).serialized_value()?;
         let payload = self.payload.serialized_value()?;
         let signature = algorithm
-            .try_sign_token(&headers, &payload)
+            .try_sign_token(&header.message()?, &payload)
             .map_err(TokenSigningError::Signing)?;
         Ok(Token {
             payload: self.payload,
@@ -492,10 +491,9 @@ specified by constraining the type of `key` when calling [`Token::sign`].
         S: SignatureEncoding,
     {
         let header = self.state.header.into_signed_header(algorithm)?;
-        let headers = Base64JSON(&header).serialized_value()?;
         let payload = self.payload.serialized_value()?;
         let signature = algorithm
-            .try_sign_token(&headers, &payload, rng)
+            .try_sign_token(&header.message()?, &payload, rng)
             .map_err(TokenSigningError::Signing)?;
         Ok(Token {
             payload: self.payload,