From 8604aa483eddb302e6a894ce95a23e2b61fadf11 Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@instant.ca>
Date: Tue, 10 May 2022 14:12:25 +0200
Subject: [PATCH] acme: define trait to abstract over signer types

---
 src/lib.rs | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 2426231..b406237 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -104,7 +104,7 @@ impl Account {
         let client = Client::new(server_url).await?;
         let key = Key::generate()?;
         let nonce = client.nonce().await?;
-        let header = key.key_header(&nonce, &client.urls.new_account);
+        let header = key.header(&nonce, &client.urls.new_account);
         let body = key.signed_json(Some(account), header)?;
 
         let rsp = client
@@ -236,7 +236,7 @@ impl AccountInner {
             None => self.client.nonce().await?,
         };
 
-        let header = self.key_id_header(&nonce, url);
+        let header = self.header(&nonce, url);
         let body = self.key.signed_json(payload, header)?;
         Ok(self
             .client
@@ -247,8 +247,10 @@ impl AccountInner {
             .send()
             .await?)
     }
+}
 
-    fn key_id_header<'n, 'u: 'n, 'a: 'u>(&'a self, nonce: &'n str, url: &'u str) -> Header<'n> {
+impl Signer for AccountInner {
+    fn header<'n, 'u: 'n, 's: 'u>(&'s self, nonce: &'n str, url: &'u str) -> Header<'n> {
         Header {
             alg: self.key.signing_algorithm,
             key: KeyOrKeyId::KeyId(&self.id),
@@ -256,6 +258,10 @@ impl AccountInner {
             url,
         }
     }
+
+    fn key(&self) -> &Key {
+        &self.key
+    }
 }
 
 #[derive(Debug)]
@@ -339,8 +345,10 @@ impl Key {
             signature: base64::encode_config(signature.as_ref(), URL_SAFE_NO_PAD),
         })?))
     }
+}
 
-    fn key_header<'n, 'u: 'n, 'k: 'u>(&'k self, nonce: &'n str, url: &'u str) -> Header<'n> {
+impl Signer for Key {
+    fn header<'n, 'u: 'n, 's: 'u>(&'s self, nonce: &'n str, url: &'u str) -> Header<'n> {
         Header {
             alg: self.signing_algorithm,
             key: KeyOrKeyId::from_key(&self.inner),
@@ -348,6 +356,25 @@ impl Key {
             url,
         }
     }
+
+    fn key(&self) -> &Key {
+        self
+    }
+}
+
+trait Signer {
+    fn signed_json(
+        &self,
+        payload: Option<&impl Serialize>,
+        nonce: &str,
+        url: &str,
+    ) -> Result<Body, Error> {
+        self.key().signed_json(payload, self.header(nonce, url))
+    }
+
+    fn header<'n, 'u: 'n, 's: 'u>(&'s self, nonce: &'n str, url: &'u str) -> Header<'n>;
+
+    fn key(&self) -> &Key;
 }
 
 fn nonce_from_response(rsp: &Response) -> Option<String> {