feat: Misc Changes from Mozilla Services

Most changes have been captured in this PR, however some might have been missed if so please open a new PR and I'll review ASAP

Co-authored-by: Mark Drobnak <mdrobnak@mozilla.com>
Co-authored-by: Julius de Bruijn <bruijn@prisma.io>
Co-authored-by: Julius de Bruijn <julius+github@nauk.io>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Rich Neswold <neswold@fnal.gov>
Co-authored-by: Alex Hortopan <alex@hortopan.com>
Co-authored-by: Harry Bairstow <h.bairstow22@gmail.com>
Co-authored-by: Austin Evans <austinjevans@me.com>
Co-authored-by: Harry Bairstow <me@harryet.xyz>

examples/certificate_client.rs

@@ -54,7 +54,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     let client = new_client()?;
 
     let options = NotificationOptions {
-        apns_topic: topic.as_ref().map(|s| &**s),
+        apns_topic: topic.as_deref(),
         ..Default::default()
     };
 

examples/token_client.rs

@@ -51,7 +51,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
     let client = Client::token(&mut private_key, key_id, team_id, endpoint).unwrap();
 
     let options = NotificationOptions {
-        apns_topic: topic.as_ref().map(|s| &**s),
+        apns_topic: topic.as_deref(),
         ..Default::default()
     };
 

src/client.rs

@@ -149,7 +149,7 @@ impl Client {
             builder = builder.header("apns-expiration", apns_expiration.to_string().as_bytes());
         }
         if let Some(ref apns_collapse_id) = payload.options.apns_collapse_id {
-            builder = builder.header("apns-collapse-id", apns_collapse_id.value.to_string().as_bytes());
+            builder = builder.header("apns-collapse-id", apns_collapse_id.value.as_bytes());
         }
         if let Some(apns_topic) = payload.options.apns_topic {
             builder = builder.header("apns-topic", apns_topic.as_bytes());

src/error.rs

@@ -1,5 +1,4 @@
-//! Error and result module
-
+///! Error and result module
 use crate::{response::Response, signer::SignerError};
 use std::io;
 use thiserror::Error;

src/request/notification.rs

@@ -1,5 +1,4 @@
-//! The `aps` notification content builders
-
+///! The `aps` notification content builders
 mod default;
 mod options;
 mod web;

src/request/notification/default.rs

@@ -3,7 +3,7 @@ use crate::request::payload::{APSAlert, Payload, APS};
 
 use std::{borrow::Cow, collections::BTreeMap};
 
-#[derive(Serialize, Debug, Clone)]
+#[derive(Deserialize, Serialize, Debug, Clone)]
 #[serde(rename_all = "kebab-case")]
 pub struct DefaultAlert<'a> {
     #[serde(skip_serializing_if = "Option::is_none")]

src/request/notification/options.rs

@@ -20,7 +20,7 @@ impl<'a> CollapseId<'a> {
 }
 
 /// Headers to specify options to the notification.
-#[derive(Debug, Clone, Default)]
+#[derive(Debug, Default, Clone)]
 pub struct NotificationOptions<'a> {
     /// A canonical UUID that identifies the notification. If there is an error
     /// sending the notification, APNs uses this value to identify the

src/request/notification/web.rs

@@ -2,7 +2,7 @@ use crate::request::notification::{NotificationBuilder, NotificationOptions};
 use crate::request::payload::{APSAlert, Payload, APS};
 use std::collections::BTreeMap;
 
-#[derive(Serialize, Debug, Clone)]
+#[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(rename_all = "kebab-case")]
 pub struct WebPushAlert<'a> {
     pub title: &'a str,
@@ -104,7 +104,7 @@ mod tests {
                 title: "Hello",
                 body: "world",
             },
-            &vec!["arg1"],
+            &["arg1"],
         )
         .build("device-token", Default::default())
         .to_json_string()

src/request/payload.rs

@@ -1,5 +1,4 @@
-//! Payload with `aps` and custom data
-
+///! Payload with `aps` and custom data
 use crate::error::Error;
 use crate::request::notification::{DefaultAlert, NotificationOptions, WebPushAlert};
 use erased_serde::Serialize;
@@ -91,7 +90,7 @@ impl<'a> Payload<'a> {
 }
 
 /// The pre-defined notification data.
-#[derive(Serialize, Debug, Clone)]
+#[derive(Serialize, Default, Debug, Clone)]
 #[serde(rename_all = "kebab-case")]
 #[allow(clippy::upper_case_acronyms)]
 pub struct APS<'a> {