fixed types, fixed paywall logs methods

Author: GeorgiiMishin

ApphudPaywallsHelper.swift

@@ -0,0 +1,37 @@
+import ApphudSDK
+import Combine
+
+final class ApphudPaywallsHelper {
+  static func getPaywall(paywallIdentifier:String?, placementIdentifier: String?) async -> ApphudPaywall? {
+    if paywallIdentifier == nil, placementIdentifier == nil {
+      return nil
+    }
+      
+    var paywall:ApphudPaywall?
+        
+    if(placementIdentifier != nil) {
+      let placements = await Apphud.placements()
+      paywall = placements
+        .first(where: {pl in pl.identifier == placementIdentifier})?.paywall
+    } else {
+      paywall = await withCheckedContinuation { @MainActor continuation in
+        Apphud.paywallsDidLoadCallback{ paywalls, error in
+          paywall = paywalls
+            .first(where: { pw in return pw.identifier == paywallIdentifier })
+          continuation.resume(returning: paywall)
+        }
+      }
+    }
+    return paywall
+  }
+    
+  static func getPaywalls() async -> [ApphudPaywall] {
+    return await withCheckedContinuation { @MainActor continuation in
+      Apphud
+        .paywallsDidLoadCallback{
+          pwls,
+          error in continuation.resume(returning: pwls)
+        }
+    }
+  }
+}

android/src/main/java/com/reactnativeapphudsdk/ApphudDataTransformer.kt

