Merge branch 'ubbop42:main' into main

ubbop42 · web-flow · commit c92e8616c782 · 2021-09-23T15:24:59.000-04:00
diff --git a/LICENSE b/LICENSE
diff --git a/android/build.gradle b/android/build.gradle
@@ -2,7 +2,7 @@ group 'com.homexlabs.optimizely_dart'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.3.72'
     repositories {
         google()
         jcenter()
@@ -37,7 +37,7 @@ android {
         disable 'InvalidPackage'
     }
     dependencies {
-        implementation 'com.optimizely.ab:android-sdk:3.8.0'
+        implementation 'com.optimizely.ab:android-sdk:3.10.1'
         implementation 'com.noveogroup.android:android-logger:1.3.6'
     }
 }
diff --git a/android/src/main/kotlin/com/homexlabs/optimizely_dart/OptimizelyPlugin.kt b/android/src/main/kotlin/com/homexlabs/optimizely_dart/OptimizelyPlugin.kt
@@ -2,9 +2,11 @@ package com.homexlabs.optimizely_dart
 
 import android.app.Activity
 import androidx.annotation.NonNull
+import com.optimizely.ab.OptimizelyUserContext
 import com.optimizely.ab.android.sdk.OptimizelyClient
 import com.optimizely.ab.android.sdk.OptimizelyManager
 import com.optimizely.ab.config.Variation
+import com.optimizely.ab.optimizelydecision.OptimizelyDecideOption
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.embedding.engine.plugins.activity.ActivityAware
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
@@ -13,6 +15,7 @@ import io.flutter.plugin.common.MethodChannel
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler
 import io.flutter.plugin.common.MethodChannel.Result
 import io.flutter.plugin.common.PluginRegistry.Registrar
+import java.util.concurrent.TimeUnit
 
 
 /** OptimizelyPlugin */
