fix: ensure all data provided

.env.example

@@ -36,4 +36,10 @@ FCM_API_KEY=
 # APNS
 APNS_CERTIFICATE= # base64 encoded .p12 APNS Certificate
 APNS_CERTIFICATE_PASSWORD= # Password for provided certificate
-APNS_TOPIC= # bundle ID/app ID
+APNS_TOPIC= # bundle ID/app ID
+
+# Analytics
+ANALYTICS_S3_ENDPOINT=
+ANALYTICS_EXPORT_BUCKET=
+ANALYTICS_GEOIP_DB_BUCKET=
+ANALYTICS_GEOIP_DB_KEY=

src/handlers/push_message.rs

@@ -3,8 +3,8 @@
         analytics::message_info::MessageInfo,
         blob::ENCRYPTED_FLAG,
         error::{
+            Error,
             Error::{ClientNotFound, Store},
-            Result,
         },
         handlers::DECENTRALIZED_IDENTIFIER_PREFIX,
         increment_counter,
@@ -51,7 +51,7 @@
     StateExtractor(state): StateExtractor<Arc<AppState>>,
     headers: HeaderMap,
     RequireValidSignature(Json(body)): RequireValidSignature<Json<PushMessageBody>>,
-) -> Result<axum::response::Response> {
+) -> Result<axum::response::Response, Error> {
     let res = handler_internal(
         Path((tenant_id.clone(), id.clone())),
         StateExtractor(state.clone()),
@@ -60,35 +60,31 @@
     )
     .await;
 
     let request_id = get_req_id(&headers);
 
     let (status, response, analytics_option) = match res {
         Ok((res, analytics_options_inner)) => (res.status().as_u16(), res, analytics_options_inner),
-        Err(error) => {
+        Err((error, analytics_option_inner)) => {
             #[cfg(feature = "analytics")]
             let error_str = format!("{:?}", &error);
             let res = error.into_response();
             let status_code = res.status().clone().as_u16();
 
-            #[cfg(feature = "analytics")]
-            let analytics_option = Some(MessageInfo {
-                msg_id: body.clone().id.into(),
-                region: None,
-                country: None,
-                continent: None,
-                project_id: tenant_id.clone().into(),
-                client_id: id.clone().into(),
-                topic: None,
-                push_provider: "unknown".into(),
-                encrypted: false,
-                flags: body.clone().payload.flags,
-                status: status_code,
-                response_message: Some(error_str.into()),
-                received_at: Default::default(),
-            });
+            let mut analytics_option = None;
+            if let Some(analytics_unwrapped) = analytics_option_inner {
+                #[cfg(feature = "analytics")]
+                {
+                    analytics_option = Some(MessageInfo {
+                        response_message: Some(error_str.into()),
+                        ..analytics_unwrapped
+                    });
+                }
 
-            #[cfg(not(feature = "analytics"))]
-            let analytics_option = None;
+                #[cfg(not(feature = "analytics"))]
+                {
+                    analytics_option = Some(analytics_unwrapped);
+                }
+            }
 
             (status_code, res, analytics_option)
         }
@@ -133,7 +129,7 @@
     StateExtractor(state): StateExtractor<Arc<AppState>>,
     headers: HeaderMap,
     RequireValidSignature(Json(body)): RequireValidSignature<Json<PushMessageBody>>,
-) -> Result<(axum::response::Response, Option<MessageInfo>)> {
+) -> Result<(axum::response::Response, Option<MessageInfo>), (Error, Option<MessageInfo>)> {
     #[cfg(feature = "analytics")]
     let topic: Option<Arc<str>> = body
         .payload
@@ -149,10 +145,33 @@
         Ok(c) => Ok(c),
         Err(StoreError::NotFound(_, _)) => Err(ClientNotFound),
         Err(e) => Err(Store(e)),
-    }?;
+    }
+    .map_err(|e| {
+        (
+            e,
+            #[cfg(feature = "analytics")]
+            Some(MessageInfo {
+                msg_id: body.id.clone().into(),
+                region: None,
+                country: None,
+                continent: None,
+                project_id: tenant_id.clone().into(),
+                client_id: id.clone().into(),
+                topic: topic.clone(),
+                push_provider: "unknown".into(),
+                encrypted,
+                flags,
+                status: 0,
+                response_message: None,
+                received_at: gorgon::time::now(),
+            }),
+            #[cfg(not(feature = "analytics"))]
+            None,
+        )
+    })?;
 
     #[cfg(feature = "analytics")]
-    let mut analytics = MessageInfo {
+    let mut analytics = Some(MessageInfo {
         msg_id: body.id.clone().into(),
         region: None,
         country: None,
@@ -166,7 +185,10 @@
         status: 0,
         response_message: None,
         received_at: gorgon::time::now(),
-    };
+    });
+
+    #[cfg(not(feature = "analytics"))]
+    let analytics = None;
 
     let request_id = get_req_id(&headers);
 
@@ -199,20 +221,25 @@
 
         #[cfg(feature = "analytics")]
         {
-            analytics.response_message = Some("Notification has already been received".into());
+            analytics = Some(MessageInfo {
+                response_message: Some("Notification has already been received".into()),
+                ..analytics.unwrap()
+            });
         }
 
         #[cfg(not(feature = "analytics"))]
         return Ok(((StatusCode::OK).into_response(), None));
 
         #[cfg(feature = "analytics")]
-        return Ok(((StatusCode::OK).into_response(), Some(analytics)));
+        return Ok(((StatusCode::OK).into_response(), analytics));
     }
 
     let notification = state
         .notification_store
         .create_or_update_notification(&body.id, &tenant_id, &id, &body.payload)
