From 90029e36dc774a88a85c05b94bb7fc3c6928eb73 Mon Sep 17 00:00:00 2001
From: Aaron Hardy <aahardy@adobe.com>
Date: Thu, 9 May 2019 13:47:00 -0600
Subject: [PATCH 1/2] Cleaned up user-facing configuration options.

---
 sandbox/public/index.html  | 12 ------------
 sandbox/src/OrgTwo.js      |  5 -----
 src/core/createInstance.js | 13 +++++++++++++
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/sandbox/public/index.html b/sandbox/public/index.html
index 8f580cc96..ce8b2ee34 100755
--- a/sandbox/public/index.html
+++ b/sandbox/public/index.html
@@ -23,13 +23,7 @@
 
     <script>
       alloy("configure", {
-        orgID: 12345,
         propertyID: 9999999,
-        dataSet: "dataset1",
-        shouldStoreCollectedData: 1,
-        device: "Chrome-Mac",
-        collectionUrl: "https://edgegateway.azurewebsites.net",
-        // collectionUrl: "http://ex-edge.stable-stage.aam-npe.adobeinternal.net/v1",
         destinationsEnabled: true,
         debug: true
       });
@@ -46,13 +40,7 @@
 
       // For Testing multiple instances
       organizationTwo("configure", {
-        orgID: 67890,
         propertyID: 8888888,
-        dataSet: "dataset2",
-        shouldStoreCollectedData: 1,
-        device: "Chrome-Mac",
-        collectionUrl: "https://edgegateway.azurewebsites.net",
-        // collectionUrl: "http://ex-edge.stable-stage.aam-npe.adobeinternal.net/v1",
         destinationsEnabled: true,
         debug: true
       });
diff --git a/sandbox/src/OrgTwo.js b/sandbox/src/OrgTwo.js
index 28913868b..93f0bc57b 100644
--- a/sandbox/src/OrgTwo.js
+++ b/sandbox/src/OrgTwo.js
@@ -11,12 +11,7 @@ export default function OrgTwo() {
             <code>
             {`
                 organizationTwo("configure", {
-                    orgID: 67890,
                     propertyID: 8888888,
-                    dataSet: "dataset2",
-                    shouldStoreCollectedData: 1,
-                    device: "Chrome-Mac",
-                    collectionUrl: "https://edgegateway.azurewebsites.net",
                     destinationsEnabled: true,
                     debug: true
                 });
diff --git a/src/core/createInstance.js b/src/core/createInstance.js
index e227a426d..065d357cc 100644
--- a/src/core/createInstance.js
+++ b/src/core/createInstance.js
@@ -19,6 +19,17 @@ const configValidators = {
   dataSet: { validate: required }
 };
 
+// TODO: For testing purposes only. Remove eventually.
+const augmentTestingOptions = options => {
+  // eslint-disable-next-line no-param-reassign
+  options.shouldStoreCollectedData = 1;
+  // eslint-disable-next-line no-param-reassign
+  options.device = "Chrome-Mac";
+  // eslint-disable-next-line no-param-reassign
+  options.collectionUrl = "https://edgegateway.azurewebsites.net";
+  // options.collectionUrl = "http://ex-edge.stable-stage.aam-npe.adobeinternal.net/v1";
+};
+
 export default (namespace, initializeComponents, debugController) => {
   let componentRegistry;
 
@@ -28,6 +39,8 @@ export default (namespace, initializeComponents, debugController) => {
   };
 
   const configureCommand = options => {
+    augmentTestingOptions(options);
+
     if (options.debug !== undefined) {
       debugCommand({ enabled: options.debug });
     }

From e596d055fe38e0a24de34056bdc294f288136800 Mon Sep 17 00:00:00 2001
From: Aaron Hardy <aahardy@adobe.com>
Date: Fri, 10 May 2019 09:16:24 -0600
Subject: [PATCH 2/2] Moved testing configuration to into validator defaults.

---
 src/components/DataCollector/index.js |  4 ++--
 src/core/createInstance.js            | 18 +++---------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/components/DataCollector/index.js b/src/components/DataCollector/index.js
index 1550e85bc..26735fed7 100644
--- a/src/components/DataCollector/index.js
+++ b/src/components/DataCollector/index.js
@@ -12,7 +12,6 @@ governing permissions and limitations under the License.
 
 import createRequest from "../../core/createRequest";
 import createEvent from "../../core/createEvent";
-import { required } from "../../core/createConfig";
 
 const createDataCollector = ({ config }) => {
   let lifecycle;
@@ -52,7 +51,8 @@ createDataCollector.namespace = "DataCollector";
 
 createDataCollector.configValidators = {
   collectionUrl: {
-    validate: required
+    defaultValue: "https://edgegateway.azurewebsites.net"
+    // defaultValue: "http://ex-edge.stable-stage.aam-npe.adobeinternal.net/v1"
   },
   device: {
     defaultValue: "UNKNOWN-DEVICE"
diff --git a/src/core/createInstance.js b/src/core/createInstance.js
index 065d357cc..9e5d2a7c4 100644
--- a/src/core/createInstance.js
+++ b/src/core/createInstance.js
@@ -14,20 +14,10 @@ import { isFunction, toError } from "../utils";
 import createConfig, { required } from "./createConfig";
 
 const configValidators = {
-  orgID: { validate: required },
   propertyID: { validate: required },
-  dataSet: { validate: required }
-};
-
-// TODO: For testing purposes only. Remove eventually.
-const augmentTestingOptions = options => {
-  // eslint-disable-next-line no-param-reassign
-  options.shouldStoreCollectedData = 1;
-  // eslint-disable-next-line no-param-reassign
-  options.device = "Chrome-Mac";
-  // eslint-disable-next-line no-param-reassign
-  options.collectionUrl = "https://edgegateway.azurewebsites.net";
-  // options.collectionUrl = "http://ex-edge.stable-stage.aam-npe.adobeinternal.net/v1";
+  // TODO: For debugging purposes only. Remove eventually.
+  shouldStoreCollectedData: { defaultValue: 1 },
+  device: { defaultValue: "Chrome-Mac" }
 };
 
 export default (namespace, initializeComponents, debugController) => {
@@ -39,8 +29,6 @@ export default (namespace, initializeComponents, debugController) => {
   };
 
   const configureCommand = options => {
-    augmentTestingOptions(options);
-
     if (options.debug !== undefined) {
       debugCommand({ enabled: options.debug });
     }