[#130] Fix web push notification not show in firefox

akvo · Nov 6, 2024 · e6864db · e6864db
1 parent 3d6a863
commit e6864db
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/backend/core/socketio_config.py b/backend/core/socketio_config.py
@@ -627,6 +627,17 @@ async def client_to_user(body: str):
         )
         for subscription in subscriptions:
             try:
+                if (
+                    "updates.push.services.mozilla.com"
+                    in subscription.endpoint
+                ):
+                    VAPID_CLAIMS.update(
+                        {"aud": "https://updates.push.services.mozilla.com"}
+                    )
+                elif "fcm.googleapis.com" in subscription.endpoint:
+                    VAPID_CLAIMS.update({"aud": "https://fcm.googleapis.com"})
+                else:
+                    VAPID_CLAIMS.update({"aud": ""})
                 webpush(
                     subscription_info={
                         "endpoint": subscription.endpoint,
@@ -651,7 +662,10 @@ async def client_to_user(body: str):
                     session.delete(subscription)
                     session.commit()
                 else:
-                    logger.error("Failed to send notification:", e)
+                    logger.error(
+                        f"Failed to send notification {subscription.endpoint}:",
+                        e,
+                    )
         # EOL send push notification
 
         logger.info(

diff --git a/backend/models/subscription.py b/backend/models/subscription.py
@@ -7,7 +7,7 @@
 
 VAPID_PRIVATE_KEY = os.getenv("NEXT_PUBLIC_VAPID_PRIVATE_KEY")
 VAPID_PUBLIC_KEY = os.getenv("NEXT_PUBLIC_VAPID_PUBLIC_KEY")
-VAPID_CLAIMS = {"sub": "mailto:[email protected]"}
+VAPID_CLAIMS = {"sub": "mailto:[email protected]", "aud": ""}
 
 
 class Subscription(SQLModel, table=True):

diff --git a/backend/routes/subscription_routes.py b/backend/routes/subscription_routes.py
@@ -61,6 +61,14 @@ async def send_notification(session: Session = Depends(get_session)):
     subscriptions = session.exec(select(Subscription)).all()
     for subscription in subscriptions:
         try:
+            if "updates.push.services.mozilla.com" in subscription.endpoint:
+                VAPID_CLAIMS.update(
+                    {"aud": "https://updates.push.services.mozilla.com"}
+                )
+            elif "fcm.googleapis.com" in subscription.endpoint:
+                VAPID_CLAIMS.update({"aud": "https://fcm.googleapis.com"})
+            else:
+                VAPID_CLAIMS.update({"aud": ""})
             webpush(
                 subscription_info={
                     "endpoint": subscription.endpoint,