@inngageregistry/inngage-react 3.0.2 → 3.0.4

package/package.json

@@ -1,42 +1,41 @@
-{
-  "name": "@inngageregistry/inngage-react",
-  "version": "3.0.2",
-  "description": "Inngage react integration",
-  "main": "src/index.ts",
-  "types": "src/index.d.ts",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "npx tsc"
-  },
-  "author": "Inngage Developer",
-  "license": "ISC",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/inngage/inngage-react.git"
-  },
-  "bugs": {
-    "url": "https://github.com/inngage/inngage-react/issues"
-  },
-  "homepage": "https://github.com/inngage/inngage-react#readme",
-  "dependencies": {
-    "@react-native-async-storage/async-storage": "^1.16.1",
-    "@react-native-community/push-notification-ios": "^1.10.1",
-    "@react-native-firebase/app": "^14.11.0",
-    "@react-native-firebase/messaging": "^14.11.0",
-    "react-native-advertising-id": "^1.0.11",
-    "react-native-device-info": "^8.4.9",
-    "react-native-inappbrowser-reborn": "^3.6.3",
-    "react-native-localize": "^2.2.2",
-    "react-native-push-notification": "^8.1.1",
-    "react-native-snap-carousel": "^3.9.1"
-  },
-  "devDependencies": {
-    "@types/jest": "^27.4.0",
-    "@types/react": "^17.0.38",
-    "@types/react-native": "^0.66.15",
-    "@types/react-native-push-notification": "^8.1.0",
-    "@types/react-native-snap-carousel": "^3.8.5",
-    "@types/react-test-renderer": "^17.0.1",
-    "typescript": "^4.5.5"
-  }
-}
+{
+  "name": "@inngageregistry/inngage-react",
+  "version": "3.0.4",
+  "description": "Inngage react integration",
+  "main": "src/index.ts",
+  "types": "src/index.d.ts",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build": "npx tsc"
+  },
+  "author": "Inngage Developer",
+  "license": "ISC",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/inngage/inngage-react.git"
+  },
+  "bugs": {
+    "url": "https://github.com/inngage/inngage-react/issues"
+  },
+  "homepage": "https://github.com/inngage/inngage-react#readme",
+  "dependencies": {
+    "@react-native-firebase/app": "^17.4.2",
+    "@react-native-firebase/messaging": "^17.4.2",
+    "react-native-localize": "^2.2.6",
+    "react-native-snap-carousel": "^3.9.1",
+    "@react-native-async-storage/async-storage": "^1.18.1",
+    "react-native-inappbrowser-reborn": "^3.7.0",
+    "@react-native-community/push-notification-ios": "^1.11.0",
+    "react-native-push-notification": "^8.1.1",
+    "react-native-device-info": "^10.6.0"
+    },
+    "devDependencies": {
+    "@types/jest": "^29.5.1",
+    "@types/react": "^18.2.0",
+    "@types/react-native": "^0.71.6",
+    "@types/react-native-push-notification": "^8.1.1",
+    "@types/react-native-snap-carousel": "^3.8.5",
+    "@types/react-test-renderer": "^18.0.0",
+    "typescript": "^5.0.4"
+    }
+}

package/src/Inngage.ts