@@ -25,6 +28,7 @@ class OptimizelyPlugin: FlutterPlugin, MethodCallHandler, ActivityAware {
   private lateinit var activity: Activity
 
   private lateinit var optimizelyClient: OptimizelyClient
+  private lateinit var user: OptimizelyUserContext
 
   override fun onAttachedToEngine(@NonNull flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
     channel = MethodChannel(flutterPluginBinding.getFlutterEngine().getDartExecutor(), "optimizely_plugin")
@@ -61,19 +65,30 @@ class OptimizelyPlugin: FlutterPlugin, MethodCallHandler, ActivityAware {
         initOptimizelyManagerAsync(sdkKey!!)
         result.success("")
       }
+      "setUser" -> {
+        val userId = call.argument<String>("user_id")
+        val attributes = call.argument<MutableMap<String, Any>>("attributes")
+        setUser(userId!!, attributes!!)
+      }
       "isFeatureEnabled" -> {
         val featureKey = call.argument<String>("feature_key")
-        val userId = call.argument<String>("user_id")
-        val flag = isFeatureEnabled(featureKey!!, userId!!)
+        val flag = isFeatureEnabled(featureKey!!)
         result.success(flag)
       }
       "getAllFeatureVariables" -> {
         val featureKey = call.argument<String>("feature_key")
-        val userId = call.argument<String>("user_id")
-        val attributes = call.argument<MutableMap<String, Any>>("attributes")
-        val variables = getAllFeatureVariables(featureKey!!, userId!!, attributes!!)
+        val variables = getAllFeatureVariables(featureKey!!)
         result.success(variables)
       }
+      "getAllEnabledFeatures" -> {
+        val features = getAllEnabledFeatures()
+        result.success(features)
+      }
+      "activateGetVariation" -> {
+        val featureKey = call.argument<String>("feature_key")
+        val variation = activateGetVariation(featureKey!!)
+        result.success(variation)
+      }
       "getvariation" -> {
         val featureKey = call.argument<String>("feature_key")
         val userId = call.argument<String>("user_id")
@@ -83,10 +98,8 @@ class OptimizelyPlugin: FlutterPlugin, MethodCallHandler, ActivityAware {
       }
       "trackEvent" -> {
         val featureKey = call.argument<String>("feature_key")
-        val userId = call.argument<String>("user_id")
-        val attributes = call.argument<MutableMap<String, Any>>("attributes")
         val eventTags = call.argument<MutableMap<String, Any>>("event_tags")
-        trackEvent(featureKey!!, userId!!, attributes!!, eventTags!!)
+        trackEvent(featureKey!!, eventTags!!)
         result.success("")
       }
       else -> result.notImplemented()
@@ -114,47 +127,60 @@ class OptimizelyPlugin: FlutterPlugin, MethodCallHandler, ActivityAware {
   }
 
   private fun initOptimizelyManager(sdkKey: String, dataFile: String) {
-    val builder = OptimizelyManager.builder()
-    // In Android, the minimum polling interval is 60 seconds. In iOS, the minimum polling
-    // interval is 2 minutes while the app is open. If you specify shorter polling intervals
-    // than these minimums, the SDK will automatically reset the intervals to 60 seconds (Android)
-    // or 2 minutes (iOS).
-    val optimizelyManager = builder.withDatafileDownloadInterval(60)
+    val optimizelyManager = OptimizelyManager.builder()
             .withSDKKey(sdkKey)
+            .withDatafileDownloadInterval(15, TimeUnit.MINUTES)
+            .withEventDispatchInterval(30, TimeUnit.SECONDS)
             .build(activity.applicationContext)
 
     optimizelyClient = optimizelyManager.initialize(activity.applicationContext, dataFile, true, true)
   }
 
   private fun initOptimizelyManagerAsync(sdkKey: String) {
-    val builder = OptimizelyManager.builder()
-    // In Android, the minimum polling interval is 60 seconds. In iOS, the minimum polling
-    // interval is 2 minutes while the app is open. If you specify shorter polling intervals
-    // than these minimums, the SDK will automatically reset the intervals to 60 seconds (Android)
-    // or 2 minutes (iOS).
-    val optimizelyManager = builder.withDatafileDownloadInterval(60)
+    val optimizelyManager = OptimizelyManager.builder()
             .withSDKKey(sdkKey)
+            .withDatafileDownloadInterval(15, TimeUnit.MINUTES)
+            .withEventDispatchInterval(30, TimeUnit.SECONDS)
             .build(activity.applicationContext)
 
     optimizelyManager.initialize(activity.applicationContext, null) {
       client -> optimizelyClient = client
     }
   }
 
-  private fun isFeatureEnabled(featureKey: String, userId: String): Boolean{
-    return optimizelyClient.isFeatureEnabled(featureKey, userId)
+  private fun setUser(userId: String, attributes: MutableMap<String, Any>){
+    val userTemp = optimizelyClient.createUserContext(userId, attributes)
+    if(userTemp != null){
+      user = userTemp
+    }
+  }
+
+  private fun isFeatureEnabled(featureKey: String): Boolean{
+    val decision = user.decide(featureKey)
+    return decision.enabled
   }
 
-  private fun getAllFeatureVariables(featureKey: String, userId: String, attributes: MutableMap<String, Any>): Map<String, Any>? {
-    val json = optimizelyClient.getAllFeatureVariables(featureKey, userId, attributes)
-    return json?.toMap()
+  private fun getAllFeatureVariables(featureKey: String): Map<String, Any>? {
+    val decision = user.decide(featureKey)
+    return decision.variables.toMap()
+  }
+
+  private fun getAllEnabledFeatures(): MutableSet<String> {
+    val options: List<OptimizelyDecideOption> = listOf(OptimizelyDecideOption.ENABLED_FLAGS_ONLY)
+    val decisions = user.decideAll(options)
+    return decisions.keys
   }
 
   private fun getVariation(featureKey: String, userId: String, attributes: MutableMap<String, Any>): Variation? {
     return optimizelyClient.getVariation(featureKey, userId, attributes)
   }
 
-  private fun trackEvent(eventKey: String, userId: String, attributes: MutableMap<String, Any>, eventTags: MutableMap<String, Any>) {
-    optimizelyClient.track(eventKey, userId, attributes, eventTags)
+  private fun activateGetVariation(featureKey: String): String? {
+    val decision = user.decide(featureKey)
+    return decision.variationKey
+  }
+
+  private fun trackEvent(eventKey: String, eventTags: MutableMap<String, Any>) {
+    user.trackEvent(eventKey, eventTags)
   }
 }
diff --git a/ios/Classes/SwiftOptimizelyPlugin.swift b/ios/Classes/SwiftOptimizelyPlugin.swift
@@ -10,6 +10,7 @@ public class SwiftOptimizelyPlugin: NSObject, FlutterPlugin {
     
     typealias GetFeatureItems = (featureKey: String, userId: String, attributes: OptimizelyAttributes?, eventTags: OptimizelyEventTags?)
     var client: OptimizelyClient?
+    var user: OptimizelyUserContext?
     
     public static func register(with registrar: FlutterPluginRegistrar) {
         let channel = FlutterMethodChannel(
@@ -40,7 +41,7 @@ public class SwiftOptimizelyPlugin: NSObject, FlutterPlugin {
                     periodicDownloadInterval: 60
                 )
               
-                try startClient(client, dataFile: dataFile)
+                try client.start(datafile: dataFile!)
                 self.client = client
               
                 result(nil)
@@ -55,7 +56,7 @@ public class SwiftOptimizelyPlugin: NSObject, FlutterPlugin {
               periodicDownloadInterval: 60
             )
             
-            try startClient(client) { initResult in
+            client.start { initResult in
               switch initResult {
                 case .failure(let error):
                   result(error.localizedDescription)
@@ -70,53 +71,78 @@ public class SwiftOptimizelyPlugin: NSObject, FlutterPlugin {
           }
         case "isFeatureEnabled":
             do {
-                let client = try ensureClient()
-                let items = try getFeatureItems(from: arguments)
-                let enabled = client.isFeatureEnabled(
-                    featureKey: items.featureKey,
-                    userId: items.userId,
-                    attributes: items.attributes
-                )
+                let user = try ensureUser()
+                let featureKey: String = try arguments.argument(for: "feature_key")
+                let decision = user.decide(key: featureKey)
+                let enabled = decision.enabled
                 result(enabled)
             } catch {
               result(error.localizedDescription)
             }
-        case "getAllFeatureVariables":
+        case "setUser":
             do {
                 let client = try ensureClient()
-                let items = try getFeatureItems(from: arguments)
-                let json: OptimizelyJSON = try client.getAllFeatureVariables(
-                    featureKey: items.featureKey,
-                    userId: items.userId,
-                    attributes: items.attributes
-                )
+                let userId: String = try arguments.argument(for: "user_id")
+                let attributes: OptimizelyAttributes? = try arguments.optionalArgument(for: "attributes")
+                if(attributes != nil && !attributes!.isEmpty){
+                    self.user = client.createUserContext(userId: userId, attributes: attributes! as [String : Any])
+                }
+                else{
+                    self.user = client.createUserContext(userId: userId)
+                }
+            } catch {
+              result(error.localizedDescription)
+            }
+        case "getAllFeatureVariables":
+            do {
+                let user = try ensureUser()
+                let featureKey: String = try arguments.argument(for: "feature_key")
+                let decision = user.decide(key: featureKey)
+                let json: OptimizelyJSON = decision.variables
                 result(json.toMap())
             } catch {
               result(error.localizedDescription)
             }
         case "getVariation":
             do {
                 let client = try ensureClient()
-                let items = try getFeatureItems(from: arguments)
+                let userId: String = try arguments.argument(for: "user_id")
+                let attributes: OptimizelyAttributes? = try arguments.optionalArgument(for: "attributes")
+                let featureKey: String = try arguments.argument(for: "feature_key")
                 let res: String = try client.getVariationKey(
-                    experimentKey: items.featureKey,
-                    userId: items.userId,
-                    attributes: items.attributes
+                    experimentKey: featureKey,
+                    userId: userId,
+                    attributes: attributes
                 )
                 result(res)
             } catch {
               result(error.localizedDescription)
             }
+        case "activateGetVariation":
+            do {
+                let user = try ensureUser()
+                let featureKey: String = try arguments.argument(for: "feature_key")
+                let decision = user.decide(key: featureKey)
+                result(decision.variationKey)
+            } catch {
+              result(error.localizedDescription)
+            }
+        case "getAllEnabledFeatures":
+            do {
+                let user = try ensureUser()
+                let decisions = user.decideAll(options: [.enabledFlagsOnly])
+                let enabledFlags = decisions.keys
+                result(enabledFlags)
+            } catch {
+              result(error.localizedDescription)
+            }
         case "trackEvent":
             do {
-                let client = try ensureClient()
-                let items = try getFeatureItems(from: arguments)
-                try  client.track(
-                    eventKey: items.featureKey,
-                    userId: items.userId,
-                    attributes: items.attributes,
-                    eventTags: items.eventTags
-                )
+                let user = try ensureUser()
+                let eventKey: String = try arguments.argument(for: "event_key")
+                let eventTags: OptimizelyEventTags? = try arguments.argument(for: "event_tags")
+                try? user.trackEvent(eventKey: eventKey,
+                                     eventTags: eventTags )
             } catch {
               result(error.localizedDescription)
             }
@@ -135,6 +161,17 @@ public class SwiftOptimizelyPlugin: NSObject, FlutterPlugin {
         }
         return client
     }
+    
+    func ensureUser() throws -> OptimizelyUserContext {
+        guard let user = self.user else {
+            throw FlutterError(
+                code: "user",
+                message: "Optimizely user not initialized",
+                details: nil
+            )
+        }
+        return user
+    }
 
     func startClient(_ client: OptimizelyClient, dataFile: String?) throws {
         if let dataFile = dataFile {
@@ -154,14 +191,6 @@ public class SwiftOptimizelyPlugin: NSObject, FlutterPlugin {
           }
       }
     }
-      
-    func getFeatureItems(from arguments: [String: Any]) throws -> GetFeatureItems {
-        let featureKey: String = try arguments.argument(for: "feature_key")
-        let userId: String = try arguments.argument(for: "user_id")
-        let attributes: OptimizelyAttributes? = try arguments.optionalArgument(for: "attributes")
-        let eventTags: OptimizelyEventTags? = try arguments.optionalArgument(for: "event_tags")
-        return (featureKey, userId, attributes, eventTags)
-    }
 }
 
 // MARK: - Arguments
diff --git a/ios/optimizely_dart.podspec b/ios/optimizely_dart.podspec
@@ -9,11 +9,13 @@ Pod::Spec.new do |s|
   s.description      = <<-DESC
 Flutter plugin for optimizely SDK
                        DESC
+  s.homepage         = 'https://homex.com'
   s.license          = { :file => '../LICENSE' }
+  s.author           = { 'HomexLabs' => '' }
   s.source           = { :path => '.' }
   s.source_files = 'Classes/**/*'
   s.dependency 'Flutter'
-  s.dependency 'OptimizelySwiftSDK', '~> 3.6.1'
+  s.dependency 'OptimizelySwiftSDK', '~> 3.9.0'
   s.platform = :ios, '10.0'
 
   # Flutter.framework does not contain a i386 slice. Only x86_64 simulators are supported.
diff --git a/lib/optimizely_dart.dart b/lib/optimizely_dart.dart

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ group 'com.homexlabs.optimizely_dart'`
`2`	`2`	`version '1.0-SNAPSHOT'`
`3`	`3`
`4`	`4`	`buildscript {`
`5`		`- ext.kotlin_version = '1.3.50'`
	`5`	`+ ext.kotlin_version = '1.3.72'`
`6`	`6`	`repositories {`
`7`	`7`	`google()`
`8`	`8`	`jcenter()`
`@@ -37,7 +37,7 @@ android {`
`37`	`37`	`disable 'InvalidPackage'`
`38`	`38`	`}`
`39`	`39`	`dependencies {`
`40`		`- implementation 'com.optimizely.ab:android-sdk:3.8.0'`
	`40`	`+ implementation 'com.optimizely.ab:android-sdk:3.10.1'`
`41`	`41`	`implementation 'com.noveogroup.android:android-logger:1.3.6'`
`42`	`42`	`}`
`43`	`43`	`}`