notifly-sdk 1.0.4 → 1.0.6

package/.prettierrc.yml

@@ -0,0 +1,14 @@
+# .prettierrc or .prettierrc.yaml
+proseWrap: 'preserve'
+trailingComma: 'es5'
+tabWidth: 4
+semi: true
+singleQuote: true
+quoteProps: 'preserve'
+printWidth: 120
+overrides:
+    - files:
+          - '*.json'
+          - '*.yml'
+      options:
+          tabWidth: 2

package/index.js

@@ -1,5 +1,4 @@
 import messaging from "@react-native-firebase/messaging";
-import notifee, { AndroidImportance } from "@notifee/react-native";
 import { Linking, Platform } from 'react-native';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import rnDeviceInfo from 'react-native-device-info';
@@ -10,9 +9,20 @@ exports.trackEvent = logEvent;
 
 exports.setUserProperties = _setUserProperties
 
-exports.setUserId = async userId => await _setUserProperties({
-    external_user_id: userId,
-})
+exports.setUserId = async function (userID) {
+    try {
+        if (userID) {
+            await _setUserProperties({
+                external_user_id: userID,
+            })
+            return;
+        }
+        await _removeUserId();
+        return;
+    } catch (err) {
+        console.warn('[Notifly] setUserId Failed.');
+    }
+}
 
 exports.sessionStart = async function () {
     const apiLevel = rnDeviceInfo.getApiLevel(); // only android
@@ -48,82 +58,19 @@ exports.initialize = async function (prjId, userName, password) {
                         Linking.openURL(remoteMessage.notification?.android?.link);
                     }
                     await logEvent("push_click", { "campaign_id": remoteMessage.data.campaign_id, "status": "quit" }, null, true);
-                    await logEvent("push_delivered", { "campaign_id": remoteMessage.data.campaign_id, "status": "quit" }, null, true);
-
                 }
             });
 
-        messaging().setBackgroundMessageHandler(async (remoteMessage) => {
-            await logEvent("push_delivered", { "campaign_id": remoteMessage.data.campaign_id, "status": "background" }, null, true);
-            return
-        })
-
         await Promise.all([
             AsyncStorage.setItem('notiflyProjectId', prjId),
             AsyncStorage.setItem('notiflyUserName', userName),
             AsyncStorage.setItem('notiflyUserPassword', password),
         ])
-
-        notifee.requestPermission()
-        if (Platform.OS === 'android') {
-            notifee.createChannel({
-                id: "foreground",
-                name: "foreground",
-                importance: AndroidImportance.HIGH,
-            })
-        }
-        notifee.onBackgroundEvent(async ({ type, detail }) => {
-            const { notification } = detail;
-            const campaign_id = notification.data.campaign_id;
-            if (!campaign_id) {
-                return
-            }
-            switch (type) {
-                case 3:
-                    try {
-                        await logEvent("push_delivered", { "campaign_id": campaign_id, "status": "background-notifee" }, null, true);
-                    } catch (err) {
-                        console.warn('[Notifly]: ', err);
-                    }
-                    break;
-            }
-        });
     } catch (err) {
         console.warn("[Notifly]: ", err);
     }
 }
 
-exports.foregroundSetting = function () {
-    messaging().onMessage(async remoteMessage => {
-        await notifee.displayNotification({
-            title: remoteMessage.notification.title,
-            body: remoteMessage.notification.body,
-            data: remoteMessage.data,
-            android: {
-                channelId: "foreground",
-            },
-        });
-        await logEvent("push_delivered", { "campaign_id": remoteMessage.data.campaign_id, "status": "foreground" }, null, true);
-    });
-    notifee.onForegroundEvent(async ({ type, detail }) => {
-        const { notification } = detail;
-        const campaign_id = notification.data.campaign_id;
-        if (!campaign_id) {
-            return
-        }
-        if (type == 1) {
-            try {
-                if (notification.data.link) {
-                    Linking.openURL(notification.data.link)
-                }
-                await logEvent("push_click", { "campaign_id": campaign_id, "status": "foreground" }, null, true);
-            } catch (err) {
-                console.warn('[Notifly]: ', err);
-            }
-        }
-    });
-}
-
 async function getCognitoIdToken(userName, password) {
     const myHeaders = new Headers();
     myHeaders.append("X-Amz-Target", "AWSCognitoIdentityProviderService.InitiateAuth");
@@ -165,18 +112,40 @@ async function _getNotiflyUserId() {
 }
 
 async function _setUserProperties(params) {
-    if (params.external_user_id) {
-        params['previous_notifly_user_id'] = await _getNotiflyUserId();
-        await Promise.all([
-            AsyncStorage.setItem('notiflyExternalUserId', params.external_user_id),
-            AsyncStorage.removeItem('notiflyUserId'),
-        ]);
+    try {
+        if (params.external_user_id) {
+            const [previousNotiflyUserID, previousExternalUserID] = await Promise.all([
+                _getNotiflyUserId(),
+                AsyncStorage.getItem('notiflyExternalUserId')
+            ]);
+            params['previous_notifly_user_id'] = previousNotiflyUserID
+            params['previous_external_user_id'] = previousExternalUserID
+            await Promise.all([
+                AsyncStorage.setItem('notiflyExternalUserId', params.external_user_id),
+                AsyncStorage.removeItem('notiflyUserId'),
+            ]);
+        }
+        return (await logEvent("set_user_properties", params, null, true));
+    } catch (err) {
+        console.warn('[Notifly] Failed to remove userID');
+    }
+}
+
+async function _removeUserId() {
+    try {
+        await Promise.all([AsyncStorage.removeItem('notiflyExternalUserId'), AsyncStorage.removeItem('notiflyUserId')]);
+        return await logEvent('remove_external_user_id', {}, null, true);
+    } catch (err) {
+        console.warn('[Notifly] Failed to remove userID');
     }
-    return (await logEvent("set_user_properties", params, null, true));
 }
 
 async function logEvent(eventName, eventParams, segmentation_event_param_keys = null, isInternalEvent = false) {
     try {
+        if (!eventName) {
+            console.warn('[Notifly]event_name must be provided.');
+            return;
+        }
         let token;
         const [savedCognitoToken, notiflyUserId, externalUserId, prjId, externalDeviceId, osVersion, appVersion] = await Promise.all([
             AsyncStorage.getItem('notiflyCognitoIdToken'),

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "notifly-sdk",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "peerDependencies": {
-    "@notifee/react-native": "^7.3.0",
     "@react-native-async-storage/async-storage": "^1.17.11",
     "@react-native-firebase/app": "^16.4.3",
     "@react-native-firebase/messaging": "^16.4.3",