update to have sdk key use a different cdn path in the datafile config (#280)

* update to have sdk key use a different cdn path in the datafile config

* update per comments and move valid key string test to datafile config

* rename local variables and getters to avoid confusion.  going to cdn

Author: thomaszurkan-optimizely

OptimizelyDemoApp/AppDelegate.swift

@@ -73,8 +73,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // ---- Create the Datafile Manager ----
         let datafileManager = OPTLYDatafileManagerDefault.init(builder: OPTLYDatafileManagerBuilder.init(block: { (builder) in
             // builder!.datafileFetchInterval = TimeInterval(self.datafileManagerDownloadInterval)
-            builder!.datafileConfig = OPTLYDatafileConfig(projectId: nil, withSDKKey:self.projectId)!; 
-        }))
+            builder!.datafileConfig = OPTLYDatafileConfig(projectId: self.projectId, withSDKKey:nil)!;
+        }
 
         // ---- Create the Manager ----
         let optimizelyManager = OPTLYManager.init(builder: OPTLYManagerBuilder.init(block: { (builder) in

OptimizelySDKCore/OptimizelySDKCoreTests/OPTLYNetworkServiceTest.m

@@ -64,9 +64,9 @@ - (void)testDownloadProjectConfigRequestRetrievesProperDatafileVersion {
     __weak XCTestExpectation *expectation = [self expectationWithDescription:@"testDownloadProjectConfigRequestRetrievesProperDatafileVersion"];
     [self stub200Response];
 
-    NSString *filePath = [NSString stringWithFormat:OPTLY_DATAFILE_URL, kProjectId];
+    NSString *cdnPath = [OPTLYDatafileConfig defaultProjectIdCdnPath:kProjectId];
 
-    [self.network downloadProjectConfig:[NSURL URLWithString:filePath]
+    [self.network downloadProjectConfig:[NSURL URLWithString:cdnPath]
                            backoffRetry:NO
                       completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
                           NSDictionary *datafile = [NSJSONSerialization JSONObjectWithData:data
@@ -83,9 +83,9 @@ - (void)testDownloadProjectConfigRequestRetrievesProperDatafileVersion {
 - (void)testDownloadProjectConfigWithLastModifiedRequestRetrievesProperDatafileVersion {
     __weak XCTestExpectation *expectation = [self expectationWithDescription:@"testDownloadProjectConfigWithLastModifiedRequestRetrievesProperDatafileVersion"];
     [self stub200Response];
-    NSString *filePath = [NSString stringWithFormat:OPTLY_DATAFILE_URL, kProjectId];
+    NSString *cdnPath = [OPTLYDatafileConfig defaultProjectIdCdnPath:kProjectId];
 
-    [self.network downloadProjectConfig:[NSURL URLWithString:filePath]
+    [self.network downloadProjectConfig:[NSURL URLWithString:cdnPath]
                            backoffRetry:NO
                            lastModified:kLastModifiedDate
                       completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
@@ -101,7 +101,7 @@ - (void)testDownloadProjectConfigWithLastModifiedRequestRetrievesProperDatafileV
 
 # pragma mark - Helper Methods
 - (id<OHHTTPStubsDescriptor>)stub200Response {
-    NSString *filePath = [NSString stringWithFormat:OPTLY_DATAFILE_URL, kProjectId];
+    NSString *filePath = [OPTLYDatafileConfig defaultProjectIdCdnPath:kProjectId];
 
      NSURL *hostURL = [NSURL URLWithString:filePath];
     NSString *hostName = [hostURL host];

OptimizelySDKShared/OptimizelySDKShared/OPTLYDatafileConfig.h

@@ -15,10 +15,22 @@
  ***************************************************************************/
 #import <Foundation/Foundation.h>
 
-extern NSString * const OPTLY_DATAFILE_URL;
+extern NSString * const DEFAULT_HOST;
+extern NSString * const OPTLY_PROJECTID_SUFFIX;
+extern NSString * const OPTLY_ENVIRONMENTS_SUFFIX;
 
 @interface OPTLYDatafileConfig : NSObject
 - (nullable id)initWithProjectId:(NSString *)projectId withSDKKey:(NSString *)sdkKey;
 - (NSURL *) URLForKey;
 - (NSString *) key;
 @end
+
+@interface OPTLYDatafileConfig(OPTLYHelpers)
++ (NSString *)defaultProjectIdCdnPath:(NSString *)projectId;
++ (NSString *)defaultSdkKeyCdnPath:(NSString *)sdkKey;
+/*
+ * Test if string s can be an Optimizely SDK key string.
+ */
++ (BOOL)isValidKeyString:(NSString*)s;
+
+@end

OptimizelySDKShared/OptimizelySDKShared/OPTLYDatafileConfig.m

@@ -17,33 +17,67 @@
 #import "OPTLYDatafileConfig.h"
 #import "OPTLYManagerBase.h"
 
-NSString * const OPTLY_DATAFILE_URL = @"https://cdn.optimizely.com/json/%@.json";
+NSString * const DEFAULT_HOST = @"https://cdn.optimizely.com";
+NSString * const OPTLY_PROJECTID_SUFFIX = @"/json/%@.json";
+NSString * const OPTLY_ENVIRONMENTS_SUFFIX = @"/datafiles/%@.json";
 
 @interface OPTLYDatafileConfig()
+- (nullable id)initWithProjectId:(NSString *)projectId withSDKKey:(NSString *)sdkKey withHost:(NSString *)host;
 @property(nonatomic, strong, nullable) NSString* projectId;
 @property(nonatomic, strong, nullable) NSString* sdkKey;
+@property(nonatomic, strong) NSString* host;
+@property(nonatomic, strong) NSURL* datafileUrl;
+@end
+
+@implementation OPTLYDatafileConfig(OPTLYHelpers)
++ (NSString *)defaultProjectIdCdnPath:(NSString *)projectId {
+    NSString *datafileFormat = [DEFAULT_HOST stringByAppendingString:OPTLY_PROJECTID_SUFFIX];
+    return [NSString stringWithFormat:datafileFormat, projectId];
+}
++ (NSString *)defaultSdkKeyCdnPath:(NSString *)sdkKey {
+    NSString *datafileFormat = [DEFAULT_HOST stringByAppendingString:OPTLY_ENVIRONMENTS_SUFFIX];
+    return [NSString stringWithFormat:datafileFormat, sdkKey];
+}
++ (BOOL)isValidKeyString:(NSString*)s {
+    return ((s != nil) && ![s isEqualToString:@""] && ![s containsString:@" "]);
+}
 @end
 
 @implementation OPTLYDatafileConfig
 
-- (instancetype)initWithProjectId:(NSString *)projectId withSDKKey:(NSString *)sdkKey {
-    if (![OPTLYManagerBase isValidKeyString:projectId] && ![OPTLYManagerBase isValidKeyString:sdkKey]) {
+- (instancetype)initWithProjectId:(NSString *)projectId withSDKKey:(NSString *)sdkKey withHost:(NSString *)host {
+    self.host = host;
+    
+    if (![OPTLYDatafileConfig isValidKeyString:projectId] && ![OPTLYDatafileConfig isValidKeyString:sdkKey]) {
         // One of projectId and sdkKey needs to be a valid key string.
         return nil;
     }
     if (self = [super init]) {
         self.projectId = projectId;
         self.sdkKey = sdkKey;
+        if (self.sdkKey != nil) {
+            NSString *datafileFormat = [self.host stringByAppendingString:OPTLY_ENVIRONMENTS_SUFFIX];
+            NSString *datafile = [NSString stringWithFormat:datafileFormat, self.sdkKey];
+            self.datafileUrl = [NSURL URLWithString:datafile];
+        }
+        else {
+            NSString *datafileFormat = [self.host stringByAppendingString:OPTLY_PROJECTID_SUFFIX];
+            NSString *datafile = [NSString stringWithFormat:datafileFormat, self.projectId];
+            self.datafileUrl = [NSURL URLWithString:datafile];
+        }
     }
     return self;
 }
+
+- (instancetype)initWithProjectId:(NSString *)projectId withSDKKey:(NSString *)sdkKey {
+    return [self initWithProjectId:projectId withSDKKey:sdkKey withHost:DEFAULT_HOST];
+}
 - (NSString*)key {
     return (_sdkKey != nil) ? _sdkKey : _projectId;
 }
 
 - (NSURL *)URLForKey {
-    NSString *filePath = [NSString stringWithFormat:OPTLY_DATAFILE_URL, [self key]];
-    return [NSURL URLWithString:filePath];
+    return _datafileUrl;
 }
 
 + (BOOL)areNilOrEqual:(NSString*)x y:(NSString*)y {

OptimizelySDKShared/OptimizelySDKShared/OPTLYManagerBase.h

@@ -121,9 +121,4 @@ typedef void (^OPTLYManagerBuilderBlock)(OPTLYManagerBuilder * _Nullable builder
  * Gets the cached Optimizely client.
  */
 - (nullable OPTLYClient *)getOptimizely;
-
-/*
- * Test if string s can be an Optimizely SDK key string.
- */
-+ (BOOL)isValidKeyString:(NSString*)s;
 @end

OptimizelySDKShared/OptimizelySDKShared/OPTLYManagerBase.m

@@ -181,8 +181,4 @@ - (OPTLYClient *)initializeClientWithManagerSettingsAndDatafile:(NSData *)datafi
 - (NSString *)description {
     return [NSString stringWithFormat:@"projectId: %@ \nclientEngine: %@\nclientVersion: %@\ndatafile:%@\nlogger:%@\nerrorHandler:%@\ndatafileManager:%@\neventDispatcher:%@\nuserProfile:%@", self.projectId, self.clientEngine, self.clientVersion, self.datafile, self.logger, self.errorHandler, self.datafileManager, self.eventDispatcher, self.userProfileService];
 }
-
-+ (BOOL)isValidKeyString:(NSString*)s {
-    return ((s != nil) && ![s isEqualToString:@""] && ![s containsString:@" "]);
-}
 @end

OptimizelySDKShared/OptimizelySDKShared/OPTLYManagerBuilder.m

@@ -80,7 +80,7 @@ - (id)initWithBlock:(OPTLYManagerBuilderBlock)block {
         }
 
         // check the project id
-        if (![OPTLYManagerBase isValidKeyString:_projectId] && ![OPTLYManagerBase isValidKeyString:_sdkKey]) {
+        if (![OPTLYDatafileConfig isValidKeyString:_projectId] && ![OPTLYDatafileConfig isValidKeyString:_sdkKey]) {
             [_logger logMessage:OPTLYLoggerMessagesManagerMustBeInitializedWithProjectId
                       withLevel:OptimizelyLogLevelError];
             return nil;

OptimizelySDKShared/OptimizelySDKSharedTests/OPTLYDatafileManagerTest.m

@@ -28,7 +28,7 @@ @interface OPTLYDatafileManagerTest : XCTestCase
 @implementation OPTLYDatafileManagerTest
 
 - (void)testProjectConfigURLPathReturnsExpectedURL {
-    NSString *expectedURLString = [NSString stringWithFormat:OPTLY_DATAFILE_URL, kProjectId];
+    NSString *expectedURLString = [OPTLYDatafileConfig defaultProjectIdCdnPath:kProjectId];
     NSURL *expectedURL = [NSURL URLWithString:expectedURLString];
 
     NSURL *cdnURL = [[[OPTLYDatafileConfig alloc] initWithProjectId:kProjectId withSDKKey:nil] URLForKey];

OptimizelySDKShared/OptimizelySDKSharedTests/OPTLYManagerTest.m

@@ -417,10 +417,10 @@ - (void)testInitializeWithCallbackDownloadErrorNoDatafile
 #pragma mark - isValidKeyString
 
 -(void)testIsValidKeyString {
-    XCTAssertTrue([OPTLYManagerBase isValidKeyString:@"12121212" ]);
+    XCTAssertTrue([OPTLYDatafileConfig isValidKeyString:@"12121212" ]);
     NSString *strTest = nil;
-    XCTAssertFalse([OPTLYManagerBase isValidKeyString:strTest]);
-    XCTAssertFalse([OPTLYManagerBase isValidKeyString:@""]);
+    XCTAssertFalse([OPTLYDatafileConfig isValidKeyString:strTest]);
+    XCTAssertFalse([OPTLYDatafileConfig isValidKeyString:@""]);
 }
 
 # pragma mark - Helper Methods