From ec03ab632e85be114fd15462fce9c6ae946fb9d8 Mon Sep 17 00:00:00 2001
From: an_ifrah24 <137814364+ifrah-ashraf@users.noreply.github.com>
Date: Sun, 19 Oct 2025 00:00:12 +0530
Subject: [PATCH] fix: make vapid optional to prevent api failure at
 initialisation (#24469)

* fix: added optional check for VAPID keys

* fix: added extra check for vapid to prevent runtime error

* fix: added consistent logger across the file

* Apply suggestion from @keithwillcode

---------

Co-authored-by: Keith Williams <keithwillcode@gmail.com>
---
 .../notifications/sendNotification.ts         | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/packages/features/notifications/sendNotification.ts b/packages/features/notifications/sendNotification.ts
index ab04353e1b..8c382df0ac 100644
--- a/packages/features/notifications/sendNotification.ts
+++ b/packages/features/notifications/sendNotification.ts
@@ -1,12 +1,26 @@
+import { Logger } from "@nestjs/common";
 import webpush from "web-push";
 
+const logger = new Logger("WebPush");
+let isVapidConfigured = false;
+
 const vapidKeys = {
   publicKey: process.env.NEXT_PUBLIC_VAPID_PUBLIC_KEY || "",
   privateKey: process.env.VAPID_PRIVATE_KEY || "",
 };
 
-// The mail to email address should be the one at which push service providers can reach you. It can also be a URL.
-webpush.setVapidDetails("mailto:support@cal.com", vapidKeys.publicKey, vapidKeys.privateKey);
+if (vapidKeys.publicKey && vapidKeys.privateKey) {
+  try {
+    // The mail to email address should be the one at which push service providers can reach you. It can also be a URL.
+    webpush.setVapidDetails("mailto:support@cal.com", vapidKeys.publicKey, vapidKeys.privateKey);
+    logger.log("VAPID keys loaded. Web push enabled.");
+    isVapidConfigured = true;
+  } catch (err) {
+    logger.error("Failed to initialize web push", err);
+  }
+} else {
+  logger.warn("Missing VAPID keys. Web push notifications are disabled.");
+}
 
 type Subscription = {
   endpoint: string;
@@ -35,6 +49,10 @@ export const sendNotification = async ({
   requireInteraction?: boolean;
   type?: string;
 }) => {
+  if (!isVapidConfigured) {
+    logger.error("Cannot send notification. VAPID keys not configured.");
+    return;
+  }
   try {
     const payload = JSON.stringify({
       title,
@@ -50,6 +68,6 @@ export const sendNotification = async ({
     });
     await webpush.sendNotification(subscription, payload);
   } catch (error) {
-    console.error("Error sending notification", error);
+    logger.error("Error sending notification", error);
   }
 };