Merge branch 'master' into push-scaling

Author: flovilmart

.eslintignore

@@ -0,0 +1,2 @@
+lib/*
+coverage/*

.eslintrc.json

@@ -0,0 +1,22 @@
+{
+    "root": true,
+    "extends": "eslint:recommended",
+    "env": {
+        "node": true,
+        "es6": true
+    },
+    "parser": "babel-eslint",
+    "plugins": [
+        "flowtype"
+    ],
+    "parserOptions": {
+        "ecmaVersion": 6,
+        "sourceType": "module"
+    },
+    "rules": {
+        "indent": ["error", 2],
+        "linebreak-style": ["error", "unix"],
+        "no-trailing-spaces": 2,
+        "eol-last": 2
+    }
+}

.gitignore

@@ -44,6 +44,7 @@ lib/
 
 # cache folder
 .cache
+.eslintcache
 
 # Mac DS_Store files
 .DS_Store

.travis.yml

@@ -15,6 +15,7 @@ before_script:
   - psql -c 'create database parse_server_postgres_adapter_test_database;' -U postgres
   - psql -c 'CREATE EXTENSION postgis;' -U postgres -d parse_server_postgres_adapter_test_database
   - psql -c 'CREATE EXTENSION postgis_topology;' -U postgres -d parse_server_postgres_adapter_test_database
+  - npm run lint
 env:
   global:
   - COVERAGE_OPTION='./node_modules/.bin/istanbul cover'

CHANGELOG.md

@@ -1,17 +1,31 @@
 ## Parse Server Changelog
 
-### 2.2.25-beta.1
+### 2.2.25
 
 Postgres support requires v9.5
 
 #### New Features
+* Dockerizing Parse Server, thanks to [Kirill Kravinsky](https://github.com/woyorus)
+* Login with qq, wechat, weibo, thanks to [haifeizhang]()
+* Password policy, validation and expiration, thanks to [Bhaskar Reddy Yasa](https://github.com/bhaskaryasa)
 * Health check on /health, thanks to [Kirill Kravinsky](https://github.com/woyorus)
 * Reuse SchemaCache across requests option, thanks to [Steven Shipton](https://github.com/steven-supersolid)
 
 #### Improvements
+* Better support for CLI options, thanks to [Steven Shipton](https://github.com/steven-supersolid)
+* Specity a database timeout with maxTimeMS, thanks to [Tyler Brock](https://github.com/TylerBrock)
+* Adds the username to reset password success pages, thanks to [Halim Qarroum](https://github.com/HQarroum)
 * Better support for Redis cache adapter, thanks to [Tyler Brock](https://github.com/TylerBrock)
 * Better coverage of Postgres, thanks to [Kulshekhar Kabra](https://github.com/kulshekhar)
 
+#### Bug Fixes
+* Fixes issue when sending push to multiple installations, thanks to [Florent Vilmart](https://github.com/flovilmart)
+* Fixes issues with twitter authentication, thanks to [jonas-db](https://github.com/jonas-db)
+* Ignore createdAt fields update, thanks to [Yuki Takeichi](https://github.com/yuki-takeichi)
+* Improve support for array equality with LiveQuery, thanks to [David Poetzsch-Heffter](https://github.com/dpoetzsch)
+* Improve support for batch endpoint when serverURL and publicServerURL have different paths, thanks to [Florent Vilmart](https://github.com/flovilmart)
+* Support saving relation objects, thanks to [Yuki Takeichi](https://github.com/yuki-takeichi)
+
 ### 2.2.24
 
 #### New Features

CONTRIBUTING.md

@@ -9,6 +9,7 @@ We really want Parse to be yours, to see it grow and thrive in the open source c
 * Take testing seriously! Aim to increase the test coverage with every pull request.
 * Run the tests for the file you are working on with `npm test spec/MyFile.spec.js`
 * Run the tests for the whole project and look at the coverage report to make sure your tests are exhaustive by running `npm test` and looking at (project-root)/lcov-report/parse-server/FileUnderTest.js.html
+* Lint your code by running `npm run lint` to make sure all your code is not gonna be rejected by the CI.
 
 ##### Code of Conduct
 

README.md

@@ -287,6 +287,8 @@ var server = ParseServer({
     // 2. a callback function to be invoked to validate the password  
     validatorCallback: (password) => { return validatePassword(password) }, 
     doNotAllowUsername: true, // optional setting to disallow username in passwords
+    maxPasswordAge: 90, // optional setting in days for password expiry. Login fails if user does not reset the password within this period after signup/last reset. 
+    maxPasswordHistory: 5, // optional setting to prevent reuse of previous n passwords. Maximum value that can be specified is 20. Not specifying it or specifying 0 will not enforce history.
     //optional setting to set a validity duration for password reset links (in seconds)
     resetTokenValidityDuration: 24*60*60, // expire after 24 hours
   }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "parse-server",
-  "version": "2.2.25-beta.1",
+  "version": "2.2.25",
   "description": "An express module providing a Parse-compatible API server",
   "main": "lib/index.js",
   "repository": {
@@ -25,7 +25,7 @@
     "express": "4.14.0",
     "intersect": "1.0.1",
     "lodash": "4.17.2",
-    "lru-cache": "4.0.1",
+    "lru-cache": "4.0.2",
     "mime": "1.3.4",
     "mongodb": "2.2.10",
     "multer": "1.2.0",
@@ -34,18 +34,19 @@
     "parse-server-push-adapter": "1.1.0",
     "parse-server-s3-adapter": "1.0.5",
     "parse-server-simple-mailgun-adapter": "1.0.0",
-    "pg-promise": "5.3.5",
+    "pg-promise": "5.4.5",
     "redis": "2.6.3",
     "request": "2.79.0",
     "semver": "5.2.0",
     "tv4": "1.2.7",
     "winston": "2.3.0",
-    "winston-daily-rotate-file": "1.3.1",
+    "winston-daily-rotate-file": "1.4.0",
     "ws": "1.1.1"
   },
   "devDependencies": {
     "babel-cli": "6.18.0",
     "babel-core": "6.18.2",
+    "babel-eslint": "^7.1.1",
     "babel-plugin-syntax-flow": "6.13.0",
     "babel-plugin-transform-flow-strip-types": "6.18.0",
     "babel-preset-es2015": "6.14.0",
@@ -54,6 +55,8 @@
     "bcrypt-nodejs": "0.0.3",
     "cross-env": "3.1.3",
     "deep-diff": "0.3.4",
+    "eslint": "^3.10.2",
+    "eslint-plugin-flowtype": "^2.25.0",
     "gaze": "1.1.1",
     "istanbul": "1.0.0-alpha.1",
     "jasmine": "2.5.2",
@@ -64,11 +67,13 @@
   },
   "scripts": {
     "dev": "npm run build && node bin/dev",
+    "lint": "eslint --cache ./",
     "build": "babel src/ -d lib/",
-    "test": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=3.2.6} MONGODB_STORAGE_ENGINE=mmapv1 NODE_ENV=test TESTING=1 node $COVERAGE_OPTION ./spec/support/runner.js",
-    "test:win": "npm run pretest && cross-env NODE_ENV=test TESTING=1 node ./node_modules/jasmine/bin/jasmine.js && npm run posttest",
+    "pretest": "npm run lint",
+    "test": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=3.2.6} MONGODB_STORAGE_ENGINE=mmapv1 NODE_ENV=test TESTING=1 $COVERAGE_OPTION jasmine",
+    "test:win": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=3.2.6} MONGODB_STORAGE_ENGINE=mmapv1 NODE_ENV=test TESTING=1 jasmine",
     "coverage": "cross-env COVERAGE_OPTION='./node_modules/.bin/istanbul cover' npm test",
-    "coverage:win": "npm run pretest && cross-env NODE_ENV=test TESTING=1 node ./node_modules/babel-istanbul/lib/cli.js cover ./node_modules/jasmine/bin/jasmine.js && npm run posttest",
+    "coverage:win": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=3.2.6} MONGODB_STORAGE_ENGINE=mmapv1 NODE_ENV=test TESTING=1 node ./node_modules/istanbul/lib/cli.js cover ./node_modules/jasmine/bin/jasmine.js",
     "start": "node ./bin/parse-server",
     "prepublish": "npm run build"
   },

spec/.eslintrc.json

@@ -0,0 +1,35 @@
+{
+    "extends": "eslint:recommended",
+    "env": {
+        "node": true,
+        "es6": true,
+        "jasmine": true
+    },
+    "globals": {
+      "Parse": true,
+      "reconfigureServer": true,
+      "createTestUser": true,
+      "jfail": true,
+      "ok": true,
+      "strictEqual": true,
+      "TestObject": true,
+      "Item": true,
+      "Container": true,
+      "equal": true,
+      "notEqual": true,
+      "it_exclude_dbs": true,
+      "describe_only_db": true,
+      "on_db": true,
+      "defaultConfiguration": true,
+      "expectSuccess": true,
+      "range": true,
+      "expectError": true,
+      "jequal": true,
+      "create": true,
+      "arrayContains": true
+    },
+    "rules": {
+      "no-console": [0],
+      "indent": ["error", 2]
+    }
+}

spec/AccountLockoutPolicy.spec.js

@@ -5,7 +5,7 @@ const Config = require("../src/Config");
 var loginWithWrongCredentialsShouldFail = function(username, password) {
   return new Promise((resolve, reject) => {
     Parse.User.logIn(username, password)
-    .then(user => reject('login should have failed'))
+    .then(() => reject('login should have failed'))
     .catch(err => {
       if (err.message === 'Invalid username/password.') {
         resolve();
@@ -20,7 +20,7 @@ var isAccountLockoutError = function(username, password, duration, waitTime) {
   return new Promise((resolve, reject) => {
     setTimeout(() => {
       Parse.User.logIn(username, password)
-      .then(user => reject('login should have failed'))
+      .then(() => reject('login should have failed'))
       .catch(err => {
         if (err.message === 'Your account is locked due to multiple failed login attempts. Please try again after ' + duration + ' minute(s)') {
           resolve();
@@ -45,7 +45,7 @@ describe("Account Lockout Policy: ", () => {
       user.setPassword('password');
       return user.signUp(null);
     })
-    .then(user => {
+    .then(() => {
       return loginWithWrongCredentialsShouldFail('username1', 'incorrect password 1');
     })
     .then(() => {
@@ -71,7 +71,7 @@ describe("Account Lockout Policy: ", () => {
       publicServerURL: "https://my.public.server.com/1"
     })
     .then(() => {
-      var config = new Config('test');
+      new Config('test');
       fail('set duration to an invalid number test failed');
       done();
     })
@@ -95,7 +95,7 @@ describe("Account Lockout Policy: ", () => {
       publicServerURL: "https://my.public.server.com/1"
     })
     .then(() => {
-      var config = new Config('test');
+      new Config('test');
       fail('set threshold to an invalid number test failed');
       done();
     })
@@ -119,7 +119,7 @@ describe("Account Lockout Policy: ", () => {
       publicServerURL: "https://my.public.server.com/1"
     })
     .then(() => {
-      var config = new Config('test');
+      new Config('test');
       fail('threshold value < 1 is invalid test failed');
       done();
     })
@@ -143,7 +143,7 @@ describe("Account Lockout Policy: ", () => {
       publicServerURL: "https://my.public.server.com/1"
     })
     .then(() => {
-      var config = new Config('test');
+      new Config('test');
       fail('threshold value > 999 is invalid test failed');
       done();
     })
@@ -167,7 +167,7 @@ describe("Account Lockout Policy: ", () => {
       publicServerURL: "https://my.public.server.com/1"
     })
     .then(() => {
-      var config = new Config('test');
+      new Config('test');
       fail('duration value < 1 is invalid test failed');
       done();
     })
@@ -191,7 +191,7 @@ describe("Account Lockout Policy: ", () => {
       publicServerURL: "https://my.public.server.com/1"
     })
     .then(() => {
-      var config = new Config('test');
+      new Config('test');
       fail('duration value > 99999 is invalid test failed');
       done();
     })
@@ -230,7 +230,7 @@ describe("Account Lockout Policy: ", () => {
       return isAccountLockoutError('username2', 'wrong password', 1, 1);
     })
     .then(() => {
-        done();
+      done();
     })
     .catch(err => {
       fail('lock account after failed login attempts test failed: ' + JSON.stringify(err));
@@ -301,7 +301,7 @@ describe("Account Lockout Policy: ", () => {
       return new Promise((resolve, reject) => {
         setTimeout(() => {
           Parse.User.logIn('username4', 'correct password')
-          .then(user => resolve())
+          .then(() => resolve())
           .catch(err => reject(err));
         }, 3001);
       });