Adding onValidationResult Callbacks

Author: al-af

android/src/main/java/com/appsflyer/reactnative/RNAppsFlyerModule.java

@@ -25,8 +25,8 @@
 import com.appsflyer.share.CrossPromotionHelper;
 import com.appsflyer.share.LinkGenerator;
 import com.appsflyer.share.ShareInviteHelper;
-import com.appsflyer.AFPurchaseDetails;
 import com.appsflyer.AFPurchaseType;
+import com.appsflyer.AFPurchaseDetails;
 import com.appsflyer.AppsFlyerInAppPurchaseValidationCallback;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.Promise;
@@ -780,15 +780,15 @@ public void onValidateInAppFailure(String error) {
     }
 
     @ReactMethod
-    public void validateAndLogInAppPurchaseV2(ReadableMap purchaseDetails, ReadableMap additionalParameters, Callback callback) {
+    public void validateAndLogInAppPurchaseV2(ReadableMap purchaseDetails, ReadableMap additionalParameters) {
         try {
             String purchaseType = purchaseDetails.getString("purchaseType");
             String purchaseToken = purchaseDetails.getString("transactionId");
             String productId = purchaseDetails.getString("productId");
 
             // Convert purchaseType string to AFPurchaseType enum
             AFPurchaseType afPurchaseType;
-            if ("subscription".equals(purchaseType.rawValue())) {
+            if ("subscription".equals(purchaseType)) {
                 afPurchaseType = AFPurchaseType.SUBSCRIPTION;
             } else {
                 afPurchaseType = AFPurchaseType.ONE_TIME_PURCHASE;
@@ -808,23 +808,19 @@ public void validateAndLogInAppPurchaseV2(ReadableMap purchaseDetails, ReadableM
                     additionalParamsMap,
                     new AppsFlyerInAppPurchaseValidationCallback() {
                         @Override
-                        public void onSuccess() {
-                            if (callback != null) {
-                                callback.invoke("In App Purchase Validation completed successfully!");
-                            }
+                        public void onInAppPurchaseValidationFinished(Map<String, Object> validationResult) {
+                            sendEvent(reactContext, "onValidationResult", validationResult.toString());
                         }
 
                         @Override
-                        public void onError(int errorCode, String errorMessage) {
-                            if (callback != null) {
-                                callback.invoke("Error: " + errorMessage);
-                            }
+                        public void onInAppPurchaseValidationError(Map<String, Object> validationError) {
+                            sendEvent(reactContext, "onValidationResult", validationError.toString());
                         }
                     });
         } catch (Exception e) {
-            if (callback != null) {
-                callback.invoke("Error: " + e.getMessage());
-            }
+            Map<String, Object> error = new HashMap<>();
+            error.put("error", e.getMessage());
+            sendEvent(reactContext, "onValidationResult", error.toString());
         }
     }
 

index.d.ts

@@ -376,12 +376,13 @@ declare module "react-native-appsflyer" {
     ): Response<string>;
     /**
      * [NEW API] This is the new validateAndLogInAppPurchase API with AFPurchaseDetails.
+     * Uses event emitter pattern for callback handling.
      */
-    validateAndLogInAppPurchase(
+    validateAndLogInAppPurchaseV2(
       purchaseDetails: AFPurchaseDetails,
       additionalParameters?: object,
       callback?: AppsFlyerInAppPurchaseValidationCallback
-    ): void;
+    ): (() => void) | void;
 
     updateServerUninstallToken(token: string, successC?: SuccessCB): void;
     sendPushNotificationData(pushPayload: object, errorC?: ErrorCB): void;

index.js

@@ -852,30 +852,41 @@ export const AFPurchaseType = {
 };
 
 /**
- * Validate and log in-app purchase with support for both legacy and new APIs.
- * 
- * - **Legacy API**: validateAndLogInAppPurchase(purchaseInfo, successC, errorC) 
- * - **New API**: validateAndLogInAppPurchase(purchaseDetails, additionalParameters, callback) 
- * 
- * The method automatically detects which API to use based on the parameters:
- * - If first parameter has 'purchaseType' property, uses new API
- * - Otherwise, uses legacy API
+ * [LEGACY WARNING] This is the legacy validateAndLogInAppPurchase API.
  */
-appsFlyer.validateAndLogInAppPurchase = (param1, param2, param3) => {
-  // Debug: Check if native methods exist
-  console.log('[AppsFlyer] RNAppsFlyer methods:', Object.keys(RNAppsFlyer));
-  console.log('[AppsFlyer] validateAndLogInAppPurchaseV2 exists:', typeof RNAppsFlyer.validateAndLogInAppPurchaseV2);
+appsFlyer.validateAndLogInAppPurchase = (purchaseInfo, successCallback, errorCallback) => {
+  console.log('[AppsFlyer] Using legacy validateAndLogInAppPurchase API');
+  return RNAppsFlyer.validateAndLogInAppPurchase(purchaseInfo, successCallback, errorCallback);
+};
+
+/**
+ * New validateAndLogInAppPurchase API with AFPurchaseDetails support.
+ */
+appsFlyer.validateAndLogInAppPurchaseV2 = (purchaseDetails, additionalParameters, callback) => {
+  console.log('[AppsFlyer] Using new validateAndLogInAppPurchaseV2 API with AFPurchaseDetails');
 
-  // Detect which API to use based on the first parameter
-  if (param1 && typeof param1 === 'object' && param1.purchaseType) {
-    // New API: (purchaseDetails, additionalParameters, callback)
-    console.log('[AppsFlyer] Using new validateAndLogInAppPurchase API with AFPurchaseDetails');
-    return RNAppsFlyer.validateAndLogInAppPurchaseV2(param1, param2, param3);
-  } else {
-    // Legacy API: (purchaseInfo, successC, errorC)
-    console.log('[AppsFlyer] Using legacy validateAndLogInAppPurchase API');
-    return RNAppsFlyer.validateAndLogInAppPurchase(param1, param2, param3);
+  if (callback && typeof callback === typeof Function) {
+    const listener = appsFlyerEventEmitter.addListener(
+      "onValidationResult",
+      (_data) => {
+        try {
+          let data = JSON.parse(_data);
+          callback(data);
+        } catch (_error) {
+          callback(new AFParseJSONException("Invalid data structure", _data));
+        }
+      }
+    );
+
+    eventsMap["onValidationResult"] = listener;
+
+    // unregister listener (suppose should be called from componentWillUnmount() )
+    return function remove() {
+      listener.remove();
+    };
   }
+  
+  return RNAppsFlyer.validateAndLogInAppPurchaseV2(purchaseDetails, additionalParameters);
 };
 
 appsFlyer.setUseReceiptValidationSandbox = (isSandbox) => {

ios/RNAppsFlyer.m

@@ -604,14 +604,11 @@ - (BOOL)isExpoApp {
 
 }
 
-RCT_EXPORT_METHOD(validateAndLogInAppPurchaseV2:(NSDictionary*)purchaseDetails
-                  additionalParameters:(NSDictionary*)additionalParameters
-                  callback:(RCTResponseSenderBlock)callback) {
+RCT_EXPORT_METHOD(validateAndLogInAppPurchaseV2: (NSDictionary*)purchaseDetails
+                  additionalParameters:(NSDictionary*)additionalParameters) {
 
     if (!purchaseDetails || [purchaseDetails isKindOfClass:[NSNull class]]) {
-        if (callback) {
-            callback(@[@"Error: Purchase details are required"]);
-        }
+        [self sendEventWithName:@"onValidationResult" body:@"{\"error\": \"Purchase details are required\"}"];
         return;
     }
 
@@ -620,9 +617,7 @@ - (BOOL)isExpoApp {
     NSString* transactionId = [purchaseDetails objectForKey:@"transactionId"];
 
     if (!purchaseType || !productId || !transactionId) {
-        if (callback) {
-            callback(@[@"Error: purchaseType, productId, and transactionId are required"]);
-        }
+        [self sendEventWithName:@"onValidationResult" body:@"{\"error\": \"purchaseType, productId, and transactionId are required\"}"];
         return;
     }
 
@@ -642,12 +637,10 @@ - (BOOL)isExpoApp {
     [[AppsFlyerLib shared] validateAndLogInAppPurchase:details
                                        extraEventValues:additionalParameters
                                       completionHandler:^(AFSDKValidateAndLogResult * _Nullable result) {
-        if (callback) {
-            if (result && result.isValid) {
-                callback(@[@"In App Purchase Validation completed successfully!"]);
-            } else {
-                callback(@[@"Error: Purchase validation failed"]);
-            }
+        if (result && result.isValid) {
+            [self sendEventWithName:@"onValidationResult" body:@"{\"result\": true, \"message\": \"In App Purchase Validation completed successfully!\"}"];
+        } else {
+            [self sendEventWithName:@"onValidationResult" body:@"{\"error\": \"Purchase validation failed\"}"];
         }
     }];
 }