Merge branch 'master' into arafay/xcode10-bitcode

* master:
  this runs through the background and removes any experiments that are… (#302)
  Updating libraries based on SourceClear recommendation (#304)
  add credits for third party libraries (#299)

# Conflicts:
#	OptimizelySDKUniversal/generated-frameworks/Release-iOS-universal-SDK/OptimizelySDKiOS.framework.zip
#	OptimizelySDKUniversal/generated-frameworks/Release-iOS-universal-SDK/OptimizelySDKiOS.framework/OptimizelySDKiOS

OptimizelySDKShared/OptimizelySDKShared/OPTLYManagerBase.m

@@ -20,6 +20,8 @@
 #import "OPTLYLogger.h"
 #import "OPTLYLoggerMessages.h"
 #else
+#import <OptimizelySDKCore/OPTLYExperiment.h>
+#import <OptimizelySDKCore/OPTLYProjectConfig.h>
 #import <OptimizelySDKCore/OPTLYErrorHandler.h>
 #import <OptimizelySDKCore/OPTLYEventDispatcherBasic.h>
 #import <OptimizelySDKCore/OPTLYLogger.h>
@@ -67,6 +69,29 @@ @interface OPTLYManagerBase()
 
 @implementation OPTLYManagerBase
 
+- (void)cleanUserProfileService:(NSArray<OPTLYExperiment> *)experiments {
+    if (experiments == nil) return;
+
+    if (_userProfileService != nil && [(NSObject *)_userProfileService respondsToSelector:@selector(removeInvalidExperimentsForAllUsers:)]) {
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+            if (self.userProfileService != nil) {
+                NSMutableArray<NSString*> *ids = [[NSMutableArray alloc] initWithCapacity:experiments.count];
+                for (int i = 0; i < experiments.count; i++) {
+                    NSString *exKey = ((OPTLYExperiment *)experiments[i]).experimentId;
+                    [ids addObject:exKey];
+                }
+
+                @try {
+                    [(NSObject *)self.userProfileService performSelector:@selector(removeInvalidExperimentsForAllUsers:) withObject:ids];
+                }
+                @catch(NSException *e) {
+                    [self.logger logMessage:@"Error cleaning up user profile service" withLevel:OptimizelyLogLevelError];
+                }
+            }
+        });
+    }
+}
+
 #pragma mark - Constructors
 
 - (instancetype)init {
@@ -102,14 +127,22 @@ - (OPTLYClient *)initialize {
 
     // attempt to get the cached datafile
     NSData *data = [self.datafileManager getSavedDatafile:nil];
-
+    BOOL cleanUserProfile = NO;
     // fall back to the datafile provided by the manager builder if we can't get the saved datafile
     if (data == nil) {
         data = self.datafile;
         [self.logger logMessage:OPTLYLoggerMessagesManagerBundledDataLoaded withLevel:OptimizelyLogLevelInfo]; 
     }
+    else {
+        // cleanup user profile service in background
+        cleanUserProfile = YES;
+    }
 
     OPTLYClient *client = [self initializeWithDatafile:data];
+
+    if (cleanUserProfile) {
+        [self cleanUserProfileService:client.optimizely.config.experiments];
+    }
 
     return client;
 }
@@ -138,13 +171,22 @@ - (void)initializeWithCallback:(void (^)(NSError * _Nullable, OPTLYClient * _Nul
         }
 
         // fall back to the datafile provided by the manager builder if we can't get the saved datafile
+        BOOL cleanUserProfileService = NO;
         if (data == nil) {
             data = self.datafile;
             [self.logger logMessage:OPTLYLoggerMessagesManagerBundledDataLoaded withLevel:OptimizelyLogLevelInfo];
         }
+        else {
+            // update user profile service in the background.
+            cleanUserProfileService = YES;
+        }
 
         OPTLYClient *client = [self initializeWithDatafile:data];
 
+        if (cleanUserProfileService) {
+            [self cleanUserProfileService:client.optimizely.config.experiments];
+        }
+
         if (callback) {
             callback(error, client);
         }

OptimizelySDKShared/OptimizelySDKSharedTests/OPTLYManagerTest.m

@@ -41,6 +41,10 @@
 static NSString * const kClientEngine = @"tvos-sdk";
 #endif
 
+@interface OPTLYManagerBase(Tests)
+- (void)cleanUserProfileService:(NSArray<OPTLYExperiment> *)experiments;
+@end
+
 @interface OPTLYManagerTest : XCTestCase
 @property (nonatomic, strong) NSData *defaultDatafile;
 @property (nonatomic, strong) NSData *alternateDatafile;
@@ -74,13 +78,21 @@ - (void)testInitializeWithCachedDatafile
         builder.projectId = kAlternateProjectId;
     }]];
 
