Merge pull request #89 from AppsFlyerSDK/dev/purchaseValidationCallbacks

Added callback support for purchase validation

Author: GM-appsflyer

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Versions
 
+## 6.2.1+6
+- Added callbacks support for purchase validation API
+
 ## 6.2.1+5
 - Added support for useReceiptValidationSandbox API
 

android/src/main/java/com/appsflyer/appsflyersdk/AppsflyerSdkPlugin.java

@@ -71,6 +71,7 @@ public class AppsflyerSdkPlugin implements MethodCallHandler, FlutterPlugin, Act
     private Boolean gcdCallback = false;
     private Boolean oaoaCallback = false;
     private Boolean udlCallback = false;
+    private Boolean validatePurchaseCallback = false;
 
     private void onAttachedToEngine(Context applicationContext, BinaryMessenger messenger) {
         this.mContext = applicationContext;
@@ -108,6 +109,9 @@ private void startListening(Object arguments, Result rawResult) {
         if (callbackName.equals(AppsFlyerConstants.AF_UDL_CALLBACK)){
             udlCallback = true;
         }
+        if (callbackName.equals(AppsFlyerConstants.AF_VALIDATE_PURCHASE)){
+            validatePurchaseCallback = true;
+        }
         Map<String, Object> args = new HashMap<>();
         args.put("id", callbackName);
         mCallbacks.put(callbackName, args);
@@ -379,12 +383,14 @@ private void registerValidatorListener() {
         AppsFlyerInAppPurchaseValidatorListener validatorListener = new AppsFlyerInAppPurchaseValidatorListener() {
             @Override
             public void onValidateInApp() {
-                JSONObject obj = new JSONObject();
-
                 try {
-                    obj.put("status", AF_SUCCESS);
-                    obj.put("type", AF_VALIDATE_PURCHASE);
-                    sendEventToDart(obj, AF_EVENTS_CHANNEL);
+                    JSONObject obj = new JSONObject();
+                    if(validatePurchaseCallback){
+                        runOnUIThread(obj, AppsFlyerConstants.AF_VALIDATE_PURCHASE, AF_SUCCESS);
+                    }else{
+                        obj.put("status", AF_SUCCESS);
+                        sendEventToDart(obj, AF_EVENTS_CHANNEL);
+                    }
                 } catch (JSONException e) {
                     e.printStackTrace();
                 }
@@ -393,12 +399,15 @@ public void onValidateInApp() {
 
             @Override
             public void onValidateInAppFailure(String s) {
-                JSONObject obj = new JSONObject();
                 try {
-                    obj.put("status", AF_FAILURE);
-                    obj.put("type", AF_VALIDATE_PURCHASE);
+                    JSONObject obj = new JSONObject();
                     obj.put("error", s);
-                    sendEventToDart(obj, AF_EVENTS_CHANNEL);
+                    if(validatePurchaseCallback){
+                        runOnUIThread(obj, AppsFlyerConstants.AF_VALIDATE_PURCHASE, AF_FAILURE);
+                    }else{
+                        obj.put("status", AF_FAILURE);
+                        sendEventToDart(obj, AF_EVENTS_CHANNEL);
+                    }
                 } catch (JSONException e) {
                     e.printStackTrace();
                 }

doc/API.md

@@ -30,8 +30,7 @@
 - [getHostName](#getHostName)
 - [getHostPrefix](#getHostPrefix)
 - [updateServerUninstallToken](#updateServerUninstallToken)
-- [validateAndLogInAppAndroidPurchase](#validateAndLogInAppAndroidPurchase)
-- [validateAndLogInAppIosPurchase](#validateAndLogInAppIosPurchase)
+- [Validate Purchase](#validatePurchase)
 - [setPushNotification](#setPushNotification)
 - [stream](#streams)
 ---
@@ -305,13 +304,18 @@ _Example:_
 appsFlyerSdk.updateServerUninstallToken("token");
 ```
 ---
-**<a id="validateAndLogInAppAndroidPurchase"> `Future<dynamic> validateAndLogInAppAndroidPurchase( 
+**<a id="validatePurchase"> Validate Purchase**
+
+
+***Android:***
+
+`Future<dynamic> validateAndLogInAppAndroidPurchase( 
       String publicKey,
       String signature,
       String purchaseData,
       String price,
       String currency,
-      Map<String, String> additionalParameters)`**
+      Map<String, String> additionalParameters)`
 
 _Example:_
 ```dart
@@ -323,8 +327,10 @@ appsFlyerSdk.validateAndLogInAppAndroidPurchase(
            "currency",
            {"fs": "fs"});
 ```
----
-**<a id="validateAndLogInAppIosPurchase"> `Future<dynamic> validateAndLogInAppIosPurchase( 
+
+***iOS:***
+
+**`Future<dynamic> validateAndLogInAppIosPurchase( 
       String productIdentifier,
       String price,
       String currency,
@@ -341,15 +347,26 @@ appsFlyerSdk.validateAndLogInAppIosPurchase(
            "additionalParameters");
 ```
 
-
-***To use the purchase validation feature in sandbox mode call the follow API:***
+***Purchase validation sandbox mode for iOS:***
 
 `void useReceiptValidationSandbox(bool isSandboxEnabled)`
 
 _Example:_
 ```dart
 appsFlyerSdk.useReceiptValidationSandbox(true);
 ```
+
+***Purchase validation callback***
+
+`void onPurchaseValidation(Function callback)`
+
+_Example:_
+```dart
+appsflyerSdk.onPurchaseValidation((res){
+  print("res: " + res.toString());
+});
+```
+
 ---
 **<a id="setPushNotification"> `void setPushNotification(bool isEnabled)`**
 

example/lib/main_page.dart

@@ -22,9 +22,9 @@ class MainPageState extends State<MainPage> {
   void initState() {
     super.initState();
     final AppsFlyerOptions options = AppsFlyerOptions(
-        afDevKey: DotEnv().env["DEV_KEY"],
-        appId: DotEnv().env["APP_ID"],
-        showDebug: true);
+    afDevKey: DotEnv().env["DEV_KEY"],
+    appId: DotEnv().env["APP_ID"],
+    showDebug: true);
     _appsflyerSdk = AppsflyerSdk(options);
     _appsflyerSdk.onAppOpenAttribution((res) {
       print("res: " + res.toString());

ios/Classes/AppsFlyerStreamHandler.h

@@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface AppsFlyerStreamHandler: NSObject<FlutterStreamHandler, AppsFlyerLibDelegate, AppsFlyerDeepLinkDelegate>
 
-- (void) sendObject:(NSDictionary*) obj;
+- (void) sendValidatePurchaseResponseToFlutter:(NSDictionary*) obj;
 
 @end
 

ios/Classes/AppsFlyerStreamHandler.m

@@ -155,14 +155,20 @@ - (void)didResolveDeepLink:(AppsFlyerDeepLinkResult* _Nonnull) deepLinkResult {
     }
 }
 
-- (void)sendObject:(NSDictionary *)message{
+- (void)sendValidatePurchaseResponseToFlutter:(NSDictionary *)message{
     NSError *error;
-    NSData *JSON = [NSJSONSerialization dataWithJSONObject:message options:0 error:&error];
+    // NSData *JSON = [NSJSONSerialization dataWithJSONObject:message options:0 error:&error];
+    NSString *JSONString = [self mapToJson:message withError:error];
     if (error) {
         return;
     }
-    NSString *JSONString = [[NSString alloc] initWithData:JSON encoding:NSUTF8StringEncoding];
-    _eventSink(JSONString);
+    NSDictionary *fullResponse = @{
+                @"id": afValidatePurchase,
+                @"data": JSONString,
+                @"status": afSuccess
+            };
+    JSONString = [self mapToJson:fullResponse withError:error];
+    [AppsflyerSdkPlugin.callbackChannel invokeMethod:@"callListener" arguments:JSONString];
 }
 
 @end

ios/Classes/AppsflyerSdkPlugin.m

@@ -299,16 +299,15 @@ - (void)onValidateSuccess: (NSDictionary*) data{
                               @"data": data
                               };
 
-    [_streamHandler sendObject:message];
+    [_streamHandler sendValidatePurchaseResponseToFlutter:message];
 }
 
 -(void)onValidateFail:(NSError*)error{
     NSDictionary* message = @{
-                              @"type": afValidatePurchase,
-                              @"status": afSuccess,
+                              @"status": afFailure,
                               @"error": @"error connecting"
                               };
-    [_streamHandler sendObject:message];
+    [_streamHandler sendValidatePurchaseResponseToFlutter:message];
     [self performSelectorOnMainThread:@selector(handleCallback:) withObject:@[message,afValidatePurchaseChannel] waitUntilDone:NO];
 }
 

lib/src/appsflyer_sdk.dart

@@ -202,14 +202,15 @@ class AppsflyerSdk {
   }
 
   ///Returns `Stream`. Accessing AppsFlyer purchase validation data
-  void _registerValidatePurchaseCallback() {
+   Stream<dynamic> _registerValidatePurchaseStream() {
     if (_afValidtaPurchaseController == null) {
       _afValidtaPurchaseController = StreamController(onCancel: () {
         _afValidtaPurchaseController.close();
       });
 
       _registerPurchaseValidateListener();
     }
+    return _afValidtaPurchaseController.stream;
   }
 
   ///initialize the SDK, using the options initialized from the constructor|
@@ -368,16 +369,15 @@ class AppsflyerSdk {
       String price,
       String currency,
       Map<String, String> additionalParameters) {
-         
-    _registerValidatePurchaseCallback();
-    return _methodChannel.invokeMethod("validateAndLogInAppAndroidPurchase", {
-      'publicKey': publicKey,
-      'signature': signature,
-      'purchaseData': purchaseData,
-      'price': price,
-      'currency': currency,
-      'additionalParameters': additionalParameters
-    });
+
+      return _methodChannel.invokeMethod("validateAndLogInAppAndroidPurchase", {
+        'publicKey': publicKey,
+        'signature': signature,
+        'purchaseData': purchaseData,
+        'price': price,
+        'currency': currency,
+        'additionalParameters': additionalParameters
+      });
   }
 
   ///Accessing AppsFlyer purchase validation data
@@ -386,9 +386,7 @@ class AppsflyerSdk {
       String price,
       String currency,
       String transactionId,
-      Map<String, String> additionalParameters) async {
-      await Future.delayed(Duration(seconds: 10));
-      _registerValidatePurchaseCallback();
+      Map<String, String> additionalParameters)async{
       return await _methodChannel.invokeMethod("validateAndLogInAppIosPurchase", {
         'productIdentifier': productIdentifier,
         'price': price,

lib/src/callbacks.dart

@@ -18,6 +18,7 @@ Future<void> _methodCallHandler(MethodCall call) async {
           case "onAppOpenAttribution":
           case "onInstallConversionData":
           case "onDeepLinking":
+          case "validatePurchase":
             String data = callMap["data"];
             Map decodedData = jsonDecode(data);
             Map fullResponse = {

pubspec.yaml

@@ -1,6 +1,6 @@
 name: appsflyer_sdk
 description: A Flutter plugin for AppsFlyer SDK. Supports iOS and Android.
-version: 6.2.1+5
+version: 6.2.1+6
 
 homepage: https://github.com/AppsFlyerSDK/flutter_appsflyer_sdk