Replace execution context

Author: mikechu-optimizely

packages/optimizely-sdk/lib/index.browser.ts

@@ -32,8 +32,6 @@ import { createNotificationCenter } from './core/notification_center';
 import { default as eventProcessor } from './plugins/event_processor';
 import { OptimizelyDecideOption, Client, Config } from './shared_types';
 import { createHttpPollingDatafileManager } from './plugins/datafile_manager/http_polling_datafile_manager';
-import { EXECUTION_CONTEXT_TYPE } from './utils/enums';
-import { ExecutionContext } from './utils/execution_context';
 
 const logger = getLogger();
 logHelper.setLogHandler(loggerPlugin.createLogger());
@@ -46,8 +44,6 @@ const DEFAULT_EVENT_MAX_QUEUE_SIZE = 10000;
 
 let hasRetriedEvents = false;
 
-ExecutionContext.Current = EXECUTION_CONTEXT_TYPE.BROWSER;
-
 /**
  * Creates an instance of the Optimizely class
  * @param  {Config} config

packages/optimizely-sdk/lib/index.node.ts

@@ -32,8 +32,6 @@ import { createNotificationCenter } from './core/notification_center';
 import { createEventProcessor } from './plugins/event_processor';
 import { OptimizelyDecideOption, Client, Config } from './shared_types';
 import { createHttpPollingDatafileManager } from './plugins/datafile_manager/http_polling_datafile_manager';
-import { ExecutionContext } from './utils/execution_context';
-import { EXECUTION_CONTEXT_TYPE } from './utils/enums';
 
 const logger = getLogger();
 setLogLevel(LogLevel.ERROR);
@@ -42,8 +40,6 @@ const DEFAULT_EVENT_BATCH_SIZE = 10;
 const DEFAULT_EVENT_FLUSH_INTERVAL = 30000; // Unit is ms, default is 30s
 const DEFAULT_EVENT_MAX_QUEUE_SIZE = 10000;
 
-ExecutionContext.Current = EXECUTION_CONTEXT_TYPE.NODE;
-
 /**
  * Creates an instance of the Optimizely class
  * @param  {Config} config

packages/optimizely-sdk/lib/index.react_native.ts

@@ -32,8 +32,6 @@ import { createNotificationCenter } from './core/notification_center';
 import { createEventProcessor } from './plugins/event_processor/index.react_native';
 import { OptimizelyDecideOption, Client, Config } from './shared_types';
 import { createHttpPollingDatafileManager } from './plugins/datafile_manager/http_polling_datafile_manager';
-import { EXECUTION_CONTEXT_TYPE } from './utils/enums';
-import { ExecutionContext } from './utils/execution_context';
 
 const logger = getLogger();
 setLogHandler(loggerPlugin.createLogger());
@@ -43,8 +41,6 @@ const DEFAULT_EVENT_BATCH_SIZE = 10;
 const DEFAULT_EVENT_FLUSH_INTERVAL = 1000; // Unit is ms, default is 1s
 const DEFAULT_EVENT_MAX_QUEUE_SIZE = 10000;
 
-ExecutionContext.Current = EXECUTION_CONTEXT_TYPE.BROWSER;
-
 /**
  * Creates an instance of the Optimizely class
  * @param  {Config} config

packages/optimizely-sdk/lib/utils/enums/index.ts

@@ -292,12 +292,19 @@ export enum NOTIFICATION_TYPES {
   TRACK = 'TRACK:event_key, user_id, attributes, event_tags, event',
 }
 
+/**
+ * ODP User Key
+ */
+export enum ODP_USER_KEY {
+  VUID = 'vuid',
+  FS_USER_ID = 'fs_user_id',
+}
 
 /**
- * Valid types of Javascript contexts in which this code is executing
+ * Possible states of ODP integration
  */
-export enum EXECUTION_CONTEXT_TYPE {
-  NOT_DEFINED,
-  BROWSER,
-  NODE,
+export enum ODP_CONFIG_STATE {
+  UNDETERMINED = 0,
+  INTEGRATED,
+  NOT_INTEGRATED = 2,
 }

packages/optimizely-sdk/lib/utils/execution_context/index.ts

@@ -18,21 +18,18 @@ import { LogHandler } from '../../modules/logging';
 import { RequestHandler } from './http';
 import { NodeRequestHandler } from './node_request_handler';
 import { BrowserRequestHandler } from './browser_request_handler';
-import { ExecutionContext } from '../execution_context';
-import { EXECUTION_CONTEXT_TYPE } from '../enums';
 
 /**
  * Factory to create the appropriate type of RequestHandler based on a provided context
  */
 export class RequestHandlerFactory {
   public static createHandler(logger: LogHandler, timeout?: number): RequestHandler {
-    switch (ExecutionContext.Current) {
-      case EXECUTION_CONTEXT_TYPE.BROWSER:
-        return new BrowserRequestHandler(logger, timeout);
-      case EXECUTION_CONTEXT_TYPE.NODE:
-        return new NodeRequestHandler(logger, timeout);
-      default:
-        return null as unknown as RequestHandler;
+    if (window) {
+      return new BrowserRequestHandler(logger, timeout);
+    } else if (process) {
+      return new NodeRequestHandler(logger, timeout);
+    } else {
+      return null as unknown as RequestHandler;
     }
   }
 }