refactor: replace RNIterableAPI calls with IterableApi methods in Iterable class

Author: lposen

src/core/classes/Iterable.ts

@@ -24,6 +24,7 @@ import { IterableConfig } from './IterableConfig';
 import { IterableLogger } from './IterableLogger';
 import type { IterableAuthFailure } from '../types/IterableAuthFailure';
 import { IterableAuthManager } from './IterableAuthManager';
+import { IterableApi } from './IterableApi';
 
 const RNEventEmitter = new NativeEventEmitter(RNIterableAPI);
 
@@ -139,16 +140,13 @@ export class Iterable {
     config: IterableConfig = new IterableConfig()
   ): Promise<boolean> {
     Iterable.savedConfig = config;
-
     Iterable.logger = new IterableLogger(Iterable.savedConfig);
 
-    Iterable?.logger?.log('initialize: ' + apiKey);
-
     this.setupEventHandlers();
 
     const version = this.getVersionFromPackageJson();
 
-    return RNIterableAPI.initializeWithApiKey(apiKey, config.toDict(), version);
+    return IterableApi.initializeWithApiKey(apiKey, config, version);
   }
 
   /**
@@ -163,17 +161,15 @@ export class Iterable {
     apiEndPoint: string
   ): Promise<boolean> {
     Iterable.savedConfig = config;
-
     Iterable.logger = new IterableLogger(Iterable.savedConfig);
 
-    Iterable?.logger?.log('initialize2: ' + apiKey);
-
     this.setupEventHandlers();
+
     const version = this.getVersionFromPackageJson();
 
-    return RNIterableAPI.initialize2WithApiKey(
+    return IterableApi.initialize2WithApiKey(
       apiKey,
-      config.toDict(),
+      config,
       version,
       apiEndPoint
     );
@@ -229,9 +225,7 @@ export class Iterable {
    * ```
    */
   static setEmail(email: string | null, authToken?: string | null) {
-    Iterable?.logger?.log('setEmail: ' + email);
-
-    RNIterableAPI.setEmail(email, authToken);
+    IterableApi.setEmail(email, authToken);
   }
 
   /**
@@ -245,9 +239,7 @@ export class Iterable {
    * ```
    */
   static getEmail(): Promise<string | null> {
-    Iterable?.logger?.log('getEmail');
-
-    return RNIterableAPI.getEmail();
+    return IterableApi.getEmail();
   }
 
   /**
@@ -294,9 +286,7 @@ export class Iterable {
    * taken
    */
   static setUserId(userId?: string | null, authToken?: string | null) {
-    Iterable?.logger?.log('setUserId: ' + userId);
-
-    RNIterableAPI.setUserId(userId, authToken);
+    IterableApi.setUserId(userId, authToken);
   }
 
   /**
@@ -310,9 +300,7 @@ export class Iterable {
    * ```
    */
   static getUserId(): Promise<string | null | undefined> {
-    Iterable?.logger?.log('getUserId');
-
-    return RNIterableAPI.getUserId();
+    return IterableApi.getUserId();
   }
 
   /**
@@ -324,9 +312,7 @@ export class Iterable {
    * ```
    */
   static disableDeviceForCurrentUser() {
-    Iterable?.logger?.log('disableDeviceForCurrentUser');
-
-    RNIterableAPI.disableDeviceForCurrentUser();
+    IterableApi.disableDeviceForCurrentUser();
   }
 
   /**
@@ -341,9 +327,7 @@ export class Iterable {
    * ```
    */
   static getLastPushPayload(): Promise<unknown> {
-    Iterable?.logger?.log('getLastPushPayload');
-
-    return RNIterableAPI.getLastPushPayload();
+    return IterableApi.getLastPushPayload();
   }
 
   /**
@@ -369,9 +353,7 @@ export class Iterable {
    * ```
    */
   static getAttributionInfo(): Promise<IterableAttributionInfo | undefined> {
-    Iterable?.logger?.log('getAttributionInfo');
-
-    return RNIterableAPI.getAttributionInfo().then(
+    return IterableApi.getAttributionInfo().then(
       (
         dict: {
           campaignId: number;
@@ -417,13 +399,7 @@ export class Iterable {
    * ```
    */
   static setAttributionInfo(attributionInfo?: IterableAttributionInfo) {
-    Iterable?.logger?.log('setAttributionInfo');
-
-    RNIterableAPI.setAttributionInfo(
-      attributionInfo as unknown as {
-        [key: string]: string | number | boolean;
-      } | null
-    );
+    IterableApi.setAttributionInfo(attributionInfo);
   }
 
   /**
@@ -462,14 +438,12 @@ export class Iterable {
     appAlreadyRunning: boolean,
     dataFields?: unknown
   ) {
-    Iterable?.logger?.log('trackPushOpenWithCampaignId');
-
-    RNIterableAPI.trackPushOpenWithCampaignId(
+    IterableApi.trackPushOpenWithCampaignId(
       campaignId,
       templateId,
       messageId as string,
       appAlreadyRunning,
-      dataFields as { [key: string]: string | number | boolean } | undefined
+      dataFields
     );
   }
 
@@ -500,11 +474,7 @@ export class Iterable {
    * ```
    */
   static updateCart(items: IterableCommerceItem[]) {
-    Iterable?.logger?.log('updateCart');
-
-    RNIterableAPI.updateCart(
-      items as unknown as { [key: string]: string | number | boolean }[]
-    );
+    IterableApi.updateCart(items);
   }
 
   /**
@@ -519,9 +489,7 @@ export class Iterable {
    */
   static wakeApp() {
     if (Platform.OS === 'android') {
-      Iterable?.logger?.log('Attempting to wake the app');
-
-      RNIterableAPI.wakeApp();
+      IterableApi.wakeApp();
     }
   }
 
@@ -556,11 +524,7 @@ export class Iterable {
   ) {
     Iterable?.logger?.log('trackPurchase');
 
-    RNIterableAPI.trackPurchase(
-      total,
-      items as unknown as { [key: string]: string | number | boolean }[],
-      dataFields as { [key: string]: string | number | boolean } | undefined
-    );
+    IterableApi.trackPurchase(total, items, dataFields);
   }
 
   /**
@@ -586,9 +550,13 @@ export class Iterable {
     message: IterableInAppMessage,
     location: IterableInAppLocation
   ) {
-    Iterable?.logger?.log('trackInAppOpen');
-
-    RNIterableAPI.trackInAppOpen(message.messageId, location);
+    if (!message?.messageId) {
+      Iterable?.logger?.log(
+        `Skipping trackInAppOpen because message ID is required, but received ${message}.`
+      );
+      return;
+    }
+    IterableApi.trackInAppOpen(message, location);
   }
 
   /**
@@ -617,9 +585,7 @@ export class Iterable {
     location: IterableInAppLocation,
     clickedUrl: string
   ) {
-    Iterable?.logger?.log('trackInAppClick');
-
-    RNIterableAPI.trackInAppClick(message.messageId, location, clickedUrl);
+    IterableApi.trackInAppClick(message, location, clickedUrl);
   }
 
   /**
@@ -650,14 +616,7 @@ export class Iterable {
     source: IterableInAppCloseSource,
     clickedUrl?: string
   ) {
-    Iterable?.logger?.log('trackInAppClose');
-
-    RNIterableAPI.trackInAppClose(
-      message.messageId,
-      location,
-      source,
-      clickedUrl
-    );
+    IterableApi.trackInAppClose(message, location, source, clickedUrl);
   }
 
   /**
@@ -701,9 +660,7 @@ export class Iterable {
     location: IterableInAppLocation,
     source: IterableInAppDeleteSource
   ) {
-    Iterable?.logger?.log('inAppConsume');
-
-    RNIterableAPI.inAppConsume(message.messageId, location, source);
+    IterableApi.inAppConsume(message, location, source);
   }
 
   /**
@@ -727,12 +684,7 @@ export class Iterable {
    * ```
    */
   static trackEvent(name: string, dataFields?: unknown) {
-    Iterable?.logger?.log('trackEvent');
-
-    RNIterableAPI.trackEvent(
-      name,
-      dataFields as { [key: string]: string | number | boolean } | undefined
-    );
+    IterableApi.trackEvent(name, dataFields);
   }
 
   /**
@@ -778,12 +730,7 @@ export class Iterable {
     dataFields: unknown | undefined,
     mergeNestedObjects: boolean
   ) {
-    Iterable?.logger?.log('updateUser');
-
-    RNIterableAPI.updateUser(
-      dataFields as { [key: string]: string | number | boolean },
-      mergeNestedObjects
-    );
+    IterableApi.updateUser(dataFields, mergeNestedObjects);
   }
 
   /**
@@ -804,9 +751,7 @@ export class Iterable {
    * ```
    */
   static updateEmail(email: string, authToken?: string) {
-    Iterable?.logger?.log('updateEmail');
-
-    RNIterableAPI.updateEmail(email, authToken);
+    IterableApi.updateEmail(email, authToken);
   }
 
   /**
@@ -888,9 +833,7 @@ export class Iterable {
    */
   /* eslint-enable tsdoc/syntax */
   static handleAppLink(link: string): Promise<boolean> {
-    Iterable?.logger?.log('handleAppLink');
-
-    return RNIterableAPI.handleAppLink(link);
+    return IterableApi.handleAppLink(link);
   }
 
   /**
@@ -935,9 +878,7 @@ export class Iterable {
     campaignId: number,
     templateId: number
   ) {
-    Iterable?.logger?.log('updateSubscriptions');
-
-    RNIterableAPI.updateSubscriptions(
+    IterableApi.updateSubscriptions(
       emailListIds,
       unsubscribedChannelIds,
       unsubscribedMessageTypeIds,
@@ -1011,7 +952,7 @@ export class Iterable {
           const message = IterableInAppMessage.fromDict(messageDict);
           // MOB-10423: Check if we can use chain operator (?.) here instead
           const result = Iterable.savedConfig.inAppHandler!(message);
-          RNIterableAPI.setInAppShowResponse(result);
+          IterableApi.setInAppShowResponse(result);
         }
       );
     }

src/core/classes/IterableApi.ts

@@ -578,7 +578,7 @@ export class IterableApi {
    *
    * @param attributionInfo - The attribution info.
    */
-  static setAttributionInfo(attributionInfo: IterableAttributionInfo) {
+  static setAttributionInfo(attributionInfo?: IterableAttributionInfo) {
     // IterableLogger.log('setAttributionInfo: ', attributionInfo);
     return RNIterableAPI.setAttributionInfo(attributionInfo);
   }