removing enable api testing

src/modules/notification.js

@@ -6,7 +6,7 @@ import {
 import {
   urlBase64ToUint8Array
 } from '../util/encoder'
-import { enablePush } from './webPushPrompt/prompt'
+import { setNotificationHandlerValues, processSoftPrompt } from './webPushPrompt/prompt'
 
 export default class NotificationHandler extends Array {
   #oldValues
@@ -31,14 +31,23 @@ export default class NotificationHandler extends Array {
     this.#account = account
   }
 
-  push (...displayArgs) {
+  setupWebPush (displayArgs) {
     this.#setUpWebPush(displayArgs)
-    return 0
   }
 
-  enable (options = {}) {
-    const { swPath, skipDialog } = options
-    enablePush(this.#logger, this.#account, this.#request, swPath, skipDialog)
+  push (...displayArgs) {
+    const isWebPushConfigPresent = StorageManager.readFromLSorCookie('webPushConfigResponseReceived')
+    setNotificationHandlerValues({
+      logger: this.#logger,
+      account: this.#account,
+      request: this.#request,
+      displayArgs
+    })
+    if (isWebPushConfigPresent) {
+      processSoftPrompt()
+    } else {
+      StorageManager.saveToLSorCookie('notificationPushCalled', true)
+    }
   }
 
   _processOldValues () {
@@ -138,6 +147,9 @@ export default class NotificationHandler extends Array {
           subscribeObj.applicationServerKey = urlBase64ToUint8Array(this.#fcmPublicKey)
         }
 
+        const softPromptCard = document.getElementById('pnWrapper')
+        const oldSoftPromptCard = document.getElementById('wzrk_wrapper')
+
         serviceWorkerRegistration.pushManager.subscribe(subscribeObj)
           .then((subscription) => {
             this.#logger.info('Service Worker registered. Endpoint: ' + subscription.endpoint)
@@ -160,11 +172,19 @@ export default class NotificationHandler extends Array {
               subscriptionCallback()
             }
             const existingBellWrapper = document.getElementById('bell_wrapper')
+
             if (existingBellWrapper) {
               existingBellWrapper.parentNode.removeChild(existingBellWrapper)
             }
+            if (softPromptCard) {
+              softPromptCard.parentNode.removeChild(softPromptCard)
+            }
+            if (oldSoftPromptCard) {
+              oldSoftPromptCard.parentNode.removeChild(oldSoftPromptCard)
+            }
           }).catch((error) => {
             // unsubscribe from webpush if error
+            console.log('rejected subscription')
             serviceWorkerRegistration.pushManager.getSubscription().then((subscription) => {
               if (subscription !== null) {
                 subscription.unsubscribe().then((successful) => {
@@ -180,6 +200,12 @@ export default class NotificationHandler extends Array {
               }
             })
             this.#logger.error('Error subscribing: ' + error)
+            if (softPromptCard) {
+              softPromptCard.parentNode.removeChild(softPromptCard)
+            }
+            if (oldSoftPromptCard) {
+              oldSoftPromptCard.parentNode.removeChild(oldSoftPromptCard)
+            }
           })
       }).catch((err) => {
         this.#logger.error('error registering service worker: ' + err)

src/modules/webPushPrompt/prompt.js

@@ -1,12 +1,24 @@
 import { getBellIconStyles, getBoxPromptStyles } from './promptStyles.js'
 import { WEBPUSH_CONFIG } from '../../util/constants.js'
+import { isObject } from '../../util/datatypes.js'
 import { StorageManager, $ct } from '../../util/storage.js'
 import NotificationHandler from '../notification.js'
 import { BELL_BASE64, PROMPT_BELL_BASE64 } from './promptConstants.js'
 
 let appServerKey = null
 let swPath = '/clevertap_sw.js'
 let notificationHandler = null
+let logger = null
+let account = null
+let request = null
+let displayArgs = null
+
+export const setNotificationHandlerValues = (notificationValues = {}) => {
+  logger = notificationValues.logger
+  account = notificationValues.account
+  request = notificationValues.request
+  displayArgs = notificationValues.displayArgs
+}
 
 export const processWebPushConfig = (webPushConfig, logger, request) => {
   const _pushConfig = StorageManager.readFromLSorCookie(WEBPUSH_CONFIG) || {}
@@ -21,7 +33,41 @@ export const processWebPushConfig = (webPushConfig, logger, request) => {
     enablePush(logger, null, request)
   } else if (JSON.stringify(_pushConfig) !== JSON.stringify(webPushConfig)) {
     updatePushConfig()
+    StorageManager.saveToLSorCookie('webPushConfigResponseReceived', true)
+    const isNotificationPushCalled = StorageManager.readFromLSorCookie('notificationPushCalled')
+    if (isNotificationPushCalled) {
+      processSoftPrompt()
+    }
+  }
+}
+
+export const processSoftPrompt = () => {
+  const webPushConfig = StorageManager.readFromLSorCookie(WEBPUSH_CONFIG) || {}
+  const notificationHandler = new NotificationHandler({ logger, session: {}, request, account })
+  if (!(Object.keys(webPushConfig).length > 0)) {
+    notificationHandler.setApplicationServerKey(appServerKey)
+    notificationHandler.setupWebPush(displayArgs)
+    return 0
+  }
+  const { showBox, showBellIcon, boxType } = webPushConfig
+  const { serviceWorkerPath, skipDialog } = parseDisplayArgs(displayArgs)
+  if (showBellIcon || (showBox && boxType === 'new')) {
+    enablePush(logger, account, request, serviceWorkerPath, skipDialog)
+  }
+
+  if (showBox && boxType === 'old') {
+    notificationHandler.setApplicationServerKey(appServerKey)
+    notificationHandler.setupWebPush(displayArgs)
+  }
+}
+
+export const parseDisplayArgs = (displayArgs) => {
+  if (displayArgs.length === 1 && isObject(displayArgs[0])) {
+    const { serviceWorkerPath, skipDialog } = displayArgs[0]
+    return { serviceWorkerPath, skipDialog }
   }
+
+  return { serviceWorkerPath: undefined, skipDialog: displayArgs[5] }
 }
 
 export const enablePush = (logger, account, request, customSwPath, skipDialog) => {
@@ -34,6 +80,10 @@ export const enablePush = (logger, account, request, customSwPath, skipDialog) =
 
   if (customSwPath) { swPath = customSwPath }
 
+  if (skipDialog === null) {
+    skipDialog = false
+  }
+
   notificationHandler = new NotificationHandler({ logger, session: {}, request, account })
 
   if (skipDialog) {