From f7bf105051f2d6a1154f10d94ef29e9eb931ca77 Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Mon, 23 Oct 2017 12:29:28 -0400 Subject: [PATCH 1/6] :zap: Release 2.6.4 --- CHANGELOG.md | 29 ++++++++++++++++++++++++++++- package.json | 2 +- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 381ca9ef52..2b97393b40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,34 @@ ## Parse Server Changelog ### master -[Full Changelog](https://github.com/ParsePlatform/parse-server/compare/2.6.3...master) +[Full Changelog](https://github.com/ParsePlatform/parse-server/compare/2.6.4...master) + +### 2.6.4 +[Full Changelog](https://github.com/ParsePlatform/parse-server/compare/2.6.4...2.6.3) + +### Improvements: +* Improves management of configurations and default values, thanks to [Florent Vilmart](https://github.com/flovilmart) +* Adds ability to start ParseServer with `ParseServer.start(options)`, thanks to [Florent Vilmart](https://github.com/flovilmart) +* Adds request original IP to cloud code hooks, thanks to [Gustav Ahlberg](https://github.com/Gyran) +* Corrects some outdated links, thanks to [Benjamin Wilson Friedman](https://github.com/montymxb) +* Adds serverURL validation on startup, thanks to [Benjamin Wilson Friedman](https://github.com/montymxb) + +### Bug Fixes: +* Fixes issue affecting beforeSaves and increments, thanks to [Benjamin Wilson Friedman](https://github.com/montymxb) + +#### Dependency Updates: +* [parse-server-push-adapter@2.0.2](https://www.npmjs.com/package/parse-server-push-adapter) +* [semver@5.4.1](https://www.npmjs.com/package/semver) +* [pg-promise@7.0.3](https://www.npmjs.com/package/pg-promise) +* [mongodb@2.2.33](https://www.npmjs.com/package/mongodb) +* [parse@1.10.1](https://www.npmjs.com/package/mongodb) + +##### Devevelopment Dependencies Updates: +* [babel-preset-env@1.6.1](https://www.npmjs.com/package/babel-preset-env) +* [cross-env@5.1.0](https://www.npmjs.com/package/cross-env) +* [mongodb-runner@3.6.1](https://www.npmjs.com/package/mongodb-runner) +* [eslint-plugin-flowtype@2.39.1](https://www.npmjs.com/package/eslint-plugin-flowtype) +* [eslint@4.9.0](https://www.npmjs.com/package/eslint) ### 2.6.3 [Full Changelog](https://github.com/ParsePlatform/parse-server/compare/2.6.2...2.6.3) diff --git a/package.json b/package.json index 916ccda85a..8c56ada1d9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "parse-server", - "version": "2.6.3", + "version": "2.6.4", "description": "An express module providing a Parse-compatible API server", "main": "lib/index.js", "repository": { From e483a51288eeb570a662d83cdd319b6c95a08e5c Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Mon, 23 Oct 2017 15:36:46 -0400 Subject: [PATCH 2/6] Marks port ENV var as PORT --- src/Options/Definitions.js | 2 +- src/Options/index.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Options/Definitions.js b/src/Options/Definitions.js index 47712be94d..0cb3a2f238 100644 --- a/src/Options/Definitions.js +++ b/src/Options/Definitions.js @@ -265,7 +265,7 @@ module.exports.ParseServerOptions = { "default": 10 }, "port": { - "env": "PARSE_SERVER_PORT", + "env": "PORT", "help": "The port to run the ParseServer. defaults to 1337.", "action": parsers.numberParser("port"), "default": 1337 diff --git a/src/Options/index.js b/src/Options/index.js index 3c088a93cd..261908afe8 100644 --- a/src/Options/index.js +++ b/src/Options/index.js @@ -113,7 +113,8 @@ export interface ParseServerOptions { enableSingleSchemaCache: ?boolean; // = false /* Sets the number of characters in generated object id's, default 10 */ objectIdSize: ?number; // = 10 - /* The port to run the ParseServer. defaults to 1337. */ + /* The port to run the ParseServer. defaults to 1337. + :ENV: PORT */ port: ?number; // = 1337 /* The host to serve ParseServer on. defaults to 0.0.0.0 */ host: ?string; // = 0.0.0.0 From cbde690f6c591b9f48efe0cad4494bd59ae5400f Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Mon, 23 Oct 2017 15:42:14 -0400 Subject: [PATCH 3/6] Fixes broken definitions --- resources/buildConfigDefinitions.js | 5 ++++- src/Options/Definitions.js | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/resources/buildConfigDefinitions.js b/resources/buildConfigDefinitions.js index 0e3ba9378c..ffe5b2e65d 100644 --- a/resources/buildConfigDefinitions.js +++ b/resources/buildConfigDefinitions.js @@ -47,7 +47,10 @@ function getENVPrefix(iface) { return 'PARSE_SERVER_CUSTOM_PAGES_'; } if (iface.id.name === 'LiveQueryServerOptions') { - return 'PARSE_SERVER_LIVE_QUERY_'; + return 'PARSE_LIVE_QUERY_SERVER_'; + } + if (iface.id.name === 'LiveQueryOptions') { + return 'PARSE_SERVER_LIVEQUERY_'; } } diff --git a/src/Options/Definitions.js b/src/Options/Definitions.js index 0cb3a2f238..40a3f4a8ab 100644 --- a/src/Options/Definitions.js +++ b/src/Options/Definitions.js @@ -325,59 +325,59 @@ module.exports.LiveQueryOptions = { "action": parsers.arrayParser }, "redisURL": { - "env": "undefinedREDIS_URL", + "env": "PARSE_SERVER_LIVEQUERY_REDIS_URL", "help": "parse-server's LiveQuery redisURL" }, "pubSubAdapter": { - "env": "undefinedPUB_SUB_ADAPTER", + "env": "PARSE_SERVER_LIVEQUERY_PUB_SUB_ADAPTER", "help": "LiveQuery pubsub adapter", "action": parsers.moduleOrObjectParser } }; module.exports.LiveQueryServerOptions = { "appId": { - "env": "PARSE_SERVER_LIVE_QUERY_APP_ID", + "env": "PARSE_LIVE_QUERY_SERVER_APP_ID", "help": "This string should match the appId in use by your Parse Server. If you deploy the LiveQuery server alongside Parse Server, the LiveQuery server will try to use the same appId." }, "masterKey": { - "env": "PARSE_SERVER_LIVE_QUERY_MASTER_KEY", + "env": "PARSE_LIVE_QUERY_SERVER_MASTER_KEY", "help": "This string should match the masterKey in use by your Parse Server. If you deploy the LiveQuery server alongside Parse Server, the LiveQuery server will try to use the same masterKey." }, "serverURL": { - "env": "PARSE_SERVER_LIVE_QUERY_SERVER_URL", + "env": "PARSE_LIVE_QUERY_SERVER_SERVER_URL", "help": "This string should match the serverURL in use by your Parse Server. If you deploy the LiveQuery server alongside Parse Server, the LiveQuery server will try to use the same serverURL." }, "keyPairs": { - "env": "PARSE_SERVER_LIVE_QUERY_KEY_PAIRS", + "env": "PARSE_LIVE_QUERY_SERVER_KEY_PAIRS", "help": "A JSON object that serves as a whitelist of keys. It is used for validating clients when they try to connect to the LiveQuery server. Check the following Security section and our protocol specification for details.", "action": parsers.objectParser }, "websocketTimeout": { - "env": "PARSE_SERVER_LIVE_QUERY_WEBSOCKET_TIMEOUT", + "env": "PARSE_LIVE_QUERY_SERVER_WEBSOCKET_TIMEOUT", "help": "Number of milliseconds between ping/pong frames. The WebSocket server sends ping/pong frames to the clients to keep the WebSocket alive. This value defines the interval of the ping/pong frame from the server to clients. Defaults to 10 * 1000 ms (10 s).", "action": parsers.numberParser("websocketTimeout") }, "cacheTimeout": { - "env": "PARSE_SERVER_LIVE_QUERY_CACHE_TIMEOUT", + "env": "PARSE_LIVE_QUERY_SERVER_CACHE_TIMEOUT", "help": "Number in milliseconds. When clients provide the sessionToken to the LiveQuery server, the LiveQuery server will try to fetch its ParseUser's objectId from parse server and store it in the cache. The value defines the duration of the cache. Check the following Security section and our protocol specification for details. Defaults to 30 * 24 * 60 * 60 * 1000 ms (~30 days).", "action": parsers.numberParser("cacheTimeout") }, "logLevel": { - "env": "PARSE_SERVER_LIVE_QUERY_LOG_LEVEL", + "env": "PARSE_LIVE_QUERY_SERVER_LOG_LEVEL", "help": "This string defines the log level of the LiveQuery server. We support VERBOSE, INFO, ERROR, NONE. Defaults to INFO." }, "port": { - "env": "PARSE_SERVER_LIVE_QUERY_PORT", + "env": "PARSE_LIVE_QUERY_SERVER_PORT", "help": "The port to run the ParseServer. defaults to 1337.", "action": parsers.numberParser("port"), "default": 1337 }, "redisURL": { - "env": "PARSE_SERVER_LIVE_QUERY_REDIS_URL", + "env": "PARSE_LIVE_QUERY_SERVER_REDIS_URL", "help": "parse-server's LiveQuery redisURL" }, "pubSubAdapter": { - "env": "PARSE_SERVER_LIVE_QUERY_PUB_SUB_ADAPTER", + "env": "PARSE_LIVE_QUERY_SERVER_PUB_SUB_ADAPTER", "help": "LiveQuery pubsub adapter", "action": parsers.moduleOrObjectParser } From ebf9f6336eb447a27c80a595aada02c2661157f8 Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Tue, 24 Oct 2017 15:48:10 -0400 Subject: [PATCH 4/6] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b97393b40..54f106e0ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ * Adds request original IP to cloud code hooks, thanks to [Gustav Ahlberg](https://github.com/Gyran) * Corrects some outdated links, thanks to [Benjamin Wilson Friedman](https://github.com/montymxb) * Adds serverURL validation on startup, thanks to [Benjamin Wilson Friedman](https://github.com/montymxb) +* Adds ability to login with POST requests alongside GET, thanks to [Benjamin Wilson Friedman](https://github.com/montymxb) ### Bug Fixes: * Fixes issue affecting beforeSaves and increments, thanks to [Benjamin Wilson Friedman](https://github.com/montymxb) From 2ec9745194262903c9e482c6b78818bacb09e77a Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Tue, 24 Oct 2017 15:52:47 -0400 Subject: [PATCH 5/6] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54f106e0ef..2e32a11be5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,9 @@ * [pg-promise@7.0.3](https://www.npmjs.com/package/pg-promise) * [mongodb@2.2.33](https://www.npmjs.com/package/mongodb) * [parse@1.10.1](https://www.npmjs.com/package/mongodb) +* [express@4.16.0](https://www.npmjs.com/package/express) +* [mime@1.4.1](https://www.npmjs.com/package/mime) +* [parse-server-simple-mailgun-adapter@1.0.1](https://www.npmjs.com/package/parse-server-simple-mailgun-adapter) ##### Devevelopment Dependencies Updates: * [babel-preset-env@1.6.1](https://www.npmjs.com/package/babel-preset-env) From b21b388ea0bdeb4976ae7ef62e05af04e2e82779 Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Tue, 24 Oct 2017 17:51:35 -0400 Subject: [PATCH 6/6] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e32a11be5..5067fa164a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ * Corrects some outdated links, thanks to [Benjamin Wilson Friedman](https://github.com/montymxb) * Adds serverURL validation on startup, thanks to [Benjamin Wilson Friedman](https://github.com/montymxb) * Adds ability to login with POST requests alongside GET, thanks to [Benjamin Wilson Friedman](https://github.com/montymxb) +* Adds ability to login with email, instead of username, thanks to [Florent Vilmart](https://github.com/flovilmart) ### Bug Fixes: * Fixes issue affecting beforeSaves and increments, thanks to [Benjamin Wilson Friedman](https://github.com/montymxb)