set cached client after successful initialization

Author: wangjoshuah

OptimizelySDKShared/OptimizelySDKShared/OPTLYManager.m

@@ -22,9 +22,13 @@
 #import <OptimizelySDKCore/OPTLYLogger.h>
 #import <OptimizelySDKCore/OPTLYLoggerMessages.h>
 
-@implementation OPTLYManager
+@interface OPTLYManager ()
+
+@property (strong, readwrite, nonatomic, nullable) OPTLYClient *optimizelyClient;
+
+@end
 
-OPTLYClient *optimizelyClient;
+@implementation OPTLYManager
 
 + (instancetype)initWithBuilderBlock:(OPTLYManagerBuilderBlock)block {
     return [[self alloc] initWithBuilder:[OPTLYManagerBuilder builderWithBlock:block]];
@@ -68,16 +72,21 @@ - (instancetype)initWithBuilder:(OPTLYManagerBuilder *)builder {
 }
 
 - (OPTLYClient *)initializeClient {
-    return [OPTLYClient initWithBuilderBlock:^(OPTLYClientBuilder * _Nonnull builder) {
+    OPTLYClient *client = [OPTLYClient initWithBuilderBlock:^(OPTLYClientBuilder * _Nonnull builder) {
         builder.datafile = self.datafile;
     }];
+    if (client.optimizely != nil) {
+        self.optimizelyClient = client;
+    }
+    return client;
 }
 
 - (OPTLYClient *)initializeClientWithDatafile:(NSData *)datafile {
     OPTLYClient *client = [OPTLYClient initWithBuilderBlock:^(OPTLYClientBuilder * _Nonnull builder) {
         builder.datafile = datafile;
     }];
     if (client.optimizely != nil) {
+        self.optimizelyClient = client;
         return client;
     }
     else {
@@ -96,13 +105,16 @@ - (void)initializeClientWithCallback:(void (^)(NSError * _Nullable, OPTLYClient
                                 OPTLYClient *client = [OPTLYClient initWithBuilderBlock:^(OPTLYClientBuilder * _Nonnull builder) {
                                     builder.datafile = data;
                                 }];
+                                if (client.optimizely != nil) {
+                                    self.optimizelyClient = client;
+                                }
                                 callback(nil, client);
                             }
                         }];
 }
 
 - (OPTLYClient *)getOptimizely {
-    return optimizelyClient;
+    return self.optimizelyClient;
 }
 
 @end

OptimizelySDKShared/OptimizelySDKSharedTests/OPTLYManagerTest.m

@@ -80,7 +80,8 @@ - (void)testInitializeClientWithDefaults {
     XCTAssertNotNil(client);
     XCTAssertNotNil(client.optimizely);
     XCTAssertNotNil(client.logger);
-    
+    XCTAssertEqual(client, manager.getOptimizely);
+
     [self checkConfigIsUsingDefaultDatafile:client.optimizely.config];
 }
 
@@ -103,6 +104,7 @@ - (void)testInitializeClientWithCustomDatafile {
     XCTAssertNotNil(client);
     XCTAssertNotNil(client.optimizely);
     XCTAssertNotNil(client.logger);
+    XCTAssertEqual(client, manager.getOptimizely);
 
     [self checkConfigIsUsingAlternativeDatafile:client.optimizely.config];
 }
@@ -132,8 +134,11 @@ - (void)testInitializeClientAsync {
     // setup async expectation
     __weak XCTestExpectation *expectation = [self expectationWithDescription:@"testInitializeClientAsync"];
     // initialize client
+    __block OPTLYClient *optimizelyClient;
     [manager initializeClientWithCallback:^(NSError * _Nullable error, OPTLYClient * _Nullable client) {
 
+        // retain a reference to the client
+        optimizelyClient = client;
         // check client in callback
         XCTAssertNotNil(client);
         XCTAssertNotNil(client.optimizely, @"Client needs to have an optimizely instance");
@@ -144,6 +149,7 @@ - (void)testInitializeClientAsync {
 
     // wait for async start to finish
     [self waitForExpectationsWithTimeout:2 handler:nil];
+    XCTAssertEqual(optimizelyClient, manager.getOptimizely);
 }
 
 - (void)checkConfigIsUsingDefaultDatafile: (OPTLYProjectConfig *)config {