Merge branch 'master' into node-8

Author: vitaly-t

.flowconfig

@@ -7,3 +7,4 @@
 [libs]
 
 [options]
+suppress_comment= \\(.\\|\n\\)*\\@flow-disable-next

CHANGELOG.md

@@ -1,7 +1,39 @@
 ## Parse Server Changelog
 
 ### master
-[Full Changelog](https://github.com/parse-community/parse-server/compare/2.7.0...master)
+[Full Changelog](https://github.com/parse-community/parse-server/compare/2.7.2...master)
+
+### 2.7.2
+[Full Changelog](https://github.com/parse-community/parse-server/compare/2.7.2...2.7.1)
+
+#### Improvements:
+* Improved match aggregate
+* Do not mark the empty pushs as failed 
+* Support pointer in aggregate query
+* Introduces flow types for storage
+* Postgres: Refactoring of Postgres Storage Adapter
+* Postgres: Support for multiple projection in aggregate
+* Postgres: performance optimizations
+* Adds infos about vulnerability disclosures
+* Adds ability to login with email when provided as username
+
+#### Bug Fixes
+* Scrub Passwords with URL Encoded Characters
+* Fixes issue affecting using sorting in beforeFind
+
+#### Dependency Updates:
+* [[email protected]](https://www.npmjs.com/package/commander)
+* [[email protected]](https://www.npmjs.com/package/semver)
+* [[email protected]](https://www.npmjs.com/package/pg-promise)
+* [[email protected]](https://www.npmjs.com/package/ws)
+* [[email protected]](https://www.npmjs.com/package/mime)
+* [[email protected]](https://www.npmjs.com/package/parse)
+
+##### Devevelopment Dependencies Updates:
+* [[email protected]](https://www.npmjs.com/package/nodemon)
+* [[email protected]](https://www.npmjs.com/package/flow-bin)
+* [[email protected]](https://www.npmjs.com/package/jasmine)
+* [[email protected]](https://www.npmjs.com/package/cross-env)
 
 ### 2.7.1
 [Full Changelog](https://github.com/parse-community/parse-server/compare/2.7.1...2.7.0)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "parse-server",
-  "version": "2.7.1",
+  "version": "2.7.2",
   "description": "An express module providing a Parse-compatible API server",
   "main": "lib/index.js",
   "repository": {
@@ -24,25 +24,25 @@
     "@parse/simple-mailgun-adapter": "1.0.1",
     "bcryptjs": "2.4.3",
     "body-parser": "1.18.2",
-    "commander": "2.12.1",
+    "commander": "2.13.0",
     "deepcopy": "0.6.3",
     "express": "4.16.2",
     "intersect": "1.0.1",
     "lodash": "4.17.4",
     "lru-cache": "4.1.1",
-    "mime": "2.1.0",
+    "mime": "2.2.0",
     "mongodb": "3.0.1",
     "multer": "1.3.0",
     "parse": "1.11.0",
-    "pg-promise": "7.3.2",
+    "pg-promise": "7.4.0",
     "redis": "2.8.0",
     "request": "2.83.0",
-    "semver": "5.4.1",
+    "semver": "5.5.0",
     "tv4": "1.3.0",
     "uuid": "^3.1.0",
     "winston": "2.4.0",
     "winston-daily-rotate-file": "1.7.2",
-    "ws": "3.3.3"
+    "ws": "4.0.0"
   },
   "devDependencies": {
     "babel-cli": "6.26.0",
@@ -56,17 +56,18 @@
     "deep-diff": "0.3.8",
     "eslint": "^4.9.0",
     "eslint-plugin-flowtype": "^2.39.1",
+    "flow-bin": "^0.64.0",
     "gaze": "1.1.2",
-    "jasmine": "2.8.0",
+    "jasmine": "2.9.0",
     "jasmine-spec-reporter": "^4.1.0",
     "mongodb-runner": "3.6.1",
-    "nodemon": "1.14.6",
+    "nodemon": "1.14.11",
     "nyc": "^11.0.2",
     "request-promise": "4.2.2"
   },
   "scripts": {
     "dev": "npm run build && node bin/dev",
-    "lint": "eslint --cache ./",
+    "lint": "flow && eslint --cache ./",
     "build": "babel src/ -d lib/ --copy-files",
     "pretest": "npm run lint",
     "test": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=3.2.6} MONGODB_STORAGE_ENGINE=mmapv1 TESTING=1 jasmine",

spec/CloudCode.spec.js

@@ -1472,6 +1472,32 @@ describe('beforeFind hooks', () => {
     });
   });
 
+  it('should handle sorting where', (done) => {
+    Parse.Cloud.beforeFind('MyObject', (req) => {
+      const query = req.query;
+      query.ascending('score');
+      return query;
+    });
+
+    const count = 20;
+    const objects = [];
+    while (objects.length != count) {
+      const object = new Parse.Object('MyObject');
+      object.set('score', Math.floor(Math.random() * 100));
+      objects.push(object);
+    }
+    Parse.Object.saveAll(objects).then(() => {
+      const query = new Parse.Query('MyObject');
+      return query.find();
+    }).then((objects) => {
+      let lastScore = -1;
+      objects.forEach((element) => {
+        expect(element.get('score') >= lastScore).toBe(true);
+        lastScore = element.get('score');
+      });
+    }).then(done).catch(done.fail);
+  });
+
   it('should add beforeFind trigger using get API',(done) => {
     const hook = {
       method: function(req) {

spec/MongoStorageAdapter.spec.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const MongoStorageAdapter = require('../src/Adapters/Storage/Mongo/MongoStorageAdapter');
-const MongoClient = require('mongodb').MongoClient;
+import MongoStorageAdapter from '../src/Adapters/Storage/Mongo/MongoStorageAdapter';
+const { MongoClient } = require('mongodb');
 const databaseURI = 'mongodb://localhost:27017/parseServerMongoAdapterTestDatabase';
 
 // These tests are specific to the mongo storage adapter + mongo storage format

spec/ParsePolygon.spec.js

@@ -1,5 +1,5 @@
 const TestObject = Parse.Object.extend('TestObject');
-const MongoStorageAdapter = require('../src/Adapters/Storage/Mongo/MongoStorageAdapter');
+import MongoStorageAdapter from '../src/Adapters/Storage/Mongo/MongoStorageAdapter';
 const mongoURI = 'mongodb://localhost:27017/parseServerMongoAdapterTestDatabase';
 const rp = require('request-promise');
 const defaultHeaders = {

spec/ParseQuery.Aggregate.spec.js

@@ -14,10 +14,10 @@ const masterKeyOptions = {
 }
 
 const loadTestData = () => {
-  const data1 = {score: 10, name: 'foo', sender: {group: 'A'}, size: ['S', 'M']};
-  const data2 = {score: 10, name: 'foo', sender: {group: 'A'}, size: ['M', 'L']};
-  const data3 = {score: 10, name: 'bar', sender: {group: 'B'}, size: ['S']};
-  const data4 = {score: 20, name: 'dpl', sender: {group: 'B'}, size: ['S']};
+  const data1 = {score: 10, name: 'foo', sender: {group: 'A'}, views: 900, size: ['S', 'M']};
+  const data2 = {score: 10, name: 'foo', sender: {group: 'A'}, views: 800, size: ['M', 'L']};
+  const data3 = {score: 10, name: 'bar', sender: {group: 'B'}, views: 700, size: ['S']};
+  const data4 = {score: 20, name: 'dpl', sender: {group: 'B'}, views: 700, size: ['S']};
   const obj1 = new TestObject(data1);
   const obj2 = new TestObject(data2);
   const obj3 = new TestObject(data3);
@@ -96,6 +96,27 @@ describe('Parse.Query Aggregate testing', () => {
       }).catch(done.fail);
   });
 
+  it('group by pointer', (done) => {
+    const pointer1 = new TestObject();
+    const pointer2 = new TestObject();
+    const obj1 = new TestObject({ pointer: pointer1 });
+    const obj2 = new TestObject({ pointer: pointer2 });
+    const obj3 = new TestObject({ pointer: pointer1 });
+    const pipeline = [
+      { group: { objectId: '$pointer' } }
+    ];
+    Parse.Object.saveAll([pointer1, pointer2, obj1, obj2, obj3]).then(() => {
+      const query = new Parse.Query(TestObject);
+      return query.aggregate(pipeline);
+    }).then((results) => {
+      expect(results.length).toEqual(3);
+      expect(results.some(result => result.objectId === pointer1.id)).toEqual(true);
+      expect(results.some(result => result.objectId === pointer2.id)).toEqual(true);
+      expect(results.some(result => result.objectId === null)).toEqual(true);
+      done();
+    });
+  });
+
   it('group sum query', (done) => {
     const options = Object.assign({}, masterKeyOptions, {
       body: {
@@ -231,7 +252,7 @@ describe('Parse.Query Aggregate testing', () => {
       }).catch(done.fail);
   });
 
-  it('match query', (done) => {
+  it('match comparison query', (done) => {
     const options = Object.assign({}, masterKeyOptions, {
       body: {
         match: { score: { $gt: 15 }},
@@ -245,6 +266,127 @@ describe('Parse.Query Aggregate testing', () => {
       }).catch(done.fail);
   });
 
+  it('match multiple comparison query', (done) => {
+    const options = Object.assign({}, masterKeyOptions, {
+      body: {
+        match: { score: { $gt: 5, $lt: 15 }},
+      }
+    });
+    rp.get(Parse.serverURL + '/aggregate/TestObject', options)
+      .then((resp) => {
+        expect(resp.results.length).toBe(3);
+        expect(resp.results[0].score).toBe(10);
+        expect(resp.results[1].score).toBe(10);
+        expect(resp.results[2].score).toBe(10);
+        done();
+      }).catch(done.fail);
+  });
+
+  it('match complex comparison query', (done) => {
+    const options = Object.assign({}, masterKeyOptions, {
+      body: {
+        match: { score: { $gt: 5, $lt: 15 }, views: { $gt: 850, $lt: 1000 }},
+      }
+    });
+    rp.get(Parse.serverURL + '/aggregate/TestObject', options)
+      .then((resp) => {
+        expect(resp.results.length).toBe(1);
+        expect(resp.results[0].score).toBe(10);
+        expect(resp.results[0].views).toBe(900);
+        done();
+      }).catch(done.fail);
+  });
+
+  it('match comparison and equality query', (done) => {
+    const options = Object.assign({}, masterKeyOptions, {
+      body: {
+        match: { score: { $gt: 5, $lt: 15 }, views: 900},
+      }
+    });
+    rp.get(Parse.serverURL + '/aggregate/TestObject', options)
+      .then((resp) => {
+        expect(resp.results.length).toBe(1);
+        expect(resp.results[0].score).toBe(10);
+        expect(resp.results[0].views).toBe(900);
+        done();
+      }).catch(done.fail);
+  });
+
+  it('match $or query', (done) => {
+    const options = Object.assign({}, masterKeyOptions, {
+      body: {
+        match: { $or: [{ score: { $gt: 15, $lt: 25 } }, { views: { $gt: 750, $lt: 850 } }]},
+      }
+    });
+    rp.get(Parse.serverURL + '/aggregate/TestObject', options)
+      .then((resp) => {
+        expect(resp.results.length).toBe(2);
+        // Match score { $gt: 15, $lt: 25 }
+        expect(resp.results.some(result => result.score === 20)).toEqual(true);
+        expect(resp.results.some(result => result.views === 700)).toEqual(true);
+
+        // Match view { $gt: 750, $lt: 850 }
+        expect(resp.results.some(result => result.score === 10)).toEqual(true);
+        expect(resp.results.some(result => result.views === 800)).toEqual(true);
+        done();
+      }).catch(done.fail);
+  });
+
+  it('match objectId query', (done) => {
+    const obj1 = new TestObject();
+    const obj2 = new TestObject();
+    Parse.Object.saveAll([obj1, obj2]).then(() => {
+      const pipeline = [
+        { match: { objectId: obj1.id } }
+      ];
+      const query = new Parse.Query(TestObject);
+      return query.aggregate(pipeline);
+    }).then((results) => {
+      expect(results.length).toEqual(1);
+      expect(results[0].objectId).toEqual(obj1.id);
+      done();
+    });
+  });
+
+  it('match field query', (done) => {
+    const obj1 = new TestObject({ name: 'TestObject1'});
+    const obj2 = new TestObject({ name: 'TestObject2'});
+    Parse.Object.saveAll([obj1, obj2]).then(() => {
+      const pipeline = [
+        { match: { name: 'TestObject1' } }
+      ];
+      const query = new Parse.Query(TestObject);
+      return query.aggregate(pipeline);
+    }).then((results) => {
+      expect(results.length).toEqual(1);
+      expect(results[0].objectId).toEqual(obj1.id);
+      done();
+    });
+  });
+
+  it('match pointer query', (done) => {
+    const pointer1 = new TestObject();
+    const pointer2 = new TestObject();
+    const obj1 = new TestObject({ pointer: pointer1 });
+    const obj2 = new TestObject({ pointer: pointer2 });
+    const obj3 = new TestObject({ pointer: pointer1 });
+
+    Parse.Object.saveAll([pointer1, pointer2, obj1, obj2, obj3]).then(() => {
+      const pipeline = [
+        { match: { pointer: pointer1.id } }
+      ];
+      const query = new Parse.Query(TestObject);
+      return query.aggregate(pipeline);
+    }).then((results) => {
+      expect(results.length).toEqual(2);
+      expect(results[0].pointer.objectId).toEqual(pointer1.id);
+      expect(results[1].pointer.objectId).toEqual(pointer1.id);
+      expect(results.some(result => result.objectId === obj1.id)).toEqual(true);
+      expect(results.some(result => result.objectId === obj3.id)).toEqual(true);
+      done();
+    });
+  });
+
   it('project query', (done) => {
     const options = Object.assign({}, masterKeyOptions, {
       body: {

spec/ParseQuery.FullTextSearch.spec.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const MongoStorageAdapter = require('../src/Adapters/Storage/Mongo/MongoStorageAdapter');
+import MongoStorageAdapter from '../src/Adapters/Storage/Mongo/MongoStorageAdapter';
 const mongoURI = 'mongodb://localhost:27017/parseServerMongoAdapterTestDatabase';
-const PostgresStorageAdapter = require('../src/Adapters/Storage/Postgres/PostgresStorageAdapter');
+import PostgresStorageAdapter from '../src/Adapters/Storage/Postgres/PostgresStorageAdapter';
 const postgresURI = 'postgres://localhost:5432/parse_server_postgres_adapter_test_database';
 const Parse = require('parse/node');
 const rp = require('request-promise');

spec/ParseServer.spec.js

@@ -1,7 +1,8 @@
 'use strict';
 /* Tests for ParseServer.js */
 const express = require('express');
-
+import MongoStorageAdapter from '../src/Adapters/Storage/Mongo/MongoStorageAdapter';
+import PostgresStorageAdapter from '../src/Adapters/Storage/Postgres/PostgresStorageAdapter';
 import ParseServer from '../src/ParseServer';
 
 describe('Server Url Checks', () => {
@@ -35,8 +36,6 @@ describe('Server Url Checks', () => {
   });
 
   it('handleShutdown, close connection', (done) => {
-    var MongoStorageAdapter = require('../src/Adapters/Storage/Mongo/MongoStorageAdapter');
-    const PostgresStorageAdapter = require('../src/Adapters/Storage/Postgres/PostgresStorageAdapter');
     const mongoURI = 'mongodb://localhost:27017/parseServerMongoAdapterTestDatabase';
     const postgresURI = 'postgres://localhost:5432/parse_server_postgres_adapter_test_database';
     let databaseAdapter;

spec/PostgresInitOptions.spec.js

@@ -1,5 +1,5 @@
 const Parse = require('parse/node').Parse;
-const PostgresStorageAdapter = require('../src/Adapters/Storage/Postgres/PostgresStorageAdapter');
+import PostgresStorageAdapter from '../src/Adapters/Storage/Postgres/PostgresStorageAdapter';
 const postgresURI = 'postgres://localhost:5432/parse_server_postgres_adapter_test_database';
 const ParseServer = require("../src/index");
 const express = require('express');