@janiscommerce/app-push-notification 0.2.0 → 1.1.0-beta.1

package/lib/NotificationProvider/index.js

@@ -18,7 +18,7 @@ import {
   makeNotificationChannels,
   parseNotificationChannel,
 } from '../utils/channel';
-import {getFCMToken, getStoredToken} from '../utils/token';
+import Crashlytics from '../utils/crashlytics';
 
 /**
  * @function NotificationProvider
@@ -120,14 +120,14 @@ const NotificationProvider = ({
 
   const SubscribeToNotifications = async () => {
     try {
-      const storedToken = await getStoredToken();
-      const fcmToken = await getFCMToken();
-      const isSameToken = storedToken === fcmToken;
+      Crashlytics.log('[SubscribeToNotifications] Starting subscription');
 
-      if (Boolean(storedToken) && isSameToken) return;
-
-      await registerDeviceToNotifications({token: fcmToken, additionalInfo});
+      await registerDeviceToNotifications({additionalInfo});
     } catch (error) {
+      Crashlytics.recordError(
+        error,
+        '[SubscribeToNotifications] Error registering device to notifications',
+      );
       if (onSubscriptionError && isFunction(onSubscriptionError))
         onSubscriptionError(error);
     }

package/lib/usePushNotification.js

@@ -1,9 +1,10 @@
 import {useState} from 'react';
 import RequestInstance from '@janiscommerce/app-request';
-import {isArray, isString, promiseWrapper} from './utils';
+import {isArray, isObject, isString} from './utils';
 import SubscribeNotifications from './utils/api/SubscribeNotifications';
 import {getStoredToken, getFCMToken, updateStoredToken} from './utils/token';
 import cancelNotificationsSubscription from './utils/api/cancelNotificationsSubscription';
+import Crashlytics from './utils/crashlytics';
 
 const usePushNotification = (environment, events, appName) => {
   const [notificationState, setNotificationState] = useState({
@@ -28,36 +29,25 @@ const usePushNotification = (environment, events, appName) => {
 
   const getSubscribedEvents = () => pushEvents;
 
-  // istanbul ignore next line
-  const getDeviceToken = async () => {
-    try {
-      const [storedToken] = await promiseWrapper(getStoredToken());
-
-      if (storedToken) return storedToken;
-
-      const fcmToken = await getFCMToken();
-
-      return fcmToken;
-    } catch (error) {
-      return null;
-    }
-  };
-
   /**
    * @function registerDeviceToNotifications
    * @description This function is responsible for registering the device to the notification microservice.
-   * @returns {null}
    */
 
