chore: bump a2 (#320)

Cargo.toml

@@ -59,7 +59,7 @@ tracing-opentelemetry = "0.18"
 atty = "0.2"
 
 # Push
-a2 = { version = "0.9.0", features = ["tracing", "openssl"] }
+a2 = { version = "0.10.0", features = ["tracing", "openssl"] }
 fcm = "0.9"
 
 # Signature validation

src/handlers/register_client.rs

@@ -78,9 +78,9 @@ pub async fn handler(
         return Err(EmptyField("token".to_string()));
     }
 
-    let mut client_id = body.client_id.to_string();
-
-    client_id = client_id
+    let client_id = body
+        .client_id
+        .as_ref()
         .trim_start_matches(DECENTRALIZED_IDENTIFIER_PREFIX)
         .to_owned();
 

src/handlers/update_apns.rs

@@ -6,6 +6,7 @@ use {
         state::AppState,
         stores::tenant::{TenantApnsUpdateAuth, TenantApnsUpdateParams},
     },
+    a2::ClientConfig,
     axum::{
         extract::{Multipart, Path, State},
         http::HeaderMap,
@@ -220,7 +221,7 @@ pub async fn handler(
                 match a2::Client::certificate(
                     &mut std::io::Cursor::new(decoded),
                     &apns_certificate_password,
-                    a2::Endpoint::Sandbox,
+                    ClientConfig::new(a2::Endpoint::Sandbox),
                 ) {
                     Ok(_) => Ok(()),
                     Err(e) => {
@@ -240,7 +241,7 @@ pub async fn handler(
                     &mut std::io::Cursor::new(decoded),
                     apns_key_id,
                     apns_team_id,
-                    a2::Endpoint::Sandbox,
+                    ClientConfig::new(a2::Endpoint::Sandbox),
                 ) {
                     Ok(_) => Ok(()),
                     Err(e) => {

src/providers/apns.rs

@@ -1,7 +1,7 @@
 use {
     super::{LegacyPushMessage, PushMessage, RawPushMessage},
     crate::{blob::DecryptedPayloadBlob, error::Error, providers::PushProvider},
-    a2::{ErrorReason, NotificationBuilder, NotificationOptions},
+    a2::{ClientConfig, ErrorReason, NotificationBuilder, NotificationOptions},
     async_trait::async_trait,
     std::io::Read,
     tracing::{debug, info, instrument, warn},
@@ -24,7 +24,7 @@ impl ApnsProvider {
         R: Read,
     {
         Ok(ApnsProvider {
-            client: a2::Client::certificate(cert, password.as_str(), endpoint)?,
+            client: a2::Client::certificate(cert, password.as_str(), ClientConfig::new(endpoint))?,
             topic,
         })
     }
@@ -40,7 +40,7 @@ impl ApnsProvider {
         R: Read,
     {
         Ok(ApnsProvider {
-            client: a2::Client::token(pkcs8_pem, key_id, team_id, endpoint)?,
+            client: a2::Client::token(pkcs8_pem, key_id, team_id, ClientConfig::new(endpoint))?,
             topic,
         })
     }

src/providers/fcm.rs

@@ -105,7 +105,7 @@ impl Clone for FcmProvider {
     }
 
     fn clone_from(&mut self, source: &Self) {
-        self.api_key = source.api_key.clone();
+        self.api_key.clone_from(&source.api_key);
         self.client = fcm::Client::new();
     }
 }