@inngageregistry/inngage-react 2.2.8 → 2.3.2

package/ListenToNotifications.js

@@ -5,6 +5,7 @@ import DeviceInfo from 'react-native-device-info'
 import { showAlert, showAlertLink } from './utils'
 import { notificationApi } from './inngageApi'
 import AsyncStorage from '@react-native-async-storage/async-storage';
+import PushNotification from 'react-native-push-notification'
 
 export const linkInApp = (link) => {
   InAppBrowser.open(link, {
@@ -38,10 +39,7 @@ export const openCommonNotification = (notificationData) => {
   if (!data || (data && !Object.keys(data).length)) {
     return
   }
-  const { notId, title, body, type, url, picture } = data
-  // if (picture) {
-  //   return openRichNotification(notificationData)
-  // }
+  const { notId, title, body, type, url } = data
   const request = {
     notificationRequest: {
       id: notId,
@@ -49,78 +47,29 @@ export const openCommonNotification = (notificationData) => {
     },
   }
   if (!url) {
-    if (enableAlert && state === 'foreground') {
-      return notificationApi(request, dev).then(() => {
-        if (enableAlert) {
-          showAlert(title, body)
-        }
-      }).catch(console.log)
-    } else if (!enableAlert) {
-      return
-    } else {
-      return notificationApi(request, dev).then(() => {
-        if (enableAlert) {
-          showAlert(title, body)
-        }
-      }).catch(console.log)
-    }
+    
+    return notificationApi(request, dev).then(() => {
+       
+    }).catch(console.log)
+
   }
   return Linking.canOpenURL(url).then((supported) => {
     if (supported) {
-      if (enableAlert) {
-        showAlertLink(
-          title,
-          body,
-          `${DeviceInfo.getApplicationName()}`,
-          `Acessar ${url} ?`,
-        ).then((response) => { supported && openLinkByType(type, url) })
-        notificationApi(request, dev)
-      } else {
+     
         supported && openLinkByType(type, url)
-      }
+      
     }
   }).catch(console.log)
 }
 export const openRichNotification = (notificationData) => {
-  //console.log("Rich push", notificationData)
-  //Rich push code
 }
 
 
 
-export default async ({ appToken, dev, enableAlert }) => {
+export default async ({ appToken, dev, enableAlert, onNotificationOpenedApp }) => {
   var messageArray = [];
 
-  firebase.messaging().onNotificationOpenedApp(async (remoteMessage) => {
-    console.log("Notification Oppened")
-    openCommonNotification({ appToken, dev, remoteMessage, enableAlert, state: 'Background' })
-  });
-
-  messaging().getInitialNotification(async (remoteMessage) => {
-    console.log("from quit")
-  })
-
-  firebase.messaging().onMessage(async (remoteMessage) => {
-    console.log('Push received: Foreground')
-    if (remoteMessage != null && remoteMessage.data.additional_data) {
-      let msg = JSON.parse(remoteMessage.data.additional_data)
-      if (msg.inapp_message == true) {
-        const currentMessages = await AsyncStorage.getItem('inngage');
-        if (currentMessages !== null) {
-          messageArray = JSON.parse(currentMessages);
-        }
-        messageArray.push(remoteMessage);
-        await AsyncStorage.setItem('inngage', JSON.stringify(messageArray));
-      }
-    } else if (remoteMessage != null && !remoteMessage.data.additional_data) {
-      console.log(remoteMessage.data.title)
-      if (enableAlert) {
-        showAlert(remoteMessage.data.title, remoteMessage.data.body)
-      }
-    }
-    openCommonNotification({ appToken, dev, remoteMessage, enableAlert, state: 'foreground' })
-  });
-
+  
   firebase.messaging().setBackgroundMessageHandler(async (remoteMessage) => {
     console.log('Push received: Background')
 
@@ -151,24 +100,14 @@ export default async ({ appToken, dev, enableAlert }) => {
       setTimeout(() => {
         messaging().getInitialNotification().then(notification => {
           if (!remoteMessage.data.url) {
-            if (enableAlert) {
-              showAlert(remoteMessage.data.title, remoteMessage.data.body)
-            }
             notificationApi(request, dev)
           } else {
             notificationApi(request, dev)
             Linking.canOpenURL(remoteMessage.data.url).then((supported) => {
               if (supported) {
-                if (enableAlert) {
-                  showAlertLink(
-                    remoteMessage.data.title,
-                    remoteMessage.data.body,
-                    `${DeviceInfo.getApplicationName()}`,
-                    `Acessar ${remoteMessage.data.url} ?`,
-                  ).then((response) => { supported && openLinkByType(remoteMessage.data.type, remoteMessage.data.url) })
-                } else {
+               
                   supported && openLinkByType(remoteMessage.data.type, remoteMessage.data.url)
-                }
+                
               }
             }).catch(error => console.log(error))
           }
@@ -176,4 +115,74 @@ export default async ({ appToken, dev, enableAlert }) => {
       }, 3000)
     }
   })
+
+  firebase.messaging().onNotificationOpenedApp(async (remoteMessage) => {
+    console.log("Notification Oppened")
+    openCommonNotification({ appToken, dev, remoteMessage, enableAlert, state: 'Background' })
+  });
+
+  if(typeof onNotificationOpenedApp == 'function') {
+    const remoteMessage = await messaging().getInitialNotification();
+    onNotificationOpenedApp(remoteMessage);  
+  }
+
+  firebase.messaging().onMessage(async (remoteMessage) => {
+    console.log('Push received: Foreground')
+
+    try {
+      PushNotification.configure({
+        onNotification: function(notification) {
+          console.log('LOCAL NOTIFICATION ==>', notification)
+
+          openCommonNotification({ appToken, dev, remoteMessage, enableAlert, state: 'foreground' })
+
+        },
+         channelId: "high_importance_channel",
+        priority: "high",
+        popInitialNotification: true,
+        requestPermissions: true
+      })
+      
+    } catch (e) { 
+      console.log(e)
+
+    }
+    try{
+     
+      PushNotification.presentLocalNotification({
+        autoCancel: true,
+        bigText:remoteMessage.data.body,
+        title: remoteMessage.data.title,
+        message: '',
+        vibrate: true,
+        vibration: 300,
+        playSound: true,
+        soundName: 'default',
+        
+      })
+       console.log(remoteMessage)
+    }catch(e){
+      console.log(e)
+    } 
+
+
+
+    if (remoteMessage != null && remoteMessage.data.additional_data) {
+      let msg = JSON.parse(remoteMessage.data.additional_data)
+      if (msg.inapp_message == true) {
+        const currentMessages = await AsyncStorage.getItem('inngage');
+        if (currentMessages !== null) {
+          messageArray = JSON.parse(currentMessages);
+        }
+        messageArray.push(remoteMessage);
+        await AsyncStorage.setItem('inngage', JSON.stringify(messageArray));
+      }
+    } else if (remoteMessage != null && !remoteMessage.data.additional_data) {
+      console.log(remoteMessage.data.title)
+      if (enableAlert) {
+        showAlert(remoteMessage.data.title, remoteMessage.data.body)
+      }
+    }
+  });
+
 }

package/index.js

@@ -7,6 +7,7 @@ import { subscription, eventsApi } from "./inngageApi";
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import Carousel, { Pagination } from 'react-native-snap-carousel';
 import React, { useState, useEffect, useRef } from 'react';
+
 import {
   Platform,
   Modal,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inngageregistry/inngage-react",
-  "version": "2.2.8",
+  "version": "2.3.2",
   "description": "Inngage react integration",
   "main": "index.js",
   "scripts": {

package/utils.js

@@ -13,14 +13,16 @@ const requestConfigFactory = (method, request) => {
     Accept: 'application/json',
     'Content-Type': 'application/json',
   }
-
-  if (request.registerSubscriberRequest.authKey) {
-    header = {
-      ...header,
-      Authorization: request.registerSubscriberRequest.authKey
+  try{
+    if (request.registerSubscriberRequest.authKey) {
+      header = {
+        ...header,
+        Authorization: request.registerSubscriberRequest.authKey
+      }
     }
-  }
-
+ }catch(e){
+   console.log(e)
+ }
   let objToSend = {
     method,
     body: JSON.stringify(request),