VAL2 Feature iOS

Author: al-af

index.d.ts

@@ -113,11 +113,6 @@ declare module "react-native-appsflyer" {
     productId: string;
   }
 
-  export interface AppsFlyerInAppPurchaseValidationCallback {
-    onSuccess?: (result?: any) => void;
-    onError?: (error?: any) => void;
-  }
-
   export interface SetEmailsOptions {
     emails?: string[];
     emailsCryptType: AF_EMAIL_CRYPT_TYPE | 0 | 3;
@@ -380,9 +375,9 @@ declare module "react-native-appsflyer" {
      */
     validateAndLogInAppPurchaseV2(
       purchaseDetails: AFPurchaseDetails,
-      additionalParameters?: object,
-      callback?: AppsFlyerInAppPurchaseValidationCallback
-    ): (() => void) | void;
+      additionalParameters?: { [key: string]: any },
+      callback?: (data: any) => void
+    ): void;
 
     updateServerUninstallToken(token: string, successC?: SuccessCB): void;
     sendPushNotificationData(pushPayload: object, errorC?: ErrorCB): void;

index.js

@@ -738,6 +738,36 @@ appsFlyer.onDeepLink = (callback) => {
   };
 };
 
+
+/**
+ * New validateAndLogInAppPurchase API with AFPurchaseDetails support.
+ */
+appsFlyer.validateAndLogInAppPurchaseV2 = (purchaseDetails, additionalParameters , callback) => {
+  const listener = appsFlyerEventEmitter.addListener("onValidationResult", (_data) => {
+    if (callback && typeof callback === 'function') {
+      if (typeof _data === 'string') {
+        try {
+          const parsed = JSON.parse(_data);
+          callback(parsed);
+        } catch {
+          callback(new AFParseJSONException('Invalid JSON string', _data));
+        }
+      } else {
+        callback(_data);
+      }
+    }
+  });
+
+  eventsMap["onValidationResult"] = listener;
+
+  RNAppsFlyer.validateAndLogInAppPurchaseV2(purchaseDetails, additionalParameters);
+
+  // unregister listener (suppose should be called from componentWillUnmount() )
+  return function remove() {
+    listener.remove();
+  };
+};
+
 /**
  * Anonymize user Data.
  * Use this API during the SDK Initialization to explicitly anonymize a user's installs, events and sessions.
@@ -859,36 +889,6 @@ appsFlyer.validateAndLogInAppPurchase = (purchaseInfo, successCallback, errorCal
   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');
-  
-  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) => {
   return RNAppsFlyer.setUseReceiptValidationSandbox(isSandbox);
 };

ios/RNAppsFlyer.h

@@ -51,6 +51,7 @@ static NSString *const IOS_14_ONLY                  = @"Feature only supported o
   #define afOnInstallConversionDataLoaded @"onInstallConversionDataLoaded"
   #define afDeepLink                      @"onDeepLinkListener"
   #define afOnDeepLinking                 @"onDeepLinking"
+  #define afOnValidationResult            @"onValidationResult"
 
 // User Invites, Cross Promotion
 #define afCpAppID                       @"crossPromotedAppId"

ios/RNAppsFlyer.m

@@ -476,7 +476,7 @@ -(void) handleCallback:(NSDictionary *) message {
 }
 
 - (NSArray<NSString *> *)supportedEvents {
-    return @[afOnAttributionFailure,afOnAppOpenAttribution,afOnInstallConversionFailure, afOnInstallConversionDataLoaded, afOnDeepLinking];
+    return @[afOnAttributionFailure,afOnAppOpenAttribution,afOnInstallConversionFailure, afOnInstallConversionDataLoaded, afOnDeepLinking, afOnValidationResult];
 }
 
 -(void) reportOnFailure:(NSString *)errorMessage type:(NSString*) type {
@@ -608,7 +608,7 @@ - (BOOL)isExpoApp {
                   additionalParameters:(NSDictionary*)additionalParameters) {
 
     if (!purchaseDetails || [purchaseDetails isKindOfClass:[NSNull class]]) {
-        [self sendEventWithName:@"onValidationResult" body:@"{\"error\": \"Purchase details are required\"}"];
+        [self sendEventWithName:afOnValidationResult body:@"{\"error\": \"Purchase details are required\"}"];
         return;
     }
 
@@ -617,7 +617,7 @@ - (BOOL)isExpoApp {
     NSString* transactionId = [purchaseDetails objectForKey:@"transactionId"];
 
     if (!purchaseType || !productId || !transactionId) {
-        [self sendEventWithName:@"onValidationResult" body:@"{\"error\": \"purchaseType, productId, and transactionId are required\"}"];
+        [self sendEventWithName:afOnValidationResult body:@"{\"error\": \"purchaseType, productId, and transactionId are required\"}"];
         return;
     }
 
@@ -629,20 +629,21 @@ - (BOOL)isExpoApp {
         afPurchaseType = AFSDKPurchaseTypeOneTimePurchase;
     }
 
-    // Create AFSDKPurchaseDetails object
-    AFSDKPurchaseDetails* details = [[AFSDKPurchaseDetails alloc] initWithPurchaseType:afPurchaseType
-                                                                              productId:productId
-                                                                          transactionId:transactionId];
-    
-    [[AppsFlyerLib shared] validateAndLogInAppPurchase:details
-                                       extraEventValues:additionalParameters
-                                      completionHandler:^(AFSDKValidateAndLogResult * _Nullable result) {
-        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\"}"];
-        }
-    }];
+    AFSDKPurchaseDetails* details = [[AFSDKPurchaseDetails alloc] initWithProductId:productId transactionId:transactionId purchaseType:afPurchaseType];
+
+    [[AppsFlyerLib shared] validateAndLogInAppPurchase:details purchaseAdditionalDetails:additionalParameters completion:^(NSDictionary * _Nullable response, NSError * _Nullable error) {
+            if (error == nil) {
+                BOOL valid = [response[@"result"] boolValue];
+                if (valid) {
+                    [self sendEventWithName:afOnValidationResult body:@"{\"result\": true, \"message\": \"In App Purchase Validation completed successfully!\"}"];
+                } else {
+                    NSString *msg = response[@"message"] ?: @"Purchase validation failed";
+                    [self sendEventWithName:afOnValidationResult body:@"{\"result\": false, \"message\": \"Purchase validation failed\"}"];
+                }
+            } else {
+                [self sendEventWithName:afOnValidationResult body:[NSString stringWithFormat:@"{\"error\": \"%@\"}", error.localizedDescription]];
+            }
+        }];
 }
 
 RCT_EXPORT_METHOD(sendPushNotificationData: (NSDictionary*)pushPayload errorCallBack:(RCTResponseErrorBlock)errorCallBack) {