Merge pull request #160 from optimizely/twzFixWhitelist

(fix):fix whitelist users and cleanup config

Author: jaeopt

OptimizelySDK/Data Model/ProjectConfig.swift

@@ -24,8 +24,7 @@ class ProjectConfig {
     // local runtime forcedVariations [UserId: [ExperimentId: VariationId]]
     // NOTE: experiment.forcedVariations use [ExperimentKey: VariationKey] instead of ids
 
-    private var whitelistUsers = [String: [String: String]]()
-    private var experimentFeatureMap = [String: [String]]()
+    var whitelistUsers = [String: [String: String]]()
 
     init(datafile: Data) throws {
         do {
@@ -36,7 +35,6 @@ class ProjectConfig {
         if !isValidVersion(version: self.project.version) {
             throw OptimizelyError.dataFileVersionInvalid(self.project.version)
         }
-        generateExperimentFeatureMap()
     }
 
     convenience init(datafile: String) throws {
@@ -90,20 +88,6 @@ extension ProjectConfig {
         // old versions (< 4) of datafiles not supported
         return ["4"].contains(version)
     }
-    
-    private func generateExperimentFeatureMap() {
-        for feature in project.featureFlags {
-            for id in feature.experimentIds {
-                if var featureIdArray = experimentFeatureMap[id] {
-                    featureIdArray.append(feature.id)
-                    experimentFeatureMap[id] = featureIdArray
-                }
-                else {
-                    experimentFeatureMap[id] = [feature.id]
-                }
-            }
-        }
-    }
 }
 
 // MARK: - Project Access
@@ -192,7 +176,12 @@ extension ProjectConfig {
      *  Returns true if experiment belongs to any feature, false otherwise.
      */
     func isFeatureExperiment(id: String) -> Bool {
-        return experimentFeatureMap.keys.contains(id)
+        if let _ = project.featureFlags.map({ $0.experimentIds.contains(id)}).first {
+            return true
+        }
+        else {
+            return false
+        }
     }
 
     /**

OptimizelySDK/Optimizely/OptimizelyManager.swift

@@ -146,8 +146,11 @@ open class OptimizelyManager: NSObject {
                     // new datafile came in...
                     self.reInitLock.wait(); defer { self.reInitLock.signal() }
                     if let config = try? ProjectConfig(datafile: data) {
-                        
                         do {
+                            if let users = self.config?.whitelistUsers {
+                                config.whitelistUsers = users
+                            }
+                            
                             self.config = config
 
                             // call reinit on the services we know we are reinitializing.