Merge pull request #353 from CleverTap/WEB-3474

Changes based on review
CleverTap · Feb 6, 2025 · e541417 · e541417
2 parents bc4e1ff + c02b400
commit e541417
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/clevertap.js b/clevertap.js
diff --git a/clevertap.js.map b/clevertap.js.map
diff --git a/clevertap.min.js b/clevertap.min.js
diff --git a/src/modules/notification.js b/src/modules/notification.js
@@ -296,7 +296,6 @@ export default class NotificationHandler extends Array {
     let httpsIframePath
     let apnsWebPushId
     let apnsWebPushServiceUrl
-    const vapidSupportedAndMigrated = isSafari() && ('PushManager' in window) && StorageManager.getMetaProp(VAPID_MIGRATION_PROMPT_SHOWN) && this.#fcmPublicKey !== null
 
     if (displayArgs.length === 1) {
       if (isObject(displayArgs[0])) {
@@ -363,6 +362,8 @@ export default class NotificationHandler extends Array {
       StorageManager.setMetaProp(VAPID_MIGRATION_PROMPT_SHOWN, true)
     }
 
+    const vapidSupportedAndMigrated = isSafari() && ('PushManager' in window) && StorageManager.getMetaProp(VAPID_MIGRATION_PROMPT_SHOWN) && this.#fcmPublicKey !== null
+
     // we check for the cookie in setUpChromeNotifications() the tokens may have changed
 
     if (!isHTTP) {
@@ -372,7 +373,7 @@ export default class NotificationHandler extends Array {
         return
       }
       // handle migrations from other services -> chrome notifications may have already been asked for before
-      if (Notification.permission === 'granted' && vapidSupportedAndMigrated) {
+      if (Notification.permission === 'granted' && (vapidSupportedAndMigrated || isChrome() || isFirefox())) {
         // skip the dialog and register
         this.setUpWebPushNotifications(subscriptionCallback, serviceWorkerPath, apnsWebPushId, apnsWebPushServiceUrl)
         return