Merge pull request #3 from gutro/fix-incorrect-user

Only update user once we have the flags for that user.

Author: eli-darkly

src/__tests__/LDClient-test.js

@@ -452,6 +452,23 @@ describe('LDClient', () => {
   });
 
   describe('identify', () => {
+    it('does not set user until the flag config has been updated', async () => {
+      function sleep(ms) {
+        return new Promise(resolve => setTimeout(resolve, ms));
+      }
+
+      const user2 = { key: 'user2' };
+      const client = platform.testing.makeClient(envName, user);
+      await client.waitForInitialization();
+      server.autoRespond = false;
+      const identifyPromise = client.identify(user2);
+      await sleep(200); // sleep to jump some async ticks.
+      expect(client.getUser()).toEqual(user);
+      server.respond();
+      await identifyPromise;
+      expect(client.getUser()).toEqual(user2);
+    });
+
     it('updates flag values when the user changes', async () => {
       const flags0 = { 'enable-foo': { value: false } };
       const flags1 = { 'enable-foo': { value: true } };

src/index.js

@@ -191,10 +191,12 @@ export function initialize(env, user, specifiedOptions, platform, extraOptionDef
     return utils.wrapPromiseCallback(
       clearFirst
         .then(() => userValidator.validateUser(user))
-        .then(realUser => ident.setUser(realUser))
-        .then(() => requestor.fetchFlagSettings(ident.getUser(), hash))
-        .then(requestedFlags => {
+        .then(realUser =>
+          requestor.fetchFlagSettings(realUser, hash).then(requestedFlags => ({ requestedFlags, realUser }))
+        )
+        .then(({ requestedFlags, realUser }) => {
           const flagValueMap = utils.transformVersionedValuesToValues(requestedFlags);
+          ident.setUser(realUser);
           if (requestedFlags) {
             return replaceAllFlags(requestedFlags).then(() => flagValueMap);
           } else {