Add environmentKey and sdkKey to datafile, OptimizelyConfig, and ProjectConfig

Author: yavorona

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

@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020, Optimizely
+ * Copyright 2019-2021, Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -137,5 +137,13 @@ describe('lib/core/optimizely_config', function() {
     it('should return correct config revision', function() {
       assert.equal(optimizelyConfigObject.revision, datafile.revision);
     });
+
+    it('should return correct config sdkKey ', function() {
+      assert.equal(optimizelyConfigObject.sdkKey, datafile.sdkKey);
+    });
+
+    it('should return correct config environmentKey ', function() {
+      assert.equal(optimizelyConfigObject.environmentKey, datafile.environmentKey);
+    });
   });
 });

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

@@ -37,8 +37,8 @@ export class OptimizelyConfig {
   public experimentsMap: OptimizelyExperimentsMap;
   public featuresMap: OptimizelyFeaturesMap;
   public revision: string;
-  private sdkKey: string;
-  private environmentKey: string;
+  public sdkKey: string;
+  public environmentKey: string;
   private datafile: string;
 
   constructor(configObj: ProjectConfig, datafile: string) {
@@ -58,22 +58,6 @@ export class OptimizelyConfig {
     return this.datafile;
   }
 
-  /**
-   * Get the sdkKey
-   * @returns {string} sdkKey
-   */
-   getSdkKey(): string {
-    return this.sdkKey;
-  }
-
-  /**
-   * Get the environmentKey
-   * @returns {string} environmentKey
-   */
-   getEnvironmentKey(): string {
-    return this.environmentKey;
-  }
-
   /**
    * Get Experiment Ids which are part of rollout
    * @param       {Rollout[]}                  rollouts

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

@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2020, Optimizely
+ * Copyright 2016-2021, Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import sinon from 'sinon';
-import { assert, expect, config } from 'chai';
+import { assert } from 'chai';
 import { forEach, cloneDeep } from 'lodash';
 import { getLogger } from '@optimizely/js-sdk-logging';
 import { sprintf } from '@optimizely/js-sdk-utils';
@@ -41,7 +41,10 @@ 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

@@ -115,6 +115,10 @@ function createMutationSafeDatafileCopy(datafile: any): ProjectConfig {
     });
     return rolloutCopy;
   });
+
+  datafileCopy.environmentKey = datafile.environmentKey || '';
+  datafileCopy.sdkKey = datafile.sdkKey || '';
+
   return datafileCopy;
 }
 

packages/optimizely-sdk/lib/shared_types.ts

@@ -304,8 +304,8 @@ export interface OptimizelyConfig {
   experimentsMap: OptimizelyExperimentsMap;
   featuresMap: OptimizelyFeaturesMap;
   revision: string;
-  sdkKey: string,
-  environmentKey: string,
+  sdkKey: string;
+  environmentKey: string;
   getDatafile(): string;
 }
 

packages/optimizely-sdk/lib/tests/test_data.js

@@ -418,6 +418,8 @@ var decideConfig = {
   ],
   anonymizeIP: true,
   botFiltering: true,
+  sdkKey: 'ValidProjectConfigV4',
+  environmentKey: 'production',
   projectId: '10431130345',
   variables: [],
   featureFlags: [
@@ -1143,7 +1145,7 @@ var configWithFeatures = {
   ],
   anonymizeIP: true,
   botFiltering: true,
-  sdkKey: 'ValidProjectConfigWithFeatures',
+  sdkKey: 'ValidProjectConfigV4',
   environmentKey: 'development',
   audiences: [
     {