+    id managerMock = OCMPartialMock(manager);
+
+    /* run code under test */
+
     // save the datafile
     [manager.datafileManager saveDatafile:self.alternateDatafile];
     OPTLYClient *client = [manager initialize];
 
     [self isClientValid:client
                datafile:self.alternateDatafile];
     [self checkConfigIsUsingAlternativeDatafile:client.optimizely.config];
+
+    NSArray<OPTLYExperiment> *experiments = [[[manager getOptimizely] optimizely].config experiments];
+    OCMVerify([managerMock cleanUserProfileService:experiments]);
+
 }
 
 // If no datafile is cached, the client should be initialized with
@@ -94,11 +106,16 @@ - (void)testInitializeNoCachedDatafile
     }]];
     id partialMockManager = OCMPartialMock(manager);
 
+    NSArray<OPTLYExperiment> *experiments = [[NSArray<OPTLYExperiment> alloc] init];
+
+    [[partialMockManager reject] cleanUserProfileService:experiments];
+
     OPTLYClient *client = [partialMockManager initialize];
 
     [self isClientValid:client
                datafile:self.alternateDatafile];
     [self checkConfigIsUsingAlternativeDatafile:client.optimizely.config];
+
 }
 
 // If a datafile is cached, but there is an error loading the datafile,
@@ -414,6 +431,33 @@ - (void)testInitializeWithCallbackDownloadErrorNoDatafile
     [self waitForExpectationsWithTimeout:2 handler:nil];
 }
 
