Increase RESTController coverage, fix error handling for incomplete server response

Author: andrewimm

src/RESTController.js

@@ -97,9 +97,11 @@ var RESTController = {
           try {
             response = JSON.parse(xhr.responseText);
           } catch (e) {
-            promise.reject(e);
+            promise.reject(e.toString());
+          }
+          if (response) {
+            promise.resolve(response, xhr.status, xhr);
           }
-          promise.resolve(response, xhr.status, xhr);
         } else if (xhr.status >= 500 || xhr.status === 0) { // retry on 5XX or node-xmlhttprequest error
           if (++attempts < CoreManager.get('REQUEST_ATTEMPT_LIMIT')) {
             // Exponentially-growing random delay

src/__tests__/RESTController-test.js

@@ -162,4 +162,170 @@ describe('RESTController', () => {
         done();
       });
   }));
+
+  it('handles invalid responses', asyncHelper((done) => {
+    var XHR = function() { };
+    XHR.prototype = {
+      open: function() { },
+      setRequestHeader: function() { },
+      send: function() {
+        this.status = 200;
+        this.responseText = '{';
+        this.readyState = 4;
+        this.onreadystatechange();
+      }
+    };
+    RESTController._setXHR(XHR);
+    RESTController.request('GET', 'classes/MyObject', {}, {})
+      .then(null, (error) => {
+        expect(error.code).toBe(100);
+        expect(error.message).toBe('XMLHttpRequest failed: "SyntaxError: Unexpected end of input"');
+        done();
+      });
+  }));
+
+  it('handles invalid errors', asyncHelper((done) => {
+    var XHR = function() { };
+    XHR.prototype = {
+      open: function() { },
+      setRequestHeader: function() { },
+      send: function() {
+        this.status = 400;
+        this.responseText = '{';
+        this.readyState = 4;
+        this.onreadystatechange();
+      }
+    };
+    RESTController._setXHR(XHR);
+    RESTController.request('GET', 'classes/MyObject', {}, {})
+      .then(null, (error) => {
+        expect(error.code).toBe(107);
+        expect(error.message).toBe('Received an error with invalid JSON from Parse: {');
+        done();
+      });
+  }));
+
+  it('attaches the session token of the current user', () => {
+    CoreManager.setUserController({
+      currentUserAsync() {
+        return ParsePromise.as({ getSessionToken: () => '5678' });
+      },
+      setCurrentUser() {},
+      currentUser() {},
+      signUp() {},
+      logIn() {},
+      become() {},
+      logOut() {},
+      requestPasswordReset() {},
+      upgradeToRevocableSession() {},
+      linkWith() {},
+    });
+
+    var xhr = {
+      setRequestHeader: jest.genMockFn(),
+      open: jest.genMockFn(),
+      send: jest.genMockFn()
+    };
+    RESTController._setXHR(function() { return xhr; });
+    RESTController.request('GET', 'classes/MyObject', {}, {});
+    jest.runAllTicks();
+    expect(JSON.parse(xhr.send.mock.calls[0][0])).toEqual({
+      _method: 'GET',
+      _ApplicationId: 'A',
+      _JavaScriptKey: 'B',
+      _ClientVersion: 'V',
+      _InstallationId: 'iid',
+      _SessionToken: '5678',
+    });
+    CoreManager.set('UserController', undefined); // Clean up
+  });
+
+  it('attaches no session token when there is no current user', () => {
+    CoreManager.setUserController({
+      currentUserAsync() {
+        return ParsePromise.as(null);
+      },
+      setCurrentUser() {},
+      currentUser() {},
+      signUp() {},
+      logIn() {},
+      become() {},
+      logOut() {},
+      requestPasswordReset() {},
+      upgradeToRevocableSession() {},
+      linkWith() {},
+    });
+
+    var xhr = {
+      setRequestHeader: jest.genMockFn(),
+      open: jest.genMockFn(),
+      send: jest.genMockFn()
+    };
+    RESTController._setXHR(function() { return xhr; });
+    RESTController.request('GET', 'classes/MyObject', {}, {});
+    jest.runAllTicks();
+    expect(JSON.parse(xhr.send.mock.calls[0][0])).toEqual({
+      _method: 'GET',
+      _ApplicationId: 'A',
+      _JavaScriptKey: 'B',
+      _ClientVersion: 'V',
+      _InstallationId: 'iid',
+    });
+    CoreManager.set('UserController', undefined); // Clean up
+  });
+
+  it('sends the revocable session upgrade header when the config flag is set', () => {
+    CoreManager.set('FORCE_REVOCABLE_SESSION', true);
+    var xhr = {
+      setRequestHeader: jest.genMockFn(),
+      open: jest.genMockFn(),
+      send: jest.genMockFn()
+    };
+    RESTController._setXHR(function() { return xhr; });
+    RESTController.request('GET', 'classes/MyObject', {}, {});
+    jest.runAllTicks();
+    expect(JSON.parse(xhr.send.mock.calls[0][0])).toEqual({
+      _method: 'GET',
+      _ApplicationId: 'A',
+      _JavaScriptKey: 'B',
+      _ClientVersion: 'V',
+      _InstallationId: 'iid',
+      _RevocableSession: '1'
+    });
+    CoreManager.set('FORCE_REVOCABLE_SESSION', false); // Clean up
+  });
+
+  it('sends the master key when requested', () => {
+    CoreManager.set('MASTER_KEY', 'M');
+    var xhr = {
+      setRequestHeader: jest.genMockFn(),
+      open: jest.genMockFn(),
+      send: jest.genMockFn()
+    };
+    RESTController._setXHR(function() { return xhr; });
+    RESTController.request('GET', 'classes/MyObject', {}, { useMasterKey: true });
+    jest.runAllTicks();
+    expect(JSON.parse(xhr.send.mock.calls[0][0])).toEqual({
+      _method: 'GET',
+      _ApplicationId: 'A',
+      _MasterKey: 'M',
+      _ClientVersion: 'V',
+      _InstallationId: 'iid',
+    });
+  });
+
+  it('throws when attempted to use an unprovided master key', () => {
+    CoreManager.set('MASTER_KEY', undefined);
+    var xhr = {
+      setRequestHeader: jest.genMockFn(),
+      open: jest.genMockFn(),
+      send: jest.genMockFn()
+    };
+    RESTController._setXHR(function() { return xhr; });
+    expect(function() {
+      RESTController.request('GET', 'classes/MyObject', {}, { useMasterKey: true });
+    }).toThrow(
+      'Cannot use the Master Key, it has not been provided.'
+    );
+  });
 });