@@ -1,193 +1,178 @@
-import {
-  Platform,
-  LogBox,
-  AppRegistry,
-} from "react-native";
-
-import { firebase } from '@react-native-firebase/messaging';
-import DeviceInfo from "react-native-device-info";
-import * as RNLocalize from "react-native-localize";
-import AsyncStorage from '@react-native-async-storage/async-storage';
-
-import { formatDate, subscriptionRequestAdapter } from "./utils";
-import notificationsListener, { notificationsListenerProps } from "./notificationsListener";
-import { subscriptionApi, eventsApi } from "./services/inngage";
-import RNAdvertisingId from 'react-native-advertising-id';
-
-// --- handle background message ------/
-const backgroundNotificationHandler = async remoteMessage => {
-  var messageArray: any = [];
-  console.log("Remote message:", JSON.stringify(remoteMessage));
-
-  console.log('Called backgroundNotificationHandler');
-
-  const currentMessages = await AsyncStorage.getItem('messages');
-  if (currentMessages !== null) {
-    messageArray = JSON.parse(currentMessages);
-  }
-  messageArray.push(remoteMessage);
-
-  await AsyncStorage.setItem('messages', JSON.stringify(messageArray));
-};
-
-// --- Get Firebase Access ------/
-const getFirebaseAccess = () => {
-  let firebaseToken = 'W7SAl94Jk6l3w95W9wCgmv3zZ99V5FReNUytdgJUFUvpvZoqXf72'
-  return new Promise(async (resolve) => {
-    DeviceInfo.isEmulator().then(isEmulator => {
-      if (isEmulator && Platform.OS === "ios") {
-        return resolve(firebaseToken)
-      }
-    })
-    try {
-      if (!firebase.messaging().isDeviceRegisteredForRemoteMessages)
-        await firebase.messaging().registerDeviceForRemoteMessages();
-
-      const permission = await firebase.messaging().hasPermission();
-      if (permission === firebase.messaging.AuthorizationStatus.NOT_DETERMINED) {
-        try {
-          await firebase.messaging().requestPermission();
-        } catch (e) {
-          console.error(e)
-          return resolve(firebaseToken);
-        }
-      }
-      try {
-        firebaseToken = await firebase.messaging().getToken();
-      } catch (error) {
-        console.error(error)
-        return resolve(firebaseToken)
-      }
-      return resolve(firebaseToken)
-    } catch (err) {
-      console.error(err)
-      return resolve(firebaseToken)
-    }
-  });
-};
-
-interface SubscriptionProps {
-  appToken: string,
-  enableAlert: boolean,
-  authKey: string,
-  dev?: boolean,
-  friendlyIdentifier?: string,
-  customFields?: any,
-  customData?: any,
-  phoneNumber?: string
-}
-
-interface SendEventProps {
-  newEventRequest: {
-    app_token: string,
-    identifier: string,
-    event_name: string,
-    conversion_event: boolean,
-    conversion_value: number,
-    conversion_notid: string,
-    event_values: {
-      nome_promo: string,
-      categoria: string,
-      foto_promo: string,
-      redirect_link: string
-    }
-  },
-  authKey: string
-}
-const Inngage = {
-  // ------------  Register Notification Listener ------------//
-  RegisterNotificationListener: async (props: notificationsListenerProps) => {
-
-    try {
-      LogBox.ignoreLogs(['registerHeadlessTask'])
-    } catch (e) { }
-    try {
-      console.ignoredYellowBox = ['registerHeadlessTask'];
-    } catch (e) { }
-    try {
-      AppRegistry.registerHeadlessTask('ReactNativeFirebaseMessagingHeadlessTask', () => backgroundNotificationHandler)
-      notificationsListener({ ...props });
-    } catch (e) {
-      console.error(e);
-      return { subscribed: false };
-    }
-  },
-  Subscribe: async ({
-    appToken,
-    dev,
-    friendlyIdentifier,
-    customFields,
-    customData,
-    phoneNumber,
-    authKey
-  }: SubscriptionProps) => {
-    try {
-      const respToken = await getFirebaseAccess()
-
-      const locales = RNLocalize.getLocales();
-
-      const os_language = locales && locales.length ? locales[0].languageCode : ''
-      const device_manufacturer = await DeviceInfo.getManufacturer();
-      const installTime = await DeviceInfo.getFirstInstallTime();
-      const lastUpdateTime = await DeviceInfo.getLastUpdateTime();
-      const app_installed_in = formatDate(installTime);
-      const app_updated_in = formatDate(lastUpdateTime);
-      const androidId = DeviceInfo.getAndroidId();
-      var advertiserId = "Unknown"
-      var idFa = "Unknown"
-      try{
-        const rnAdvertisingId  = await RNAdvertisingId.getAdvertisingId();
-         advertiserId = rnAdvertisingId.advertisingId;
-         idFa = rnAdvertisingId.advertisingId;
-      }catch(e){
-
-      }
-
-
-      const rawRequest = {
-        registerSubscriberRequest: {
-          app_token: appToken,
-          identifier: friendlyIdentifier,
-          registration: respToken,
-          phone_Number: phoneNumber,
-          platform: DeviceInfo.getSystemName(),
-          sdk: DeviceInfo.getBuildNumber(),
-          device_model: DeviceInfo.getModel(),
-          device_manufacturer,
-          os_locale: RNLocalize.getCountry(),
-          os_language,
-          os_version: DeviceInfo.getReadableVersion(),
-          app_version: DeviceInfo.getBuildNumber(),
-          app_installed_in,
-          app_updated_in,
-          uuid: DeviceInfo.getUniqueId(),
-          advertiser_id:advertiserId,
-          android_id:androidId,
-          idfa:idFa,
-          authKey,
-        }
-      };
-
-      const request = subscriptionRequestAdapter(rawRequest, customData, customFields)
-      const subscribe = await subscriptionApi(request, dev);
-      console.log(await subscribe.json())
-      return subscribe;
-    } catch (e) {
-      console.error(e);
-      return { subscribed: false };
-    }
-  },
-  SendEvent: async (props: SendEventProps) => {
-    const { authKey, newEventRequest } = props
-    const rawRequest = {
-      registerSubscriberRequest: {
-        authKey
-      },
-      newEventRequest
-    }
-    const subscribe = await eventsApi(rawRequest);
-    return subscribe
-  }
-}
-
-export default Inngage;
+import {
+  Platform,
+  LogBox,
+  AppRegistry,
+} from "react-native";
+
+import { firebase } from '@react-native-firebase/messaging';
+import DeviceInfo from "react-native-device-info";
+import * as RNLocalize from "react-native-localize";
+import AsyncStorage from '@react-native-async-storage/async-storage';
+
+import { formatDate, subscriptionRequestAdapter } from "./utils";
+import notificationsListener, { notificationsListenerProps } from "./notificationsListener";
+import { subscriptionApi, eventsApi } from "./services/inngage";
+
+// --- handle background message ------/
+const backgroundNotificationHandler = async remoteMessage => {
+  var messageArray: any = [];
+  console.log("Remote message:", JSON.stringify(remoteMessage));
+
+  console.log('Called backgroundNotificationHandler');
+
+  const currentMessages = await AsyncStorage.getItem('messages');
+  if (currentMessages !== null) {
+    messageArray = JSON.parse(currentMessages);
+  }
+  messageArray.push(remoteMessage);
+
+  await AsyncStorage.setItem('messages', JSON.stringify(messageArray));
+};
+
+// --- Get Firebase Access ------/
+const getFirebaseAccess = () => {
+  let firebaseToken = 'W7SAl94Jk6l3w95W9wCgmv3zZ99V5FReNUytdgJUFUvpvZoqXf72'
+  return new Promise(async (resolve) => {
+    DeviceInfo.isEmulator().then(isEmulator => {
+      if (isEmulator && Platform.OS === "ios") {
+        return resolve(firebaseToken)
+      }
+    })
+    try {
+      if (!firebase.messaging().isDeviceRegisteredForRemoteMessages)
+        await firebase.messaging().registerDeviceForRemoteMessages();
+
+      const permission = await firebase.messaging().hasPermission();
+      if (permission === firebase.messaging.AuthorizationStatus.NOT_DETERMINED) {
+        try {
+          await firebase.messaging().requestPermission();
+        } catch (e) {
+          console.error(e)
+          return resolve(firebaseToken);
+        }
+      }
+      try {
+        firebaseToken = await firebase.messaging().getToken();
+      } catch (error) {
+        console.error(error)
+        return resolve(firebaseToken)
+      }
+      return resolve(firebaseToken)
+    } catch (err) {
+      console.error(err)
+      return resolve(firebaseToken)
+    }
+  });
+};
+
+interface SubscriptionProps {
+  appToken: string,
+  enableAlert: boolean,
+  authKey: string,
+  dev?: boolean,
+  friendlyIdentifier?: string,
+  customFields?: any,
+  customData?: any,
+  phoneNumber?: string
+}
+
+interface SendEventProps {
+  newEventRequest: {
+    app_token: string,
+    identifier: string,
+    event_name: string,
+    conversion_event: boolean,
+    conversion_value: number,
+    conversion_notid: string,
+    event_values: {
+      nome_promo: string,
+      categoria: string,
+      foto_promo: string,
+      redirect_link: string
+    }
+  },
+  authKey: string
+}
+const Inngage = {
+  // ------------  Register Notification Listener ------------//
+  RegisterNotificationListener: async (props: notificationsListenerProps) => {
+
+    try {
+      LogBox.ignoreLogs(['registerHeadlessTask'])
+    } catch (e) { }
+    try {
+      console.ignoredYellowBox = ['registerHeadlessTask'];
+    } catch (e) { }
+    try {
+      AppRegistry.registerHeadlessTask('ReactNativeFirebaseMessagingHeadlessTask', () => backgroundNotificationHandler)
+      notificationsListener({ ...props });
+    } catch (e) {
+      console.error(e);
+      return { subscribed: false };
+    }
+  },
+  Subscribe: async ({
+    appToken,
+    dev,
+    friendlyIdentifier,
+    customFields,
+    customData,
+    phoneNumber,
+    authKey
+  }: SubscriptionProps) => {
+    try {
+      const respToken = await getFirebaseAccess()
+
+      const locales = RNLocalize.getLocales();
+
+      const os_language = locales && locales.length ? locales[0].languageCode : ''
+      const device_manufacturer = await DeviceInfo.getManufacturer();
+      const installTime = await DeviceInfo.getFirstInstallTime();
+      const lastUpdateTime = await DeviceInfo.getLastUpdateTime();
+      const app_installed_in = formatDate(installTime);
+      const app_updated_in = formatDate(lastUpdateTime);
+
+      const rawRequest = {
+        registerSubscriberRequest: {
+          app_token: appToken,
+          identifier: friendlyIdentifier,
+          registration: respToken,
+          phone_Number: phoneNumber,
+          platform: DeviceInfo.getSystemName(),
+          sdk: DeviceInfo.getBuildNumber(),
+          device_model: DeviceInfo.getModel(),
+          device_manufacturer,
+          os_locale: RNLocalize.getCountry(),
+          os_language,
+          os_version: DeviceInfo.getReadableVersion(),
+          app_version: DeviceInfo.getBuildNumber(),
+          app_installed_in,
+          app_updated_in,
+          uuid: DeviceInfo.getUniqueId(),
+          authKey
+        }
+      };
+
+      const request = subscriptionRequestAdapter(rawRequest, customData, customFields)
+      const subscribe = await subscriptionApi(request, dev);
+      console.log(await subscribe.json())
+      return subscribe;
+    } catch (e) {
+      console.error(e);
+      return { subscribed: false };
+    }
+  },
+  SendEvent: async (props: SendEventProps) => {
+    const { authKey, newEventRequest } = props
+    const rawRequest = {
+      registerSubscriberRequest: {
+        authKey
+      },
+      newEventRequest
+    }
+    const subscribe = await eventsApi(rawRequest);
+    return subscribe
+  }
+}
+
+export default Inngage;