chore(condo): DOMA-12992 small review fix and rebase with new adapter

Author: YEgorLu

apps/condo/domains/notification/adapters/oneSignalAdapter.js

@@ -148,14 +148,14 @@ class OneSignalAdapter {
      * Prepares notification for either/both sending to FireBase and/or emulation if FAKE tokens present
      * Converts single notification to notifications array (for multiple tokens provided) for batch request
      * @param notificationRaw
-     * @param data
+     * @param dataByToken
      * @param tokens
      * @param pushTypes
      * @param isVoIP
      * @param appIds
      * @returns {[import('@onesignal/node-onesignal').Notification[], import('@onesignal/node-onesignal').Notification[], {}]}
      */
-    static prepareBatchData (notificationRaw, data, tokens = [], pushTypes = {}, isVoIP = false, appIds = {}) {
+    static prepareBatchData (notificationRaw, dataByToken, tokens = [], pushTypes = {}, isVoIP = false, appIds = {}) {
         const notification = OneSignalAdapter.validateAndPrepareNotification(notificationRaw)
         const notifications = []
         const fakeNotifications = []
@@ -165,9 +165,11 @@ class OneSignalAdapter {
             const isFakeToken = pushToken.startsWith(PUSH_FAKE_TOKEN_SUCCESS) || pushToken.startsWith(PUSH_FAKE_TOKEN_FAIL)
             const target = isFakeToken ? fakeNotifications : notifications
             const pushType = pushTypes[pushToken] || PUSH_TYPE_DEFAULT
-            const preparedData = OneSignalAdapter.prepareData(data)
             const appId = appIds[pushToken]
 
+            const preparedData = dataByToken[pushToken]
+            if (!preparedData) return
+
             const pushData = pushType === PUSH_TYPE_SILENT_DATA
                 ? {
                     token: pushToken,
@@ -252,19 +254,19 @@ class OneSignalAdapter {
      * Sends notifications in parallel through provider for each appId + unique notification body
      * @param notification
      * @param tokens
-     * @param data
+     * @param dataByToken
      * @param pushTypes
      * @param appIds - Object mapping pushToken to appId for routing notifications to the correct OneSignal app
      * @param metaByToken
      * @param isVoIP
      * @returns {Promise<null|(boolean|T|{state: string, error: *})[]>}
      */
-    async sendNotification ({ notification, data, tokens, pushTypes, appIds, metaByToken } = {}, isVoIP = false) {
+    async sendNotification ({ notification, dataByToken, tokens, pushTypes, appIds, metaByToken } = {}, isVoIP = false) {
         if (!tokens || isEmpty(tokens)) return [false, { error: 'No pushTokens available.' }]
 
         const [notifications, fakeNotifications, pushContext] = OneSignalAdapter.prepareBatchData(
             notification,
-            data,
+            dataByToken,
             tokens,
             pushTypes,
             isVoIP,

apps/condo/domains/notification/utils/serverSchema/push/encryption.js

@@ -11,13 +11,15 @@
  */
 
 /**
- * @typedef Encryptor
- * @type {(data: Record<string, unknown>, options?: EncryptorOptions) => EncryptorResult}
+ * @func Encryptor
+ * @param data {Record<string, unknown>}
+ * @param options {EncryptorOptions | undefined}
+ * @returns EncryptorResult
  */
 
-/** @type {Encryptor} */
-const v1 = (data, options) => {
+function v1 (data, options) {
     if (!options?.appId?.length) return null
+    if (!data) return null
     const buf = Buffer.from(JSON.stringify(data), 'utf8')
     const keyBuf = Buffer.from(options.appId, 'utf8')
     const encryptedData = Buffer.from(buf.map((b, i) => b ^ keyBuf[i % keyBuf.length])).toString('base64')
@@ -38,7 +40,11 @@ const VERSIONS = {
  */
 function encryptPushData (version, data, options = {}) {
     if (!VERSIONS[version]) return null
-    return VERSIONS[version](data, options)
+    try {
+        return VERSIONS[version](data, options)
+    } catch {
+        return null
+    }
 }
 
 module.exports = {

apps/condo/domains/notification/utils/serverSchema/push/helpers.js

@@ -2,8 +2,14 @@ const isEmpty = require('lodash/isEmpty')
 
 const { find } = require('@open-condo/keystone/schema')
 
-const { PUSH_TRANSPORT_FIREBASE, PUSH_TRANSPORT_REDSTORE, PUSH_TRANSPORT_HUAWEI, PUSH_TRANSPORT_APPLE,
-    PUSH_TRANSPORT_WEBHOOK, PUSH_TRANSPORT_TYPES,
+const {
+    PUSH_TRANSPORT_FIREBASE,
+    PUSH_TRANSPORT_REDSTORE,
+    PUSH_TRANSPORT_HUAWEI,
+    PUSH_TRANSPORT_APPLE,
+    PUSH_TRANSPORT_WEBHOOK,
+    PUSH_TRANSPORT_ONESIGNAL,
+    PUSH_TRANSPORT_TYPES,
 } = require('@condo/domains/notification/constants/constants')
 
 /**
@@ -50,6 +56,7 @@ async function getTokens (ownerId, remoteClientId, isVoIP = false) {
         [PUSH_TRANSPORT_HUAWEI]: [],
         [PUSH_TRANSPORT_APPLE]: [],
         [PUSH_TRANSPORT_WEBHOOK]: [],
+        [PUSH_TRANSPORT_ONESIGNAL]: [],
     }
     const pushTypes = {}
     const appIds = {}