-  const registerDeviceToNotifications = async (params) => {
-    const {token = '', additionalInfo = null} = params;
+  const registerDeviceToNotifications = async (params = {}) => {
+    const {additionalInfo = null} = params;
     try {
+      const storedToken = await getStoredToken();
+      const fcmToken = await getFCMToken();
+      const isSameToken = storedToken === fcmToken;
+
+      if (Boolean(storedToken) && isSameToken) return null;
+
       await SubscribeNotifications(
-        {token, events: pushEvents, appName, additionalInfo},
+        {token: fcmToken, events: pushEvents, appName, additionalInfo},
         Request,
       );
-
-      await updateStoredToken(token);
+      await updateStoredToken(fcmToken);
       return updateNotificationState({pushEvents});
     } catch (error) {
       updateNotificationState({pushEvents: [], subscribeError: error});
@@ -66,23 +56,36 @@ const usePushNotification = (environment, events, appName) => {
   };
 
   /**
-   * @function updateSuscription
+   * @function updateSubscription
    * @description This function is responsible for updating the subscription to the notification service
    * @param {object} additionalInfo all properties that will be sent as additional data in the subscription
    * @returns {Promise}
    */
 
-  const updateSuscription = async (additionalInfo) => {
+  const updateSubscription = async (additionalInfo) => {
     try {
-      const token = await getDeviceToken();
+      Crashlytics.log('[updateSubscription] Starting update subscription');
+
+      if (!isObject(additionalInfo)) return null;
+      let token = await getStoredToken();
+
+      if (!token) {
+        token = await getFCMToken();
+      }
 
       await SubscribeNotifications(
         {token, events: pushEvents, appName, additionalInfo},
         Request,
       );
 
+      await updateStoredToken(token);
+
       return Promise.resolve();
     } catch (error) {
+      Crashlytics.recordError(
+        error,
+        '[updateSubscription] Error updating subscription',
+      );
       return Promise.reject(error);
     }
   };
@@ -181,7 +184,7 @@ const usePushNotification = (environment, events, appName) => {
     updateNotificationState,
     getSubscribedEvents,
     deleteReceivedNotification,
-    updateSuscription,
+    updateSubscription,
   };
 };
 

package/lib/utils/crashlytics/index.js

@@ -0,0 +1,7 @@
+/* istanbul ignore file */
+// eslint-disable-next-line import/no-extraneous-dependencies
+import CrashlyticsClass from '@janiscommerce/app-crashlytics';
+
+const Crashlytics = new CrashlyticsClass();
+
+export default Crashlytics;

package/lib/utils/token/index.js

@@ -8,27 +8,20 @@ import AsyncStorage from '@react-native-async-storage/async-storage';
  */
 
 export const getFCMToken = async () => {
-  try {
-    const fcmToken = await messaging().getToken();
-    return fcmToken;
-  } catch (error) {
-    return null;
-  }
+  const fcmToken = await messaging().getToken();
+  if (!fcmToken) throw new Error('FCM token is null');
+  return fcmToken;
 };
 
 /**
  * @function getStoredToken
  * @description This function is responsible for getting the stored token from AsyncStorage
- * @returns {Promise<string>} The stored token
+ * @returns {Promise<string|null>} The stored token or null if not found
  */
 
 export const getStoredToken = async () => {
-  try {
-    const storedToken = await AsyncStorage.getItem('currentToken');
-    return storedToken;
-  } catch (error) {
-    return null;
-  }
+  const storedToken = await AsyncStorage.getItem('currentToken');
+  return storedToken;
 };
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@janiscommerce/app-push-notification",
-  "version": "0.2.0",
+  "version": "1.1.0-beta.1",
   "type": "commonjs",
   "description": "This package will take care of performing the main actions for registration to receive notifications in the foreground and background.",
   "main": "lib/index.js",
@@ -30,14 +30,15 @@
     "@notifee/react-native": "^7.8.2"
   },
   "peerDependencies": {
-    "@janiscommerce/app-storage": ">=1.0.0",
+    "@janiscommerce/app-crashlytics": ">=2.0.0",
     "@janiscommerce/app-request": "^2.2.0",
+    "@janiscommerce/app-storage": ">=1.0.0",
     "@react-native-async-storage/async-storage": "^1.18.1",
-    "@react-native-firebase/app": "^18.9.0",
-    "@react-native-firebase/messaging": "^18.9.0",
+    "@react-native-firebase/app": "^21.6.1",
+    "@react-native-firebase/messaging": "^21.6.1",
     "axios": "^1.3.6",
-    "react": ">=17.0.2 <19.0.0",
-    "react-native": ">=0.67.5 <0.75.0"
+    "react": ">=17.0.2 <20.0.0",
+    "react-native": ">=0.71.5 <0.82.0"
   },
   "devDependencies": {
     "@babel/core": "^7.22.10",
@@ -46,6 +47,7 @@
     "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
     "@babel/preset-env": "^7.22.10",
     "@babel/runtime": "^7.12.5",
+    "@janiscommerce/app-crashlytics": "^2.2.0",
     "@janiscommerce/app-request": "^2.2.0",
     "@janiscommerce/app-storage": "^1.0.0",
     "@react-native-async-storage/async-storage": "^1.18.1",