add track event for user namespace

add android track event method

expose ios trackEvent method

Author: fadi-george

android/build.gradle

@@ -31,7 +31,7 @@ dependencies {
 
     // api is used instead of implementation so the parent :app project can access any of the OneSignal Java
     //   classes if needed. Such as com.onesignal.NotificationExtenderService
-    api 'com.onesignal:OneSignal:5.1.35'
+    api 'com.onesignal:OneSignal:5.3.0-alpha-01'
 
     testImplementation 'junit:junit:4.12'
 }

android/src/main/java/com/onesignal/rnonesignalandroid/RNOneSignal.java

@@ -35,11 +35,15 @@ of this software and associated documentation files (the "Software"), to deal
 
 package com.onesignal.rnonesignalandroid;
 
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.os.Bundle;
-import com.onesignal.debug.internal.logging.Logging;
-import com.facebook.react.bridge.Callback;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.naming.Context;
+
+import org.jetbrains.annotations.Nullable;
+import org.json.JSONException;
+
+import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -48,39 +52,31 @@ of this software and associated documentation files (the "Software"), to deal
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.Arguments;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.onesignal.Continue;
 import com.onesignal.OneSignal;
-import com.onesignal.debug.LogLevel;
 import com.onesignal.common.OneSignalWrapper;
-import com.onesignal.inAppMessages.IInAppMessage;
-import com.onesignal.inAppMessages.IInAppMessageClickListener;
+import com.onesignal.debug.LogLevel;
+import com.onesignal.debug.internal.logging.Logging;
 import com.onesignal.inAppMessages.IInAppMessageClickEvent;
-import com.onesignal.inAppMessages.IInAppMessageClickResult;
-import com.onesignal.inAppMessages.IInAppMessageLifecycleListener;
-import com.onesignal.inAppMessages.IInAppMessageWillDisplayEvent;
+import com.onesignal.inAppMessages.IInAppMessageClickListener;
+import com.onesignal.inAppMessages.IInAppMessageDidDismissEvent;
 import com.onesignal.inAppMessages.IInAppMessageDidDisplayEvent;
+import com.onesignal.inAppMessages.IInAppMessageLifecycleListener;
 import com.onesignal.inAppMessages.IInAppMessageWillDismissEvent;
-import com.onesignal.inAppMessages.IInAppMessageDidDismissEvent;
+import com.onesignal.inAppMessages.IInAppMessageWillDisplayEvent;
 import com.onesignal.notifications.INotification;
-import com.onesignal.notifications.INotificationClickListener;
 import com.onesignal.notifications.INotificationClickEvent;
+import com.onesignal.notifications.INotificationClickListener;
 import com.onesignal.notifications.INotificationLifecycleListener;
 import com.onesignal.notifications.INotificationWillDisplayEvent;
 import com.onesignal.notifications.IPermissionObserver;
+import com.onesignal.user.state.IUserStateObserver;
+import com.onesignal.user.state.UserChangedState;
 import com.onesignal.user.subscriptions.IPushSubscription;
 import com.onesignal.user.subscriptions.IPushSubscriptionObserver;
-import com.onesignal.user.subscriptions.PushSubscriptionState;
 import com.onesignal.user.subscriptions.PushSubscriptionChangedState;
-import com.onesignal.user.state.UserState;
-import com.onesignal.user.state.UserChangedState;
-import com.onesignal.user.state.IUserStateObserver;
-import org.json.JSONException;
-
-import java.util.HashMap;
-import java.util.Map;
 
 public class RNOneSignal extends ReactContextBaseJavaModule implements
         IPushSubscriptionObserver,
@@ -739,4 +735,10 @@ public void addListener(String eventName) {
     public void removeListeners(int count) {
         // Keep: Required for RN built in Event Emitter Calls.
     }
+
+
+    @ReactMethod
+    public void trackEvent(String name, @Nullable ReadableMap properties) {
+        OneSignal.getUser().trackEvent(name, properties != null ? RNUtils.convertReadableMapIntoStringMap(properties) : null);
+    }
 }

