WIP FS-UID Normalization

Author: opti-jnguyen

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

@@ -156,6 +156,12 @@ export abstract class OdpManager {
    * @param {OdpEvent}  > ODP Event to send to event manager
    */
   public sendEvent({ type, action, identifiers, data }: OdpEvent): void {
+    let mType = type;
+
+    if (typeof mType != 'string' || mType === '') {
+      mType = 'fullstack';
+    }
+
     if (!this.enabled) {
       throw new Error(ERROR_MESSAGES.ODP_NOT_ENABLED);
     }
@@ -172,10 +178,46 @@ export abstract class OdpManager {
       throw new Error(ERROR_MESSAGES.ODP_SEND_EVENT_FAILED_EVENT_MANAGER_MISSING);
     }
 
-    this.eventManager.sendEvent(new OdpEvent(type, action, identifiers, data));
+    if (typeof action != 'string' || action === '') {
+      throw new Error('ODP action is not valid (cannot be empty).');
+    }
+
+    const normalizedIdentifiers = normalizeFsUserIdentifiers(identifiers);
+
+    this.eventManager.sendEvent(new OdpEvent(mType, action, normalizedIdentifiers, data));
   }
 
   public abstract isVuidEnabled(): boolean;
 
   public abstract getVuid(): string | undefined;
 }
+
+function normalizeFsUserIdentifiers(identifiers: Map<string, string>): Map<string, string> {
+  let fsUserId;
+  const mIdentifiers = structuredClone(identifiers);
+
+  if (identifiers.has('fs-user-id')) {
+    fsUserId = identifiers.get('fs-user-id');
+    mIdentifiers.delete('fs-user-id');
+  }
+
+  if (identifiers.has('FS-USER-ID')) {
+    if (fsUserId) {
+      throw new Error('Conflicting variant of fs_user_id.');
+    }
+
+    fsUserId = identifiers.get('FS-USER-ID');
+    mIdentifiers.delete('FS-USER-ID');
+  }
+
+  if (identifiers.has('FS_USER_ID')) {
+    if (fsUserId) {
+      throw new Error('Conflicting variant of fs_user_id.');
+    }
+
+    fsUserId = identifiers.get('FS_USER_ID');
+    mIdentifiers.delete('FS_USER_ID');
+  }
+
+  return mIdentifiers;
+}

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

@@ -770,7 +770,7 @@ describe('javascript-sdk (Browser)', function() {
         sinon.assert.called(fakeEventManager.start);
       });
 
-      it('should send an odp event with sendOdpEvent', async () => {
+      it('should send an odp event when calling sendOdpEvent with valid parameters', async () => {
         const fakeEventManager = {
           updateSettings: sinon.spy(),
           start: sinon.spy(),
@@ -802,6 +802,38 @@ describe('javascript-sdk (Browser)', function() {
         sinon.assert.called(fakeEventManager.sendEvent);
       });
 
+      it('should not send an odp event when calling sendOdpEvent with an empty string as the action', async () => {
+        const fakeEventManager = {
+          updateSettings: sinon.spy(),
+          start: sinon.spy(),
+          stop: sinon.spy(),
+          registerVuid: sinon.spy(),
+          identifyUser: sinon.spy(),
+          sendEvent: sinon.spy(),
+          flush: sinon.spy(),
+        };
+
+        const client = optimizelyFactory.createInstance({
+          datafile: testData.getOdpIntegratedConfigWithSegments(),
+          errorHandler: fakeErrorHandler,
+          eventDispatcher: fakeEventDispatcher,
+          eventBatchSize: null,
+          logger,
+          odpOptions: {
+            eventManager: fakeEventManager,
+          },
+        });
+
+        const readyData = await client.onReady();
+        assert.equal(readyData.success, true);
+        assert.isUndefined(readyData.reason);
+
+        client.sendOdpEvent('');
+
+        sinon.assert.called(logger.error);
+        // sinon.assert.called(fakeEventManager.sendEvent);
+      });
+
       it('should log an error when attempting to send an odp event when odp is disabled', async () => {
         const client = optimizelyFactory.createInstance({
           datafile: testData.getTestProjectConfigWithFeatures(),