Merge branch 'master' into jnguyen/fixes-for-fsc

Author: opti-jnguyen

packages/optimizely-sdk/lib/core/odp/odp_event_manager.ts

@@ -243,11 +243,6 @@ export abstract class OdpEventManager implements IOdpEventManager {
       return;
     }
 
-    if (!this.odpConfig.isReady()) {
-      this.logger.log(LogLevel.DEBUG, 'Unable to Process ODP Event. ODPConfig is not ready.');
-      return;
-    }
-
     if (this.queue.length >= this.queueSize) {
       this.logger.log(
         LogLevel.WARNING,

packages/optimizely-sdk/lib/core/odp/odp_segment_api_manager.ts

@@ -108,9 +108,13 @@ export class OdpSegmentApiManager implements IOdpSegmentApiManager {
     }
 
     if (parsedSegments.errors?.length > 0) {
-      const errors = parsedSegments.errors.map(e => e.message).join('; ');
+      const { code, classification } = parsedSegments.errors[0].extensions;
 
-      this.logger.log(LogLevel.ERROR, `${AUDIENCE_FETCH_FAILURE_MESSAGE} (${errors})`);
+      if (code == "INVALID_IDENTIFIER_EXCEPTION") {
+        this.logger.log(LogLevel.ERROR, `${AUDIENCE_FETCH_FAILURE_MESSAGE} (invalid identifier)`);
+      } else {
+        this.logger.log(LogLevel.ERROR, `${AUDIENCE_FETCH_FAILURE_MESSAGE} (${classification})`);
+      }
 
       return null;
     }

packages/optimizely-sdk/lib/core/odp/odp_types.ts

@@ -58,6 +58,7 @@ export interface Location {
  * Extended error information
  */
 export interface Extension {
+  code: string;
   classification: string;
 }
 

packages/optimizely-sdk/lib/index.browser.tests.js

@@ -1049,6 +1049,40 @@ describe('javascript-sdk (Browser)', function() {
 
         sinon.assert.notCalled(logger.error);
       });
+
+      it('should send odp client_initialized on client instantiation', async () => {
+        const odpConfig = new OdpConfig();
+        const apiManager = new BrowserOdpEventApiManager(mockRequestHandler, logger);
+        sinon.spy(apiManager, 'sendEvents');
+        const eventManager = new BrowserOdpEventManager({
+           odpConfig,
+           apiManager,
+           logger,
+        });
+        const datafile = testData.getOdpIntegratedConfigWithSegments();
+        const client = optimizelyFactory.createInstance({
+          datafile,
+          errorHandler: fakeErrorHandler,
+          eventDispatcher: fakeEventDispatcher,
+          eventBatchSize: null,
+          logger,
+          odpOptions: {
+            odpConfig,
+            eventManager,
+          },
+        });
+
+        const readyData = await client.onReady();
+        assert.equal(readyData.success, true);
+        assert.isUndefined(readyData.reason);
+
+        clock.tick(100);
+
+        const [,,events] = apiManager.sendEvents.getCall(0).args;
+        const [firstEvent] = events;
+        assert.equal(firstEvent.action, 'client_initialized');
+        assert.equal(firstEvent.type, 'fullstack');
+      });
     });
   });
 });

packages/optimizely-sdk/tests/odpEventManager.spec.ts

@@ -168,7 +168,8 @@ describe('OdpEventManager', () => {
 
     eventManager.sendEvent(EVENTS[0]);
 
-    verify(mockLogger.log(LogLevel.DEBUG, 'Unable to Process ODP Event. ODPConfig is not ready.')).once();
+    // In a Node context, the events should be discarded
+    verify(mockLogger.log(LogLevel.WARNING, 'ODPConfig not ready. Discarding events in queue.')).once();
   });
 
   it('should discard events with invalid data', () => {

packages/optimizely-sdk/tests/odpSegmentApiManager.spec.ts

@@ -179,6 +179,32 @@ describe('OdpSegmentApiManager', () => {
   });
 
   it('should handle error with invalid identifier', async () => {
+    const INVALID_USER_ID = 'invalid-user';
+    const errorJsonResponse =
+      '{"errors":[{"message":' +
+      '"Exception while fetching data (/customer) : ' +
+      `Exception: could not resolve _fs_user_id = ${INVALID_USER_ID}",` +
+      '"locations":[{"line":1,"column":8}],"path":["customer"],' +
+      '"extensions":{"code": "INVALID_IDENTIFIER_EXCEPTION","classification":"DataFetchingException"}}],' +
+      '"data":{"customer":null}}';
+    when(mockRequestHandler.makeRequest(anything(), anything(), anything(), anything())).thenReturn(
+      abortableRequest(200, errorJsonResponse)
+    );
+    const manager = managerInstance();
+
+    const segments = await manager.fetchSegments(
+      API_key,
+      GRAPHQL_ENDPOINT,
+      USER_KEY,
+      INVALID_USER_ID,
+      SEGMENTS_TO_CHECK
+    );
+
+    expect(segments).toBeNull();
+    verify(mockLogger.log(LogLevel.ERROR, 'Audience segments fetch failed (invalid identifier)')).once();
+  });
+
+  it('should handle other fetch error responses', async () => {
     const INVALID_USER_ID = 'invalid-user';
     const errorJsonResponse =
       '{"errors":[{"message":' +
@@ -201,7 +227,7 @@ describe('OdpSegmentApiManager', () => {
     );
 
     expect(segments).toBeNull();
-    verify(mockLogger.log(anything(), anyString())).once();
+    verify(mockLogger.log(LogLevel.ERROR, 'Audience segments fetch failed (DataFetchingException)')).once();
   });
 
   it('should handle unrecognized JSON responses', async () => {