-        .await?;
+        .await
+        .map_err(|e| (Error::Store(e), analytics.clone()))?;
+
     info!(
         %request_id,
         %tenant_id,
@@ -235,17 +262,24 @@
 
         #[cfg(feature = "analytics")]
         {
-            analytics.response_message = Some("Notification has already been processed".into());
+            analytics = Some(MessageInfo {
+                response_message: Some("Notification has already been processed".into()),
+                ..analytics.unwrap()
+            });
         }
 
         #[cfg(not(feature = "analytics"))]
         return Ok(((StatusCode::OK).into_response(), None));
 
         #[cfg(feature = "analytics")]
-        return Ok(((StatusCode::OK).into_response(), Some(analytics)));
+        return Ok(((StatusCode::OK).into_response(), analytics));
     }
 
-    let tenant = state.tenant_store.get_tenant(&tenant_id).await?;
+    let tenant = state
+        .tenant_store
+        .get_tenant(&tenant_id)
+        .await
+        .map_err(|e| (e, analytics.clone()))?;
     debug!(
         %request_id,
         %tenant_id,
@@ -254,7 +288,9 @@
         "fetched tenant"
     );
 
-    let mut provider = tenant.provider(&client.push_type)?;
+    let mut provider = tenant
+        .provider(&client.push_type)
+        .map_err(|e| (e, analytics.clone()))?;
     debug!(
         %request_id,
         %tenant_id,
@@ -266,7 +302,8 @@
 
     provider
         .send_notification(client.token, body.payload)
-        .await?;
+        .await
+        .map_err(|e| (e, analytics.clone()))?;
 
     info!(
         %request_id,
@@ -287,11 +324,14 @@
 
     #[cfg(feature = "analytics")]
     {
-        analytics.response_message = Some("Delivered".into());
+        analytics = Some(MessageInfo {
+            response_message: Some("Delivered".into()),
+            ..analytics.unwrap()
+        });
     }
 
     #[cfg(feature = "analytics")]
-    return Ok(((StatusCode::ACCEPTED).into_response(), Some(analytics)));
+    return Ok(((StatusCode::ACCEPTED).into_response(), analytics));
 
     #[cfg(not(feature = "analytics"))]
     Ok(((StatusCode::ACCEPTED).into_response(), None))

src/handlers/single_tenant_wrappers.rs

@@ -27,7 +27,7 @@ pub async fn delete_handler(
     #[cfg(feature = "multitenant")]
     return Err(MissingTenantId);
 
-    #[cfg(all(not(feature = "multitenant")))]
+    #[cfg(not(feature = "multitenant"))]
     crate::handlers::delete_client::handler(
         Path((DEFAULT_TENANT_ID.to_string(), id)),
         state,

src/lib.rs

@@ -37,6 +37,7 @@ pub mod analytics;
 #[cfg(not(feature = "analytics"))]
 pub mod analytics {
     pub mod message_info {
+        #[derive(Debug, Clone, serde::Serialize)]
         pub struct MessageInfo;
     }
 }