ios/RCTOneSignal/RCTOneSignalEventEmitter.m

@@ -528,4 +528,8 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
     // iOS Stub
 }
 
+RCT_EXPORT_METHOD(trackEvent:(NSString *)name withProperties:(NSDictionary * _Nullable)properties) {
+    [OneSignal.User trackEvent:name withProperties:properties];
+}
+
 @end

src/index.ts

@@ -14,30 +14,30 @@ import {
   SUBSCRIPTION_CHANGED,
   USER_STATE_CHANGED,
 } from './events/events';
+import NotificationWillDisplayEvent from './events/NotificationWillDisplayEvent';
+import { isNativeModuleLoaded, isValidCallback } from './helpers';
 import {
+  InAppMessage,
+  InAppMessageClickEvent,
+  InAppMessageDidDismissEvent,
+  InAppMessageDidDisplayEvent,
+  InAppMessageEventName,
+  InAppMessageEventTypeMap,
+  InAppMessageWillDismissEvent,
+  InAppMessageWillDisplayEvent,
+} from './models/InAppMessage';
+import { LiveActivitySetupOptions } from './models/LiveActivities';
+import {
+  NotificationClickEvent,
   NotificationEventName,
   NotificationEventTypeMap,
-  NotificationClickEvent,
 } from './models/NotificationEvents';
 import {
-  PushSubscriptionState,
   OSNotificationPermission,
   PushSubscriptionChangedState,
+  PushSubscriptionState,
 } from './models/Subscription';
-import { UserState, UserChangedState } from './models/User';
-import NotificationWillDisplayEvent from './events/NotificationWillDisplayEvent';
-import { LiveActivitySetupOptions } from './models/LiveActivities';
-import {
-  InAppMessage,
-  InAppMessageEventTypeMap,
-  InAppMessageEventName,
-  InAppMessageClickEvent,
-  InAppMessageWillDisplayEvent,
-  InAppMessageDidDisplayEvent,
-  InAppMessageWillDismissEvent,
-  InAppMessageDidDismissEvent,
-} from './models/InAppMessage';
-import { isValidCallback, isNativeModuleLoaded } from './helpers';
+import { UserChangedState, UserState } from './models/User';
 
 const RNOneSignal = NativeModules.OneSignal;
 const eventManager = new EventManager(RNOneSignal);
@@ -605,6 +605,16 @@ export namespace OneSignal {
 
       return RNOneSignal.getTags();
     }
+
+    /** Track custom events for the current user. */
+    export function trackEvent(
+      name: string,
+      properties?: Record<string, string>,
+    ) {
+      if (!isNativeModuleLoaded(RNOneSignal)) return;
+
+      RNOneSignal.trackEvent(name, properties);
+    }
   }
 
   export namespace Notifications {
@@ -1001,21 +1011,21 @@ export namespace OneSignal {
 }
 
 export {
-  NotificationWillDisplayEvent,
-  NotificationClickEvent,
   InAppMessage,
   InAppMessageClickEvent,
-  InAppMessageWillDisplayEvent,
+  InAppMessageDidDismissEvent,
   InAppMessageDidDisplayEvent,
   InAppMessageWillDismissEvent,
-  InAppMessageDidDismissEvent,
-  PushSubscriptionState,
+  InAppMessageWillDisplayEvent,
+  NotificationClickEvent,
+  NotificationWillDisplayEvent,
+  OSNotificationPermission,
   PushSubscriptionChangedState,
-  UserState,
+  PushSubscriptionState,
   UserChangedState,
-  OSNotificationPermission,
+  UserState,
 };
 
-export { default as OSNotification } from './OSNotification';
-export { NotificationClickResult } from './models/NotificationEvents';
 export { InAppMessageClickResult } from './models/InAppMessage';
+export { NotificationClickResult } from './models/NotificationEvents';
+export { default as OSNotification } from './OSNotification';