notifly-sdk 1.0.3 → 1.0.5

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

@@ -10,9 +10,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
@@ -83,13 +94,13 @@ exports.initialize = async function (prjId, userName, password) {
                     try {
                         await logEvent("push_delivered", { "campaign_id": campaign_id, "status": "background-notifee" }, null, true);
                     } catch (err) {
-                        console.error('[Notifly]: ', err);
+                        console.warn('[Notifly]: ', err);
                     }
                     break;
             }
         });
     } catch (err) {
-        console.error("[Notifly]: ", err);
+        console.warn("[Notifly]: ", err);
     }
 }
 
@@ -118,7 +129,7 @@ exports.foregroundSetting = function () {
                 }
                 await logEvent("push_click", { "campaign_id": campaign_id, "status": "foreground" }, null, true);
             } catch (err) {
-                console.error('[Notifly]: ', err);
+                console.warn('[Notifly]: ', err);
             }
         }
     });
@@ -144,7 +155,7 @@ async function getCognitoIdToken(userName, password) {
             const tokens = JSON.parse(result).AuthenticationResult.IdToken
             return tokens;
         })
-        .catch(error => console.error('[Notifly]: ', error));
+        .catch(error => console.warn('[Notifly]: ', error));
 
     return token;
 }
@@ -165,18 +176,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'),
@@ -252,7 +285,6 @@ async function logEvent(eventName, eventParams, segmentation_event_param_keys =
 
         const response = await _apiCall("https://12lnng07q2.execute-api.ap-northeast-2.amazonaws.com/prod/records", requestOptions);
         const result = JSON.parse(response)
-        console.log(result)
         if (result.message == "The incoming token has expired") {
             const [userName, password] = await Promise.all([AsyncStorage.getItem('notiflyUserName'), AsyncStorage.getItem('notiflyUserPassword')])
             const newToken = await getCognitoIdToken(userName, password);
@@ -261,9 +293,9 @@ async function logEvent(eventName, eventParams, segmentation_event_param_keys =
         }
 
     } catch (err) {
-        console.log(err)
+        console.warn('[Notifly]Error: err')
         if (err == 'Error: null value') {
-            throw new Error("[Notifly] Fail to log the event.");
+            throw new Error("[Notifly] Fail to log the event. Please retry the initialization.");
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "notifly-sdk",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "",
   "main": "index.js",
   "scripts": {