chore: remove optional on topic

src/analytics/message_info.rs

@@ -9,7 +9,7 @@ pub struct MessageInfo {
     pub continent: Option<Arc<str>>,
     pub project_id: Arc<str>,
     pub client_id: Arc<str>,
-    pub topic: Option<Arc<str>>,
+    pub topic: Arc<str>,
     pub push_provider: Arc<str>,
     pub encrypted: bool,
     pub flags: u32,

src/handlers/push_message.rs

@@ -28,7 +28,7 @@
 
 #[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]
 pub struct MessagePayload {
-    pub topic: Option<String>,
+    pub topic: String,
     pub flags: u32,
     pub blob: String,
 }
@@ -138,12 +138,7 @@
     RequireValidSignature(Json(body)): RequireValidSignature<Json<PushMessageBody>>,
 ) -> Result<(axum::response::Response, Option<MessageInfo>), (Error, Option<MessageInfo>)> {
     #[cfg(feature = "analytics")]
-    let topic: Option<Arc<str>> = body
-        .payload
-        .clone()
-        .topic
-        .as_ref()
-        .map(|t| t.clone().into());
+    let topic: Arc<str> = body.payload.clone().topic.into();
 
     #[cfg(feature = "analytics")]
     let (flags, encrypted) = (body.payload.clone().flags, body.payload.is_encrypted());
@@ -242,7 +237,7 @@
                     return Err((Error::MissmatchedTenantId, analytics));
                 }
 
                 return Err((Error::MissmatchedTenantId, None));
             }
         }
 
@@ -448,5 +443,5 @@
         return Ok(((StatusCode::ACCEPTED).into_response(), analytics));
     }
 
     Ok(((StatusCode::ACCEPTED).into_response(), None))
 }

src/providers/apns.rs

@@ -87,6 +87,7 @@ impl PushProvider for ApnsProvider {
 
                 let mut notification_payload = a2::DefaultNotificationBuilder::new()
                     .set_content_available()
+                    .set_mutable_content()
                     .set_title(&blob.title)
                     .set_body(&blob.body)
                     .build(token.as_str(), opt);

src/providers/mod.rs

@@ -5,7 +5,7 @@ pub mod noop;
 
 use {
     crate::{
-        error::{self, Error::MissingTopic},
+        error::{self},
         handlers::push_message::MessagePayload,
         providers::{apns::ApnsProvider, fcm::FcmProvider},
     },
@@ -112,10 +112,6 @@ impl PushProvider for Provider {
         let s = span!(tracing::Level::INFO, "send_notification");
         let _ = s.enter();
 
-        if payload.is_encrypted() && payload.topic.is_none() {
-            return Err(MissingTopic);
-        }
-
         match self {
             Provider::Fcm(p) => p.send_notification(token, payload).await,
             Provider::Apns(p) => p.send_notification(token, payload).await,

tests/unit/messages.rs

@@ -21,7 +21,7 @@ const EXAMPLE_ENCRYPTED_BLOB: &str = "encrypted-blob";
 #[test]
 pub fn check_payload_encrypted() {
     let payload = MessagePayload {
-        topic: Some(EXAMPLE_TOPIC.to_string()),
+        topic: EXAMPLE_TOPIC.to_string(),
         flags: ENCRYPTED_FLAG,
         blob: EXAMPLE_ENCRYPTED_BLOB.to_string(),
     };
@@ -32,7 +32,7 @@ pub fn check_payload_encrypted() {
 #[test]
 pub fn check_payload_not_encrypted() {
     let payload = MessagePayload {
-        topic: None,
+        topic: EXAMPLE_TOPIC.to_string(),
         flags: 0,
         blob: EXAMPLE_CLEARTEXT_ENCODED_BLOB.to_string(),
     };
@@ -43,7 +43,7 @@ pub fn check_payload_not_encrypted() {
 #[test]
 pub fn parse_blob_from_payload() {
     let payload = MessagePayload {
-        topic: None,
+        topic: EXAMPLE_TOPIC.to_string(),
         flags: 0,
         blob: EXAMPLE_CLEARTEXT_ENCODED_BLOB.to_string(),
     };