Merge branch 'develop' of github.com:qonversion/flutter-sdk into feature/promoPurchases

Author: Maria-Bordunova

android/build.gradle

@@ -3,7 +3,7 @@ version '3.0.1'
 
 buildscript {
     ext.kotlin_version = '1.3.50'
-    ext.qonversion_version = '2.7.6'
+    ext.qonversion_version = '2.8.0'
     repositories {
         google()
         jcenter()

android/src/main/kotlin/com/qonversion/flutter/sdk/qonversion_flutter_sdk/QonversionFlutterSdkPlugin.kt

@@ -66,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
@@ -82,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()
         }
     }
@@ -108,6 +117,16 @@ 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>) {

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(() {});
   }
 

ios/Classes/SwiftQonversionFlutterSdkPlugin.swift

@@ -57,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
     }
@@ -95,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)
@@ -115,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 {

ios/qonversion_flutter.podspec

@@ -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' }

lib/src/constants.dart

@@ -34,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';

lib/src/qonversion.dart

@@ -61,6 +61,19 @@ class Qonversion {
     return QLaunchResult.fromJson(Map<String, dynamic>.from(rawResult));
   }
 
+  /// Call this function to link a user to his unique ID in your system and share purchase data.
+  /// [userId] unique user ID in your system
+  static Future<void> identify(String userId) =>
+      _channel.invokeMethod(Constants.mIdentify, {Constants.kUserId: userId});
+
+  /// Call this function to unlink a user from his unique ID in your system and his purchase data.
+  static Future<void> logout() => _channel.invokeMethod(Constants.mLogout);
+
+  /// Call this function to reset user ID and generate new anonymous user ID.
+  /// Call this function before Qonversion.launch()
+  static Future<void> resetUser() =>
+      _channel.invokeMethod(Constants.mResetUser);
+
   /// This method will send all purchases to the Qonversion backend. Call this every time when purchase is handled by you own implementation.
   ///
   /// **Warning!**

macos/Classes/SwiftQonversionFlutterSdkPlugin.swift

@@ -52,6 +52,14 @@ 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
@@ -87,6 +95,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)
@@ -108,6 +119,16 @@ public class SwiftQonversionFlutterSdkPlugin: NSObject, FlutterPlugin {
     }
   }
 
+  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 {

macos/qonversion_flutter.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   s.source_files = 'Classes/**/*'
   s.dependency 'FlutterMacOS'
   s.platform = :osx, '10.12'
-  s.dependency 'Qonversion', '2.13.3'
+  s.dependency 'Qonversion', '2.13.4'
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
   s.swift_version = '5.0'
   s.static_framework = true