Merge branch 'master' into ag/ch22054/readme-polyfills

Author: eli-darkly

package.json

@@ -56,6 +56,7 @@
     "jest": "22.4.3",
     "jest-junit": "3.6.0",
     "jest-localstorage-mock": "2.2.0",
+    "jsdom": "11.11.0",
     "prettier": "1.11.1",
     "readline-sync": "1.4.9",
     "rimraf": "2.6.2",

src/__tests__/LDClient-test.js

@@ -896,6 +896,34 @@ describe('LDClient', () => {
       });
     });
 
+    it('updates flag values when the user changes', done => {
+      const user2 = { key: 'user2' };
+      const client = LDClient.initialize(envName, user, { bootstrap: {} });
+
+      client.on('ready', () => {
+        client.identify(user2, null, () => {
+          expect(client.variation('enable-foo')).toEqual(true);
+          done();
+        });
+
+        getLastRequest().respond(200, { 'Content-Type': 'application/json' }, '{"enable-foo": {"value": true}}');
+      });
+    });
+
+    it('yields map of flag values as the result of identify()', done => {
+      const user2 = { key: 'user2' };
+      const client = LDClient.initialize(envName, user, { bootstrap: {} });
+
+      client.on('ready', () => {
+        client.identify(user2, null).then(flagMap => {
+          expect(flagMap).toEqual({ 'enable-foo': true });
+          done();
+        });
+
+        getLastRequest().respond(200, { 'Content-Type': 'application/json' }, '{"enable-foo": {"value": true}}');
+      });
+    });
+
     it('reconnects to stream if the user changes', done => {
       const user2 = { key: 'user2' };
       const encodedUser2 = 'eyJrZXkiOiJ1c2VyMiJ9';
@@ -911,7 +939,7 @@ describe('LDClient', () => {
           done();
         });
 
-        getLastRequest().respond(200, { 'Content-Type': 'application/json' }, '{"enable-foo": true}');
+        getLastRequest().respond(200, { 'Content-Type': 'application/json' }, '{"enable-foo": {"value": true}}');
       });
     });
 

src/index.d.ts

@@ -220,7 +220,7 @@ declare module 'ldclient-js' {
      * @param onDone
      *   A callback to invoke after the user is identified.
      */
-    identify: (user: LDUser, hash?: string, onDone?: () => void) => Promise<void>;
+    identify: (user: LDUser, hash?: string, onDone?: (err: Error | null, flags: LDFlagSet | null) => void) => Promise<void>;
 
     /**
      * Flushes pending events asynchronously.

src/index.js

@@ -140,7 +140,7 @@ export function initialize(env, user, options = {}) {
             if (settings) {
               updateSettings(settings);
             }
-            resolve(settings);
+            resolve(utils.transformVersionedValuesToValues(settings));
             if (subscribedToChangeEvents) {
               connectStream();
             }

src/utils.js

@@ -76,6 +76,19 @@ export function transformValuesToVersionedValues(flags) {
   return ret;
 }
 
+/**
+ * Converts the internal flag state map to a simple map of flag keys to values.
+ */
+export function transformVersionedValuesToValues(flagsState) {
+  const ret = {};
+  for (const key in flagsState) {
+    if (flagsState.hasOwnProperty(key)) {
+      ret[key] = flagsState[key].value;
+    }
+  }
+  return ret;
+}
+
 /**
  * Returns an array of event groups each of which can be safely URL-encoded
  * without hitting the safe maximum URL length of certain browsers.