Merge branch 'master' into peterjs.liveQueryAsync

Author: peterdotjs

gulpfile.js

@@ -57,7 +57,7 @@ gulp.task('compile', function() {
 
 gulp.task('browserify', function() {
   var stream = browserify({
-    builtins: { _process: true },
+    builtins: ['_process', 'events'],
     entries: 'lib/browser/Parse.js',
     standalone: 'Parse'
   })

integration/test/ParseUserTest.js

@@ -289,6 +289,24 @@ describe('Parse User', () => {
     });
   });
 
+  it('preserves the session token when querying the current user', (done) => {
+    let user = new Parse.User();
+    user.set('password', 'asdf');
+    user.set('email', '[email protected]');
+    user.set('username', 'zxcv');
+    user.signUp().then(() => {
+      assert(user.has('sessionToken'));
+      let query = new Parse.Query(Parse.User);
+      return query.get(user.id);
+    }).then((u) => {
+      // Old object maintains token
+      assert(user.has('sessionToken'));
+      // New object doesn't have token
+      assert(!u.has('sessionToken'));
+      done();
+    });
+  });
+
   it('does not log in a user when saving', (done) => {
     Parse.User.enableUnsafeCurrentUser();
     let user = new Parse.User();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "parse",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "The Parse JavaScript SDK",
   "homepage": "https://www.parse.com",
   "keywords": [

src/EventEmitter.js

@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) 2015-present, Parse, LLC.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * This is a simple wrapper to unify EventEmitter implementations across platforms.
+ */
+
+if (process.env.PARSE_BUILD === 'react-native') {
+  module.exports = require('EventEmitter');
+} else {
+  module.exports = require('events').EventEmitter;
+}

src/LiveQueryClient.js

@@ -8,7 +8,7 @@
  *
  */
 
-import events from 'events';
+import EventEmitter from './EventEmitter';
 import ParsePromise from './ParsePromise';
 import ParseObject from './ParseObject';
 import LiveQuerySubscription from './LiveQuerySubscription';
@@ -122,7 +122,7 @@ let generateInterval = (k) => {
  * 
  * 
  */
-export default class LiveQueryClient extends events.EventEmitter {
+export default class LiveQueryClient extends EventEmitter {
   attempts: number;
   id: number;
   requestId: number;
@@ -321,15 +321,13 @@ export default class LiveQueryClient extends events.EventEmitter {
   }
 
   _getWebSocketImplementation(): any {
-    let WebSocketImplementation;
     if (process.env.PARSE_BUILD === 'node') {
-      WebSocketImplementation = require('ws');
+      return require('ws');
     } else if (process.env.PARSE_BUILD === 'browser') {
-      if (window.WebSocket) {
-        WebSocketImplementation = WebSocket;
-      }
+      return typeof WebSocket === 'function' ? WebSocket : null;
+    } else if (process.env.PARSE_BUILD === 'react-native') {
+      return WebSocket;
     }
-    return WebSocketImplementation;
   }
 
   // ensure we start with valid state if connect is called again after close

src/LiveQuerySubscription.js

@@ -8,7 +8,7 @@
  *
  */
 
-import events from 'events';
+import EventEmitter from './EventEmitter';
 import CoreManager from './CoreManager';
 
 /**
@@ -90,7 +90,7 @@ import CoreManager from './CoreManager';
  *
  * 
  */
-export default class Subscription extends events.EventEmitter {
+export default class Subscription extends EventEmitter {
   constructor(id, query, sessionToken) {
     super();
     this.id = id;

src/ParseLiveQuery.js

@@ -1,4 +1,4 @@
-import events from 'events';
+import EventEmitter from './EventEmitter';
 import LiveQueryClient from './LiveQueryClient';
 import CoreManager from './CoreManager';
 import ParsePromise from './ParsePromise';
@@ -42,7 +42,7 @@ function close() {
  * @static
  * 
  */
-let LiveQuery = new events.EventEmitter();
+let LiveQuery = new EventEmitter();
 
 /**
  * After open is called, the LiveQuery will try to send a connect request

src/ParseObject.js

@@ -1361,7 +1361,14 @@ export default class ParseObject {
       if (otherAttributes.objectId) {
         o.id = otherAttributes.objectId;
       }
+      let preserved = null;
+      if (typeof o._preserveFieldsOnFetch === 'function') {
+        preserved = o._preserveFieldsOnFetch();
+      }
       o._clearServerData();
+      if (preserved) {
+        o._finishFetch(preserved);
+      }
     }
     o._finishFetch(otherAttributes);
     if (json.objectId) {

src/ParseUser.js

@@ -249,6 +249,16 @@ export default class ParseUser extends ParseObject {
     }
   }
 
+  /**
+   * Class instance method used to maintain specific keys when a fetch occurs.
+   * Used to ensure that the session token is not lost.
+   */
+  _preserveFieldsOnFetch(): AttributeMap {
+    return {
+      sessionToken: this.get('sessionToken'),
+    };
+  }
+
   /**
    * Returns true if <code>current</code> would return this user.
    * @method isCurrent

src/__tests__/LiveQueryClient-test.js

@@ -15,6 +15,7 @@ jest.dontMock('../decode');
 jest.dontMock('../encode');
 jest.dontMock('../equals');
 jest.dontMock('../escape');
+jest.dontMock('../EventEmitter');
 jest.dontMock('../ObjectStateMutations');
 jest.dontMock('../parseDate');
 jest.dontMock('../ParseError');