Change environmentKey and sdkKey to optional params to fix FSC

Author: yavorona

packages/optimizely-sdk/lib/core/optimizely_config/index.ts

@@ -37,17 +37,21 @@ export class OptimizelyConfig {
   public experimentsMap: OptimizelyExperimentsMap;
   public featuresMap: OptimizelyFeaturesMap;
   public revision: string;
-  public sdkKey: string;
-  public environmentKey: string;
+  public sdkKey?: string;
+  public environmentKey?: string;
   private datafile: string;
 
   constructor(configObj: ProjectConfig, datafile: string) {
     this.experimentsMap = OptimizelyConfig.getExperimentsMap(configObj);
     this.featuresMap = OptimizelyConfig.getFeaturesMap(configObj, this.experimentsMap);
     this.revision = configObj.revision;
     this.datafile = datafile;
-    this.sdkKey = configObj.sdkKey;
-    this.environmentKey = configObj.environmentKey;
+    if (configObj.sdkKey) {
+      this.sdkKey = configObj.sdkKey;
+    }
+    if (configObj.environmentKey) {
+      this.environmentKey = configObj.environmentKey;
+    }
   }
 
   /**

packages/optimizely-sdk/lib/core/project_config/index.tests.js

@@ -41,10 +41,6 @@ describe('lib/core/project_config', function() {
       forEach(testData.audiences, function(audience) {
         audience.conditions = JSON.parse(audience.conditions);
       });
-      // since v2 datafile testData does not contain sdkKey, configObj will have an empty string as sdkKey
-      assert.strictEqual(configObj.sdkKey, '');
-      // since v2 datafile testData does not contain environmentKey, configObj will have an empty string as environmentKey
-      assert.strictEqual(configObj.environmentKey, '');
       assert.strictEqual(configObj.accountId, testData.accountId);
       assert.strictEqual(configObj.projectId, testData.projectId);
       assert.strictEqual(configObj.revision, testData.revision);

packages/optimizely-sdk/lib/core/project_config/index.ts

@@ -58,8 +58,8 @@ interface VariableUsageMap {
 export interface ProjectConfig {
   revision: string;
   projectId: string;
-  sdkKey: string;
-  environmentKey: string;
+  sdkKey?: string;
+  environmentKey?: string;
   sendFlagDecisions?: boolean;
   experimentKeyMap: { [key: string]: Experiment };
   featureKeyMap: {
@@ -119,8 +119,12 @@ function createMutationSafeDatafileCopy(datafile: any): ProjectConfig {
     return rolloutCopy;
   });
 
-  datafileCopy.environmentKey = datafile.environmentKey || '';
-  datafileCopy.sdkKey = datafile.sdkKey || '';
+  if (datafile.environmentKey) {
+    datafileCopy.environmentKey = datafile.environmentKey;
+  }
+  if (datafile.sdkKey) {
+    datafileCopy.sdkKey = datafile.sdkKey;
+  }
 
   return datafileCopy;
 }