fix: APNS Topic (#39)

.env.example

@@ -12,4 +12,5 @@ FCM_API_KEY=
 # APNS
 APNS_SANDBOX=false
 APNS_CERTIFICATE= # base64 encoded .p12 APNS Certificate
-APNS_CERTIFICATE_PASSWORD= # Password for provided certificate
+APNS_CERTIFICATE_PASSWORD= # Password for provided certificate
+APNS_TOPIC= # bundle ID/app ID

.github/workflows/cd.yml

@@ -117,6 +117,7 @@ jobs:
         env:
           TF_VAR_onepassword_vault_id: ${{ secrets.ONEPASSWORD_VAULT_ID }}
           TF_VAR_fcm_api_key: ${{ secrets.FCM_API_KEY }}
+          TF_VAR_apns_topic: ${{ secrets.APNS_TOPIC }}
           TF_VAR_apns_certificate: ${{ secrets.APNS_CERTIFICATE }}
           TF_VAR_apns_certificate_password: ${{ secrets.APNS_CERTIFICATE_PASSWORD }}
           TF_VAR_image_version: ${{ needs.get-version.outputs.version }}
@@ -155,6 +156,7 @@ jobs:
         env:
           TF_VAR_onepassword_vault_id: ${{ secrets.ONEPASSWORD_VAULT_ID }}
           TF_VAR_fcm_api_key: ${{ secrets.FCM_API_KEY }}
+          TF_VAR_apns_topic: ${{ secrets.APNS_TOPIC }}
           TF_VAR_apns_certificate: ${{ secrets.APNS_CERTIFICATE }}
           TF_VAR_apns_certificate_password: ${{ secrets.APNS_CERTIFICATE_PASSWORD }}
           TF_VAR_image_version: ${{ needs.get-version.outputs.version }}

.github/workflows/ci_terraform.yml

@@ -41,6 +41,7 @@ jobs:
         env:
           TF_VAR_onepassword_vault_id: ${{ secrets.ONEPASSWORD_VAULT_ID }}
           TF_VAR_fcm_api_key: ${{ secrets.FCM_API_KEY }}
+          TF_VAR_apns_topic: ${{ secrets.APNS_TOPIC }}
           TF_VAR_apns_certificate: ${{ secrets.APNS_CERTIFICATE }}
           TF_VAR_apns_certificate_password: ${{ secrets.APNS_CERTIFICATE_PASSWORD }}
         with:

src/env.rs

@@ -20,6 +20,7 @@ pub struct Config {
     pub apns_sandbox: bool,
     pub apns_certificate: Option<String>,
     pub apns_certificate_password: Option<String>,
+    pub apns_topic: Option<String>,
 
     // FCM
     pub fcm_api_key: Option<String>,

src/providers/apns.rs

@@ -8,19 +8,22 @@ use tracing::span;
 #[derive(Debug, Clone)]
 pub struct ApnsProvider {
     client: a2::Client,
+    topic: String,
 }
 
 impl ApnsProvider {
     pub fn new_cert<R>(
         cert: &mut R,
         password: String,
         endpoint: a2::Endpoint,
+        topic: String,
     ) -> crate::error::Result<Self>
     where
         R: Read,
     {
         Ok(ApnsProvider {
             client: a2::Client::certificate(cert, password.as_str(), endpoint)?,
+            topic
         })
     }
 }
@@ -35,7 +38,8 @@ impl PushProvider for ApnsProvider {
         let s = span!(tracing::Level::DEBUG, "send_apns_notification");
         let _ = s.enter();
 
-        let opt = a2::NotificationOptions::default();
+        let mut opt = a2::NotificationOptions::default();
+        opt.apns_topic = Some(&self.topic);
 
         // TODO set title
         let notification =

src/providers/mod.rs

@@ -83,7 +83,7 @@ impl PushProvider for Provider {
         &mut self,
         token: String,
         payload: MessagePayload,
-    ) -> crate::error::Result<()> {
+    ) -> error::Result<()> {
         let s = span!(tracing::Level::INFO, "send_notification");
         let _ = s.enter();
         match self {
@@ -104,7 +104,7 @@ pub struct Providers {
 }
 
 impl Providers {
-    pub fn new(config: &Config) -> crate::error::Result<Providers> {
+    pub fn new(config: &Config) -> error::Result<Providers> {
         let supported = config.supported_providers();
         let mut apns = None;
         if supported.contains(&ProviderKind::Apns) {
@@ -113,13 +113,13 @@ impl Providers {
                 false => a2::Endpoint::Production,
             };
             apns = Some(
-                match (&config.apns_certificate, &config.apns_certificate_password) {
-                    (Some(certificate), Some(password)) => {
+                match (&config.apns_certificate, &config.apns_certificate_password, &config.apns_topic) {
+                    (Some(certificate), Some(password), Some(topic)) => {
                         let decoded = base64::decode(certificate)?;
                         let mut reader = BufReader::new(&*decoded);
 
                         let apns_client =
-                            ApnsProvider::new_cert(&mut reader, password.clone(), endpoint)?;
+                            ApnsProvider::new_cert(&mut reader, password.clone(), endpoint, topic)?;
 
                         Ok(apns_client)
                     }
@@ -147,7 +147,7 @@ impl Providers {
 pub fn get_provider(
     provider: ProviderKind,
     state: &AppState<impl ClientStore, impl NotificationStore>,
-) -> crate::error::Result<Provider> {
+) -> error::Result<Provider> {
     let name = provider.as_str();
     let supported = state.config.supported_providers();
 

terraform/ecs/main.tf

@@ -51,6 +51,7 @@ resource "aws_ecs_task_definition" "app_task_definition" {
         { name = "TELEMETRY_GRPC_URL", value = "http://localhost:4317" },
         { name = "FCM_API_KEY", value = var.fcm_api_key },
         { name = "APNS_SANDBOX", value = terraform.workspace == "dev" ? "true" : "false" },
+        { name = "APNS_TOPIC", value = var.apns_topic },
         { name = "APNS_CERTIFICATE", value = var.apns_certificate },
         { name = "APNS_CERTIFICATE_PASSWORD", value = var.apns_certificate_password }
       ],

terraform/ecs/variables.tf

@@ -59,6 +59,10 @@ variable "fcm_api_key" {
   sensitive = true
 }
 
+variable "apns_topic" {
+  type = string
+}
+
 variable "apns_certificate" {
   type      = string
   sensitive = true

terraform/main.tf

@@ -94,6 +94,7 @@ module "ecs" {
   vpc_cidr                  = module.vpc.vpc_cidr_block
   vpc_id                    = module.vpc.vpc_id
   fcm_api_key               = var.fcm_api_key
+  apns_topic                = var.apns_topic
   apns_certificate          = var.apns_certificate
   apns_certificate_password = var.apns_certificate_password
 }

terraform/variables.tf

@@ -35,6 +35,10 @@ variable "fcm_api_key" {
   sensitive = true
 }
 
+variable "apns_topic" {
+  type = string
+}
+
 variable "apns_certificate" {
   type      = string
   sensitive = true