+#pragma mark - testCleanUserProfileService
+
+- (void)testCleanUserProfileService
+{
+    // need to mock the manager bundled datafile load to read from the test bundle
+    OPTLYManagerBasic *manager = [[OPTLYManagerBasic alloc] initWithBuilder:[OPTLYManagerBuilder builderWithBlock:^(OPTLYManagerBuilder * _Nullable builder) {
+        builder.projectId = kProjectId;
+        builder.datafile = self.alternateDatafile;
+    }]];
+    id partialMockManager = OCMPartialMock(manager);
+
+    NSArray<OPTLYExperiment> *experiments = [[NSArray<OPTLYExperiment> alloc] init];
+
+    OPTLYClient *client = [partialMockManager initialize];
+
+    [self isClientValid:client
+               datafile:self.alternateDatafile];
+    [self checkConfigIsUsingAlternativeDatafile:client.optimizely.config];
+
+    // pass in nil
+    [manager cleanUserProfileService:nil];
+    // pass in empty
+    [manager cleanUserProfileService:experiments];
+    // pass in experiements
+    [manager cleanUserProfileService:client.optimizely.config.experiments];
+}
+
 #pragma mark - isValidKeyString
 
 -(void)testIsValidKeyString {

OptimizelySDKUniversal/generated-frameworks/Release-iOS-universal-SDK/OptimizelySDKiOS.framework/Headers/OPTLYUserProfileService.h

@@ -52,4 +52,12 @@ __attribute((deprecated("Use OPTLYManager initWithBuilder method instead.")));
  **/
 - (void)removeAllUserExperimentRecords;
 
+/**
+ * Clean up and remove experiments that are not in the valid experiment list passed in.
+ * This is called when initialized from a remote datafile to ensure that the UserProfileService
+ * does not grow indefinitely.
+ * @param validExperimentIds An array of valid experiment ids.  If default user profile contains
+ * experiments not in this list, they are removed from user profile service.
+ **/
+- (void)removeInvalidExperimentsForAllUsers:(NSArray<NSString *> *)validExperimentIds;
 @end

OptimizelySDKUniversal/generated-frameworks/Release-tvOS-universal-SDK/OptimizelySDKTVOS.framework/Headers/OPTLYLoggerMessages.h

@@ -100,7 +100,7 @@ extern NSString *const OPTLYLoggerMessagesDatafileFetchIntervalInvalid;
 
 // ---- Datafile Versioning ----
 // warning
-extern NSString *const OPTLYLoggerMessagesInvalidDatafileVersion;
+extern NSString *const OPTLYLoggerMessagesDatafileVersion;
 
 // ---- Event Builder ----
 // debug

OptimizelySDKUniversal/generated-frameworks/Release-tvOS-universal-SDK/OptimizelySDKTVOS.framework/Headers/OPTLYUserProfileService.h

@@ -52,4 +52,12 @@ __attribute((deprecated("Use OPTLYManager initWithBuilder method instead.")));
  **/
 - (void)removeAllUserExperimentRecords;
 
+/**
+ * Clean up and remove experiments that are not in the valid experiment list passed in.
+ * This is called when initialized from a remote datafile to ensure that the UserProfileService
+ * does not grow indefinitely.
+ * @param validExperimentIds An array of valid experiment ids.  If default user profile contains
+ * experiments not in this list, they are removed from user profile service.
+ **/
+- (void)removeInvalidExperimentsForAllUsers:(NSArray<NSString *> *)validExperimentIds;
 @end

OptimizelySDKUserProfileService/OptimizelySDKUserProfileService/OPTLYUserProfileService.h

@@ -52,4 +52,12 @@ __attribute((deprecated("Use OPTLYManager initWithBuilder method instead.")));
  **/
 - (void)removeAllUserExperimentRecords;
 
+/**
+ * Clean up and remove experiments that are not in the valid experiment list passed in.
+ * This is called when initialized from a remote datafile to ensure that the UserProfileService
+ * does not grow indefinitely.
+ * @param validExperimentIds An array of valid experiment ids.  If default user profile contains
+ * experiments not in this list, they are removed from user profile service.
+ **/
+- (void)removeInvalidExperimentsForAllUsers:(NSArray<NSString *> *)validExperimentIds;
 @end

OptimizelySDKUserProfileService/OptimizelySDKUserProfileService/OPTLYUserProfileService.m

@@ -156,6 +156,26 @@ - (void)removeUserExperimentRecordsForUserId:(nonnull NSString *)userId {
 - (void)removeAllUserExperimentRecords {
     [self.dataStore removeAllUserData];
 }
+
+- (void)removeInvalidExperimentsForAllUsers:(NSArray<NSString *> *)validExperimentIds {
+
+    NSMutableDictionary*userProfileService = [[self.dataStore getUserDataForType:OPTLYDataStoreDataTypeUserProfileService] mutableCopy];
+
+    for (NSString *key in userProfileService.allKeys) {
+        NSMutableDictionary *userProfileDict = [userProfileService[key] mutableCopy];
+        NSDictionary * bucketMap = userProfileDict[@"experiment_bucket_map"];
+        NSMutableDictionary *newBucketMap = [bucketMap mutableCopy];
+        for (NSString *exId in bucketMap.allKeys) {
+            if (![validExperimentIds containsObject:exId]) {
+                [newBucketMap removeObjectForKey:exId];
+            }
+        }
+        userProfileDict[@"experiment_bucket_map"] = newBucketMap;
+        userProfileService[key] = userProfileDict;
+    }
+
+    [self.dataStore saveUserData:userProfileService type:OPTLYDataStoreDataTypeUserProfileService];
+}
 
 @end
 

OptimizelySDKUserProfileService/OptimizelySDKUserProfileServiceTests/OptimizelySDKUserProfileServiceTests.m

@@ -312,7 +312,25 @@ - (void)testWhitelistingOverridesUserProfileAndStoresNothing {
     XCTAssertEqualObjects(variation.variationId, kWhitelistingWhitelistedVariationId);
     XCTAssertEqualObjects(variation.variationKey, kWhitelistingWhiteListedVariationKey);
 }
-
+
+- (void)testRemoveInvalidExperiments
+{
+    if (self.userProfileService ) {
+        [self.userProfileService performSelector:@selector(removeInvalidExperimentsForAllUsers:) withObject:@[]];
+        [self.userProfileService performSelector:@selector(removeInvalidExperimentsForAllUsers:) withObject:nil];
+        [self.userProfileService performSelector:@selector(removeInvalidExperimentsForAllUsers:) withObject:@[kExperimentId3a]];
+    }
+    NSDictionary *userProfile1 = [self.userProfileService lookup:kUserId1];
+    XCTAssertNil(userProfile1[kExperimentId3a], @"User profile experiment entry should be removed");
+
+    NSDictionary *userProfile2 = [self.userProfileService lookup:kUserId2];
+    XCTAssertNil(userProfile2[kExperimentId3a], @"User profile experiment entry should be removed");
+
+    NSDictionary *userProfile3 = [self.userProfileService lookup:kUserId3];
+     XCTAssertNil(userProfile3[kExperimentId3a], @"User profile experiment entry should be removed");
+
+}
+
 - (void)testLegacyUserProfileMigration
 {
     [self saveUserId:kUserId1 experimentId:kExperimentId1 variationId:kVariationId1];

Podfile

@@ -1,8 +1,8 @@
 workspace 'OptimizelySDK.xcworkspace'
 
 def common_test_pods
-  pod 'OHHTTPStubs', '5.2.2'
-  pod 'OCMock', '3.3.1'
+  pod 'OHHTTPStubs', '6.1.0'
+  pod 'OCMock', '3.4.1'
 end
 
 def analytics_pods

Podfile.lock

@@ -21,28 +21,28 @@ PODS:
   - Mixpanel-swift (2.4.2):
     - Mixpanel-swift/Complete (= 2.4.2)
   - Mixpanel-swift/Complete (2.4.2)
-  - OCMock (3.3.1)
-  - OHHTTPStubs (5.2.2):
-    - OHHTTPStubs/Default (= 5.2.2)
-  - OHHTTPStubs/Core (5.2.2)
-  - OHHTTPStubs/Default (5.2.2):
+  - OCMock (3.4.1)
+  - OHHTTPStubs (6.1.0):
+    - OHHTTPStubs/Default (= 6.1.0)
+  - OHHTTPStubs/Core (6.1.0)
+  - OHHTTPStubs/Default (6.1.0):
     - OHHTTPStubs/Core
     - OHHTTPStubs/JSON
     - OHHTTPStubs/NSURLSession
     - OHHTTPStubs/OHPathHelpers
-  - OHHTTPStubs/JSON (5.2.2):
+  - OHHTTPStubs/JSON (6.1.0):
     - OHHTTPStubs/Core
-  - OHHTTPStubs/NSURLSession (5.2.2):
+  - OHHTTPStubs/NSURLSession (6.1.0):
     - OHHTTPStubs/Core
-  - OHHTTPStubs/OHPathHelpers (5.2.2)
+  - OHHTTPStubs/OHPathHelpers (6.1.0)
 
 DEPENDENCIES:
   - Amplitude-iOS
   - Google/Analytics
   - Localytics
   - Mixpanel-swift
-  - OCMock (= 3.3.1)
-  - OHHTTPStubs (= 5.2.2)
+  - OCMock (= 3.4.1)
+  - OHHTTPStubs (= 6.1.0)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
@@ -68,9 +68,9 @@ SPEC CHECKSUMS:
   GoogleToolboxForMac: 91c824d21e85b31c2aae9bb011c5027c9b4e738f
   Localytics: 420a187fd1ba94d4a2afff66e100d1569389d9e4
   Mixpanel-swift: 63de6f5a14468b8d65e0d62ae250714455e17407
-  OCMock: f3f61e6eaa16038c30caa5798c5e49d3307b6f22
-  OHHTTPStubs: 34d9d0994e64fcf8552dbfade5ce82ada913ee31
+  OCMock: 2cd0716969bab32a2283ff3a46fd26a8c8b4c5e3
+  OHHTTPStubs: 1e21c7d2c084b8153fc53d48400d8919d2d432d0
 
-PODFILE CHECKSUM: a59ef34704d2b5a747fb4cbc2732a598d6620428
+PODFILE CHECKSUM: 4a5bb4d5f9611d224d1c0f8b7304aea59bbecac0
 
 COCOAPODS: 1.5.3