Merge pull request #77 from qonversion/release/3.1.0

Maria-Bordunova · web-flow · commit 449bc7f7440a · 2021-05-25T15:40:54.000+03:00
Release/3.1.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.1.0
+* Add support for promo purchases on iOS
+* Add Identity support
+
 ## 3.0.1
 * Fix QOfferings mapping error
 * Internal logic optimization for Android
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,9 +1,9 @@
 group 'com.qonversion.flutter.sdk.qonversion_flutter_sdk'
-version '3.0.1'
+version '3.1.0'
 
 buildscript {
     ext.kotlin_version = '1.3.50'
-    ext.qonversion_version = '2.7.6'
+    ext.qonversion_version = '2.8.0'
     repositories {
         google()
         jcenter()
diff --git a/android/src/main/kotlin/com/qonversion/flutter/sdk/qonversion_flutter_sdk/BaseListenerWrapper.kt b/android/src/main/kotlin/com/qonversion/flutter/sdk/qonversion_flutter_sdk/BaseListenerWrapper.kt
@@ -3,14 +3,13 @@ package com.qonversion.flutter.sdk.qonversion_flutter_sdk
 import io.flutter.plugin.common.BinaryMessenger
 import io.flutter.plugin.common.EventChannel
 
-abstract class BaseListenerWrapper(
-        val binaryMessenger: BinaryMessenger
+class BaseListenerWrapper internal constructor(
+        private val binaryMessenger: BinaryMessenger,
+        private val eventChannelPostfix: String
 ) {
 
-    protected abstract val eventChannelPostfix: String
-
-    protected var eventChannel: EventChannel? = null
-    protected var eventStreamHandler: BaseEventStreamHandler? = null
+    private var eventChannel: EventChannel? = null
+    var eventStreamHandler: BaseEventStreamHandler? = null
 
     fun register() {
         eventStreamHandler =
diff --git a/android/src/main/kotlin/com/qonversion/flutter/sdk/qonversion_flutter_sdk/QonversionFlutterSdkPlugin.kt b/android/src/main/kotlin/com/qonversion/flutter/sdk/qonversion_flutter_sdk/QonversionFlutterSdkPlugin.kt
@@ -19,11 +19,10 @@ import com.qonversion.android.sdk.dto.offerings.QOfferings
 import com.qonversion.android.sdk.dto.products.QProduct
 
 /** QonversionFlutterSdkPlugin */
-class QonversionFlutterSdkPlugin internal constructor(registrar: Registrar): MethodCallHandler, BaseListenerWrapper(registrar.messenger()) {
+class QonversionFlutterSdkPlugin internal constructor(registrar: Registrar): MethodCallHandler {
     private val activity: Activity = registrar.activity()
     private val application: Application = activity.application
-
-    override val eventChannelPostfix = "updated_purchases"
+    private var deferredPurchasesStreamHandler: BaseEventStreamHandler? = null
 
     companion object {
         @JvmStatic
@@ -32,8 +31,14 @@ class QonversionFlutterSdkPlugin internal constructor(registrar: Registrar): Met
             val instance = QonversionFlutterSdkPlugin(registrar)
             channel.setMethodCallHandler(instance)
 
-            // Register Updated Purchases Event Channel
-            instance.register()
+            // Register deferred purchases events
+            val purchasesListener = BaseListenerWrapper(registrar.messenger(), "updated_purchases")
+            purchasesListener.register()
+            instance.deferredPurchasesStreamHandler = purchasesListener.eventStreamHandler
+
+            // Register promo purchases events. Android SDK does not generate any promo purchases yet
+            val promoPurchasesListener = BaseListenerWrapper(registrar.messenger(), "promo_purchases")
+            promoPurchasesListener.register()
         }
     }
 
@@ -61,6 +66,14 @@ class QonversionFlutterSdkPlugin internal constructor(registrar: Registrar): Met
             "offerings" -> {
                 return offerings(result)
             }
+            "logout" -> {
+                Qonversion.logout()
+                return result.success(null)
+            }
+            "resetUser" -> {
+                Qonversion.resetUser()
+                return result.success(null)
+            }
         }
 
         // Methods with args
@@ -77,6 +90,7 @@ class QonversionFlutterSdkPlugin internal constructor(registrar: Registrar): Met
             "addAttributionData" -> addAttributionData(args, result)
             "checkTrialIntroEligibility" -> checkTrialIntroEligibility(args, result)
             "storeSdkInfo" -> storeSdkInfo(args, result)
+            "identify" -> identify(args["userId"] as? String, result)
             else -> result.notImplemented()
         }
     }
@@ -103,12 +117,22 @@ class QonversionFlutterSdkPlugin internal constructor(registrar: Registrar): Met
         startListeningPendingPurchasesEvents()
     }
 
+    private fun identify(userId: String?, result: Result) {
+        if (userId == null) {
+            result.noUserIdError()
+            return
+        }
+
+        Qonversion.identify(userId)
+        result.success(null)
+    }
+
     private fun startListeningPendingPurchasesEvents() {
         Qonversion.setUpdatedPurchasesListener(object : UpdatedPurchasesListener {
             override fun onPermissionsUpdate(permissions: Map<String, QPermission>) {
                 val payload = Gson().toJson(permissions.mapValues { it.value.toMap() })
 
-                eventStreamHandler?.eventSink?.success(payload)
+                deferredPurchasesStreamHandler?.eventSink?.success(payload)
             }
         })
     }
diff --git a/example/lib/home.dart b/example/lib/home.dart
@@ -102,15 +102,15 @@ class _HomeViewState extends State<HomeView> {
   }
 
   Future<void> initPlatformState() async {
+    if (kDebugMode) {
+      await Qonversion.setDebugMode();
+    }
+
     _qLaunchResult = await Qonversion.launch(
       'PV77YHL7qnGvsdmpTs7gimsxUvY-Znl2',
       isObserveMode: false,
     );
 
-    if (kDebugMode) {
-      await Qonversion.setDebugMode();
-    }
-
     setState(() {});
   }
 
diff --git a/example/lib/products_view.dart b/example/lib/products_view.dart
@@ -11,21 +11,42 @@ class ProductsView extends StatefulWidget {
 class _ProductsViewState extends State<ProductsView> {
   var _products = <String, QProduct>{};
   QOfferings _offerings;
-  StreamSubscription<Map<String, QPermission>> _subscription;
+  StreamSubscription<Map<String, QPermission>> _deferredPurchasesStream;
+  StreamSubscription<String> _promoPurchasesStream;
 
   @override
   void initState() {
     super.initState();
     _loadProducts();
     _loadOfferings();
 
-    _subscription =
+    _deferredPurchasesStream =
         Qonversion.updatedPurchasesStream.listen((event) => print(event));
+
+    _promoPurchasesStream =
+        Qonversion.promoPurchasesStream.listen((promoPurchaseId) async {
+      try {
+        final permissions = await Qonversion.promoPurchase(promoPurchaseId);
+        // Get Qonversion product by App Store ID
+        final qProduct = _products.values.firstWhere(
+            (element) => element.storeId == promoPurchaseId,
+            orElse: () => null);
+        // Get permission by Qonversion product
+        final permission = permissions.values.firstWhere(
+            (element) => element.productId == qProduct?.qonversionId,
+            orElse: () => null);
+
+        print(permission?.isActive);
+      } catch (e) {
+        print(e);
+      }
+    });
   }
 
   @override
   void dispose() {
-    _subscription.cancel();
+    _deferredPurchasesStream.cancel();
+    _promoPurchasesStream.cancel();
 
     super.dispose();
   }
@@ -108,8 +129,12 @@ class _ProductsViewState extends State<ProductsView> {
             color: Colors.blue,
             textColor: Colors.white,
             onPressed: () async {
-              final res = await Qonversion.purchase(product.qonversionId);
-              print(res[product.qonversionId]?.isActive);
+              final permissions = await Qonversion.purchase(product.qonversionId);
+              final permission =  permissions.values.firstWhere(
+                      (element) => element.productId == product.qonversionId,
+                  orElse: () => null);
+
+              print(permission?.isActive);
             },
           ),
         ),
diff --git a/ios/Classes/FlutterError+Custom.swift b/ios/Classes/FlutterError+Custom.swift
@@ -77,4 +77,10 @@ extension FlutterError {
   static let noSdkInfo = FlutterError(code: "15",
                                       message: "Could not find sdk info",
                                       details: passValidValue)
+  
+  static func promoPurchaseError(_ productId: String) -> FlutterError {
+    return FlutterError (code: "PromoPurchase",
+                         message: "Could not find completion block for Product ID: \(productId)",
+                         details: passValidValue)
+  }
 }
diff --git a/ios/Classes/SwiftQonversionFlutterSdkPlugin.swift b/ios/Classes/SwiftQonversionFlutterSdkPlugin.swift
@@ -7,7 +7,9 @@ import Flutter
 import Qonversion
 
 public class SwiftQonversionFlutterSdkPlugin: NSObject, FlutterPlugin {
-  var purchasesEventStreamHandler: BaseEventStreamHandler?
+  var deferredPurchasesStreamHandler: BaseEventStreamHandler?
+  var promoPurchasesStreamHandler: BaseEventStreamHandler?
+  var promoPurchasesExecutionBlocks = [String: Qonversion.PromoPurchaseCompletionHandler]()
   
   public static func register(with registrar: FlutterPluginRegistrar) {
     let messenger: FlutterBinaryMessenger
@@ -20,12 +22,15 @@ public class SwiftQonversionFlutterSdkPlugin: NSObject, FlutterPlugin {
     let instance = SwiftQonversionFlutterSdkPlugin()
     registrar.addMethodCallDelegate(instance, channel: channel)
     
-    // Register events listeners
+    // Register deferred purchases events
     let purchasesListener = FlutterListenerWrapper<BaseEventStreamHandler>(registrar, postfix: "updated_purchases")
-    purchasesListener.register() { instance.purchasesEventStreamHandler = $0 }
-    
-    // Setting delegate as soon as plugin is registered
+    purchasesListener.register() { instance.deferredPurchasesStreamHandler = $0 }
     Qonversion.setPurchasesDelegate(instance)
+    
+    // Register promo purchases events
+    let promoPurchasesListener = FlutterListenerWrapper<BaseEventStreamHandler>(registrar, postfix: "promo_purchases")
+    promoPurchasesListener.register() { instance.promoPurchasesStreamHandler = $0 }
+    Qonversion.setPromoPurchasesDelegate(instance)
   }
   
   public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
@@ -52,7 +57,15 @@ public class SwiftQonversionFlutterSdkPlugin: NSObject, FlutterPlugin {
       
     case "offerings":
       return offerings(result)
-      
+        
+    case "logout":
+      Qonversion.logout()
+      return result(nil)
+
+    case "resetUser":
+      Qonversion.resetUser()
+      return result(nil)
+        
     default:
       break
     }
@@ -70,6 +83,9 @@ public class SwiftQonversionFlutterSdkPlugin: NSObject, FlutterPlugin {
     case "purchase":
       return purchase(args["productId"] as? String, result)
       
+    case "promoPurchase":
+      return promoPurchase(args["productId"] as? String, result)
+      
     case "setUserId":
       return setUserId(args["userId"] as? String, result)
       
@@ -87,6 +103,9 @@ public class SwiftQonversionFlutterSdkPlugin: NSObject, FlutterPlugin {
       
     case "storeSdkInfo":
       return storeSdkInfo(args, result)
+        
+    case "identify":
+        return identify(args["userId"] as? String, result)
       
     default:
       return result(FlutterMethodNotImplemented)
@@ -107,7 +126,17 @@ public class SwiftQonversionFlutterSdkPlugin: NSObject, FlutterPlugin {
       result(resultMap)
     }
   }
-  
+    
+  private func identify(_ userId: String?, _ result: @escaping FlutterResult) {
+    guard let userId = userId else {
+      result(FlutterError.noUserId)
+      return
+    }
+    
+    Qonversion.identify(userId)
+    result(nil)
+  }
+    
   private func products(_ result: @escaping FlutterResult) {
     Qonversion.products { (products, error) in
       if let error = error {
@@ -133,6 +162,25 @@ public class SwiftQonversionFlutterSdkPlugin: NSObject, FlutterPlugin {
     }
   }
   
+  private func promoPurchase(_ productId: String?, _ result: @escaping FlutterResult) {
+    guard let productId = productId else {
+      return result(FlutterError.noProductId)
+    }
+    
+    if let executionBlock = promoPurchasesExecutionBlocks[productId] {
+      promoPurchasesExecutionBlocks.removeValue(forKey: productId)
+      
+      executionBlock { (permissions, error, isCancelled) in
+        let purchaseResult = PurchaseResult(permissions: permissions,
+                                            error: error,
+                                            isCancelled: isCancelled)
+        result(purchaseResult.toMap())
+      }
+    } else {
+      result(FlutterError.promoPurchaseError(productId))
+    }
+  }
+  
   private func checkPermissions(_ result: @escaping FlutterResult) {
     Qonversion.checkPermissions { (permissions, error) in
       if let error = error {
@@ -274,6 +322,14 @@ extension SwiftQonversionFlutterSdkPlugin: Qonversion.PurchasesDelegate {
   public func qonversionDidReceiveUpdatedPermissions(_ permissions: [String : Qonversion.Permission]) {
     let payload = permissions.mapValues { $0.toMap() }.toJson()
     
-    purchasesEventStreamHandler?.eventSink?(payload)
+    deferredPurchasesStreamHandler?.eventSink?(payload)
+  }
+}
+
+extension SwiftQonversionFlutterSdkPlugin: QNPromoPurchasesDelegate {
+  public func shouldPurchasePromoProduct(withIdentifier productID: String, executionBlock: @escaping Qonversion.PromoPurchaseCompletionHandler) {
+    promoPurchasesExecutionBlocks[productID] = executionBlock
+    
+    promoPurchasesStreamHandler?.eventSink?(productID)
   }
 }
diff --git a/ios/qonversion_flutter.podspec b/ios/qonversion_flutter.podspec
@@ -4,7 +4,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'qonversion_flutter'
-  s.version          = '3.0.1'
+  s.version          = '3.1.0'
   s.summary          = 'Flutter Qonversion SDK'
   s.description      = <<-DESC
   Powerful yet simple subscription analytics
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   s.source_files = 'Classes/**/*'
   s.dependency 'Flutter'
   s.platform = :ios, '9.0'
-  s.dependency 'Qonversion', '2.13.3'
+  s.dependency 'Qonversion', '2.13.4'
 
   # Flutter.framework does not contain a i386 slice. Only x86_64 simulators are supported.
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' }
diff --git a/lib/src/constants.dart b/lib/src/constants.dart
@@ -20,6 +20,7 @@ class Constants {
   static const mLaunch = 'launch';
   static const mProducts = 'products';
   static const mPurchase = 'purchase';
+  static const mPromoPurchase = 'promoPurchase';
   static const mUpdatePurchase = 'updatePurchase';
   static const mCheckPermissions = 'checkPermissions';
   static const mRestore = 'restore';
@@ -33,6 +34,9 @@ class Constants {
   static const mOfferings = 'offerings';
   static const mCheckTrialIntroEligibility = 'checkTrialIntroEligibility';
   static const mStoreSdkInfo = 'storeSdkInfo';
+  static const mIdentify = 'identify';
+  static const mResetUser = 'resetUser';
+  static const mLogout = 'logout';
 
   // Keys for NSUserDefaults on iOS and SharedPreferences on Android
   static const keyPrefix = 'com.qonversion.keys';
diff --git a/lib/src/qonversion.dart b/lib/src/qonversion.dart
diff --git a/macos/Classes/SwiftQonversionFlutterSdkPlugin.swift b/macos/Classes/SwiftQonversionFlutterSdkPlugin.swift
diff --git a/macos/qonversion_flutter.podspec b/macos/qonversion_flutter.podspec
diff --git a/pubspec.lock b/pubspec.lock
diff --git a/pubspec.yaml b/pubspec.yaml