@@ -121,7 +121,7 @@ internal fun ApphudPaywall.toMap(): WritableNativeMap {
 
   result.putString("name", name)
   result.putString("identifier", identifier)
-  result.putBoolean("default", default)
+  result.putBoolean("isDefault", default)
 
   json?.let {
     result.putMap("json", it.toWritableNativeMap())

android/src/main/java/com/reactnativeapphudsdk/ApphudSdkModule.kt

@@ -80,25 +80,28 @@ class ApphudSdkModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun paywallShown(identifier: String) {
-    Apphud.paywallsDidLoadCallback { apphudPaywalls, _ ->
-      val paywall = apphudPaywalls.firstOrNull { it.identifier == identifier }
+  fun paywallShown(options: ReadableMap) {
+    val paywallIdentifier = options.getString("paywallIdentifier")
+    val placementIdentifier = options.getString("placementIdentifier")
 
+    Utils.paywall(paywallIdentifier, placementIdentifier) { paywall ->
       paywall?.let {
-        Apphud.paywallShown(it)
+        Apphud.paywallShown(paywall)
       }
     }
   }
 
   @ReactMethod
-  fun paywallClosed(identifier: String) {
-    Apphud.paywallsDidLoadCallback { apphudPaywalls, _ ->
-      val paywall = apphudPaywalls.firstOrNull { it.identifier == identifier }
+  fun paywallClosed(options: ReadableMap) {
+    val paywallIdentifier = options.getString("paywallIdentifier")
+    val placementIdentifier = options.getString("placementIdentifier")
 
+    Utils.paywall(paywallIdentifier, placementIdentifier) { paywall ->
       paywall?.let {
-        Apphud.paywallClosed(it)
+        Apphud.paywallClosed(paywall)
       }
     }
+
   }
 
   @ReactMethod

android/src/main/java/com/reactnativeapphudsdk/Utils.kt

@@ -0,0 +1,29 @@
+package com.reactnativeapphudsdk
+
+import com.apphud.sdk.Apphud
+import com.apphud.sdk.domain.ApphudPaywall
+
+object Utils {
+  fun paywall(
+    paywallIdentifier: String?,
+    placementIdentifier: String?,
+    cb: (ApphudPaywall?) -> Unit
+  ) {
+
+    if (paywallIdentifier == null && placementIdentifier == null) {
+      cb(null)
+      return
+    }
+
+    placementIdentifier?.let { pId ->
+      Apphud.fetchPlacements { apphudPlacements, _ ->
+        cb(apphudPlacements.find { it.identifier == pId }?.paywall)
+      }
+    } ?: run {
+      Apphud.paywallsDidLoadCallback { apphudPaywalls, _ ->
+        val paywall = apphudPaywalls.firstOrNull { it.identifier == paywallIdentifier }
+        cb(paywall)
+      }
+    }
+  }
+}

example/src/screens/PaywallScreen.tsx

@@ -107,11 +107,18 @@ export default function PaywallScreen({
 
   React.useEffect(() => {
     const findPaywall = async () => {
-      const paywalls = await ApphudSdk.paywalls();
+      const paywalls = (await ApphudSdk.placements())
+        .map((x) => x.paywall)
+        .filter((x) => x) as ApphudPaywall[];
+
       for (const paywall of paywalls) {
         if (paywall.identifier === route.params.paywallId) {
           setCurrentPaywall(paywall);
-          ApphudSdk.paywallShown(paywall.identifier);
+
+          ApphudSdk.paywallShown({
+            paywallIdentifier: paywall.identifier,
+            placementIdentifier: paywall.placementIdentifier,
+          });
 
           setProductsProps(prepareProducts(paywall.products));
           return paywall;

ios/ApphudSdk.m

@@ -50,8 +50,8 @@ @interface RCT_EXTERN_MODULE(ApphudSdk, NSObject)
 
 RCT_EXTERN_METHOD(collectDeviceIdentifiers)
 RCT_EXTERN_METHOD(setDeviceIdentifiers:(NSDictionary*)options)
-RCT_EXTERN_METHOD(paywallShown:(NSString*)identifier)
-RCT_EXTERN_METHOD(paywallClosed:(NSString*)identifier)
+RCT_EXTERN_METHOD(paywallShown:(NSDictionary*)options)
+RCT_EXTERN_METHOD(paywallClosed:(NSDictionary*)options)
 RCT_EXTERN_METHOD(optOutOfTracking)
 RCT_EXTERN_METHOD(enableDebugLogs)
 RCT_EXTERN_METHOD(logout: (RCTPromiseResolveBlock)resolve

ios/ApphudSdk.swift

@@ -192,23 +192,36 @@ class ApphudSdk: NSObject {
   }
 
   @objc(paywallShown:)
-  func paywallShown(identifier: String) {
-    print("Paywall Shown: \(identifier)")
+  func paywallShown(options: [AnyHashable : Any]) {
+    let placementIdentifier = options["placementIdentifier"] as? String
+    let paywallIdentifier = options["paywallIdentifier"] as? String
+    
+    if placementIdentifier == nil && paywallIdentifier == nil {
+      return
+    }
+    
     Task {
-      if let paywall = await paywalls().first(
-        where: { $0.identifier == identifier
-        }) {
+      var paywall = await ApphudPaywallsHelper.getPaywall(paywallIdentifier: paywallIdentifier, placementIdentifier: placementIdentifier)
+      
+      if let paywall {
         Apphud.paywallShown(paywall)
       }
     }
   }
 
   @objc(paywallClosed:)
-  func paywallClosed(identifier: String) {
+  func paywallClosed(options: [AnyHashable : Any]) {
+    let placementIdentifier = options["placementIdentifier"] as? String
+    let paywallIdentifier = options["paywallIdentifier"] as? String
+    
+    if placementIdentifier == nil && paywallIdentifier == nil {
+      return
+    }
+
     Task {
-      if let paywall = await paywalls().first(
-        where: { $0.identifier == identifier
-        }) {
+      var paywall = await ApphudPaywallsHelper.getPaywall(paywallIdentifier: paywallIdentifier, placementIdentifier: placementIdentifier)
+      
+      if let paywall {
         Apphud.paywallClosed(paywall)
       }
     }

ios/DataTransformer.swift

@@ -56,6 +56,7 @@ extension ApphudProduct : RNAdapter {
     map["store"] = store
     map["skProduct"] = skProduct?.toMap()
     map["paywallIdentifier"] = paywallIdentifier
+    map["placementIdentifier"] = placementIdentifier
 
     return map as NSDictionary;
   }

src/module/ApphudSdk.ts

@@ -14,6 +14,7 @@ import type {
   ApphudUser,
   ApphudPlacement,
   Identifiers,
+  PaywallLogsInfo,
 } from './types';
 
 interface IApphudSdk {
@@ -42,24 +43,34 @@ interface IApphudSdk {
   /**
    * Available on iOS and Android.
    *
+   * Returns the placements from Product Hub > Placements, potentially altered based on the user's involvement in A/ B testing, if applicable
+   *
+   */
+  placements(): Promise<ApphudPlacement[]>;
+
+  /**
+   * Available on iOS and Android.
+   *
+   * @deprecated Will be removed in the future
+   *
    * Each paywall contains an array of `ApphudProduct` objects that you use for purchase.
    * `ApphudProduct` is Apphud's wrapper around `SKProduct`/ `ProductDetails` models.
    * Method returns immediately if paywalls are cached or already loaded.
    * @returns paywalls configured in Apphud Dashboard > Product Hub > Paywalls.
    */
-  paywalls(): Promise<Array<ApphudPaywall>>;
+  paywalls(): Promise<ApphudPaywall[]>;
 
   /**
    * Available on iOS and Android
    * Logs a "Paywall Shown" (Paywall View) event which is required for A/B Testing Analytics.
    */
-  paywallShown(identifier: string): void;
+  paywallShown(options: PaywallLogsInfo): void;
 
   /**
    * Available on iOS and Android
    * Logs a "Paywall Closed" event. Optional.
    */
-  paywallClosed(identifier: string): void;
+  paywallClosed(options: PaywallLogsInfo): void;
 
   /**
    * Available on iOS and Android.
@@ -273,14 +284,6 @@ interface IApphudSdk {
    */
   handlePushNotification(payload: any): void;
 
-  /**
-   * Available on iOS and Android.
-   *
-   * Returns the placements from Product Hub > Placements, potentially altered based on the user's involvement in A/ B testing, if applicable
-   *
-   */
-  placements(): Promise<ApphudPlacement[]>;
-
   /**
    * Available on iOS
    *

src/module/types.ts

@@ -319,16 +319,36 @@ export interface ApphudPaywall {
    */
   identifier: string;
 
+  /**
+   * Available on Android
+   *
+   * Paywall name, from Apphud Dashboard.
+   *
+   */
+  name?: string;
+
   /**
    * A/B experiment name, if any.
    */
   experimentName?: string;
 
+  /**
+   * It's possible to make a paywall default – it's a special alias name, that can be assigned to only ONE paywall at a time.
+   * There can be no default paywalls at all. It's up to you whether you want to have them or not.
+   */
+  isDefault: boolean;
+
   /**
    * A/B Experiment Variation Name
    */
   variationName?: string;
 
+  /**
+   * Represents the identifier of a parent paywall from which an experiment variation was derived in A/B Experiments.
+   * This property is populated only if the 'Use existing paywall' option was selected during the setup of the experiment variation.
+   */
+  parentPaywallIdentifier?: string;
+
   /**
    * Custom JSON data from Paywall.
    */
@@ -338,6 +358,11 @@ export interface ApphudPaywall {
    * Array of products from Paywall.
    */
   products: ApphudProduct[];
+
+  /**
+   * Current paywall's placement identifier, if available.
+   */
+  placementIdentifier?: string;
 }
 
 /**
@@ -415,8 +440,15 @@ export interface ApphudProduct {
    */
   productDetails?: ProductDetails;
 
-  /** Paywall Identifier */
+  /**
+   * Paywall Identifier
+   */
   paywallIdentifier?: string;
+
+  /**
+   * Placement Identifier, if any.
+   */
+  placementIdentifier?: string;
 }
 
 /** Available on Android only
@@ -576,3 +608,8 @@ export interface Identifiers {
    */
   idfv: string;
 }
+
+export interface PaywallLogsInfo {
+  placementIdentifier?: string;
+  paywallIdentifier?: string;
+}