From 3bb9e0e65e57f99dbf4bb5fa769cbb355e43f8c7 Mon Sep 17 00:00:00 2001 From: Florent Vilmart Date: Wed, 25 Oct 2017 09:45:52 -0400 Subject: [PATCH] :zap: Release 2.6.4 (#4287) * :zap: Release 2.6.4 * Marks port ENV var as PORT * Fixes broken definitions * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md --- CHANGELOG.md | 34 ++++++++++++++++++++++++++++- package.json | 2 +- resources/buildConfigDefinitions.js | 5 ++++- src/Options/Definitions.js | 26 +++++++++++----------- src/Options/index.js | 3 ++- 5 files changed, 53 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 381ca9ef..5067fa16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,39 @@ ## 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) +* 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) + +#### 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) +* [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) +* [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 77d31348..c049d8cc 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": { diff --git a/resources/buildConfigDefinitions.js b/resources/buildConfigDefinitions.js index 0e3ba937..ffe5b2e6 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 47712be9..40a3f4a8 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 @@ -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 } diff --git a/src/Options/index.js b/src/Options/index.js index 3c088a93..261908af 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