From 034ea5c82831759edaaec66b6e0e48ee1828115e Mon Sep 17 00:00:00 2001
From: Manuel <5673677+mtrezza@users.noreply.github.com>
Date: Thu, 14 Jan 2021 21:04:13 +0100
Subject: [PATCH 1/8] add api mail adapter to mail adapter list (#7126)

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index c3720c4138..7a5a707575 100644
--- a/README.md
+++ b/README.md
@@ -337,6 +337,7 @@ You can also use other email adapters contributed by the community such as:
 - [parse-server-mailjet-adapter](https://www.npmjs.com/package/parse-server-mailjet-adapter)
 - [simple-parse-smtp-adapter](https://www.npmjs.com/package/simple-parse-smtp-adapter)
 - [parse-server-generic-email-adapter](https://www.npmjs.com/package/parse-server-generic-email-adapter)
+- [parse-server-api-mail-adapter](https://www.npmjs.com/package/parse-server-api-mail-adapter)
 
 ### Custom Pages
 

From e592212b976c24a24080c895c14e103e43ca67d4 Mon Sep 17 00:00:00 2001
From: Nikita <golovin.nik@gmail.com>
Date: Wed, 20 Jan 2021 01:19:11 +0300
Subject: [PATCH 2/8] Supporting patterns in classNames for Live Queries
 (#7131)

* Parse LiveQuery Server. Supporting patterns in classNames.

* Parse LiveQuery Server. Supporting patterns in classNames. Small optimisation.

* Parse LiveQuery Server. Supporting patterns in classNames. Adding info to changelog.

* Parse LiveQuery Server. Supporting patterns in classNames. Test case.
---
 CHANGELOG.md                           |  1 +
 spec/ParseLiveQuery.spec.js            | 23 +++++++++++++++++++++++
 src/Controllers/LiveQueryController.js | 11 +++++++++--
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 251f179237..3a12739f78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ ___
 - NEW: Added convenience method Parse.Cloud.sendEmail(...) to send email via email adapter in Cloud Code. [#7089](https://github.com/parse-community/parse-server/pull/7089). Thanks to [dblythy](https://github.com/dblythy)
 - FIX: Winston Logger interpolating stdout to console [#7114](https://github.com/parse-community/parse-server/pull/7114). Thanks to [dplewis](https://github.com/dplewis)
 - NEW: LiveQuery support for $and, $nor, $containedBy, $geoWithin, $geoIntersects queries [#7113](https://github.com/parse-community/parse-server/pull/7113). Thanks to [dplewis](https://github.com/dplewis)
+- NEW: Supporting patterns in LiveQuery server's config parameter `classNames` [#7131](https://github.com/parse-community/parse-server/pull/7131). Thanks to [Nes-si](https://github.com/Nes-si)
 
 ### 4.5.0
 [Full Changelog](https://github.com/parse-community/parse-server/compare/4.4.0...4.5.0)
diff --git a/spec/ParseLiveQuery.spec.js b/spec/ParseLiveQuery.spec.js
index be2da8c866..fa259785ee 100644
--- a/spec/ParseLiveQuery.spec.js
+++ b/spec/ParseLiveQuery.spec.js
@@ -56,6 +56,29 @@ describe('ParseLiveQuery', function () {
     await object.save();
   });
 
+  it('can use patterns in className', async done => {
+    await reconfigureServer({
+      liveQuery: {
+        classNames: ['Test.*'],
+      },
+      startLiveQueryServer: true,
+      verbose: false,
+      silent: true,
+    });
+    const object = new TestObject();
+    await object.save();
+
+    const query = new Parse.Query(TestObject);
+    query.equalTo('objectId', object.id);
+    const subscription = await query.subscribe();
+    subscription.on('update', object => {
+      expect(object.get('foo')).toBe('bar');
+      done();
+    });
+    object.set({ foo: 'bar' });
+    await object.save();
+  });
+
   it('expect afterEvent create', async done => {
     await reconfigureServer({
       liveQuery: {
diff --git a/src/Controllers/LiveQueryController.js b/src/Controllers/LiveQueryController.js
index 3b239a8c30..ea71ade033 100644
--- a/src/Controllers/LiveQueryController.js
+++ b/src/Controllers/LiveQueryController.js
@@ -9,7 +9,9 @@ export class LiveQueryController {
     if (!config || !config.classNames) {
       this.classNames = new Set();
     } else if (config.classNames instanceof Array) {
-      this.classNames = new Set(config.classNames);
+      const classNames = config.classNames
+        .map(name => new RegExp("^" + name + "$"));
+      this.classNames = new Set(classNames);
     } else {
       throw 'liveQuery.classes should be an array of string';
     }
@@ -43,7 +45,12 @@ export class LiveQueryController {
   }
 
   hasLiveQuery(className: string): boolean {
-    return this.classNames.has(className);
+    for (const name of this.classNames) {
+      if (name.test(className)) {
+        return true;
+      }
+    }
+    return false;
   }
 
   _makePublisherRequest(currentObject: any, originalObject: any, classLevelPermissions: ?any): any {

From 857d4ecfd5a383d6debd849a1af1d45820aee0c0 Mon Sep 17 00:00:00 2001
From: Snyk bot <snyk-bot@snyk.io>
Date: Wed, 20 Jan 2021 20:39:23 +0200
Subject: [PATCH 3/8] fix: upgrade ws from 7.4.1 to 7.4.2 (#7132)

Snyk has created this PR to upgrade ws from 7.4.1 to 7.4.2.

See this package in npm:
https://www.npmjs.com/package/ws

See this project in Snyk:
https://app.snyk.io/org/acinader/project/8c1a9edb-c8f5-4dc1-b221-4d6030a323eb?utm_source=github&utm_medium=upgrade-pr
---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b492d6897c..02e141e900 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12706,9 +12706,9 @@
       }
     },
     "ws": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.1.tgz",
-      "integrity": "sha512-pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ=="
+      "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.2.tgz",
+      "integrity": "sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA=="
     },
     "xml2js": {
       "version": "0.4.19",
diff --git a/package.json b/package.json
index b60287b1c7..28f65ad439 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "uuid": "8.3.2",
     "winston": "3.3.3",
     "winston-daily-rotate-file": "4.5.0",
-    "ws": "7.4.1"
+    "ws": "7.4.2"
   },
   "devDependencies": {
     "@babel/cli": "7.10.0",

From f2509e0d012bc96c4f561e5d8f41c26f886e2fd8 Mon Sep 17 00:00:00 2001
From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com>
Date: Thu, 28 Jan 2021 14:45:02 +0100
Subject: [PATCH 4/8] added account unlock on password reset

---
 spec/AccountLockoutPolicy.spec.js | 48 +++++++++++++++++++++++++++++++
 src/AccountLockout.js             | 14 +++++++++
 src/Controllers/UserController.js | 13 ++++++---
 3 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/spec/AccountLockoutPolicy.spec.js b/spec/AccountLockoutPolicy.spec.js
index 7e3f9a93d9..6626f55f8f 100644
--- a/spec/AccountLockoutPolicy.spec.js
+++ b/spec/AccountLockoutPolicy.spec.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const Config = require('../lib/Config');
+const request = require('../lib/request');
 
 const loginWithWrongCredentialsShouldFail = function (username, password) {
   return new Promise((resolve, reject) => {
@@ -339,4 +340,51 @@ describe('Account Lockout Policy: ', () => {
         done();
       });
   });
+
+  it('allow login for locked account after password reset', async () => {
+    const config = {
+      appName: 'exampleApp',
+      accountLockout: {
+        duration: 10000,
+        threshold: 1,
+      },
+      publicServerURL: 'http://localhost:8378/1',
+      emailAdapter: {
+        sendVerificationEmail: () => Promise.resolve(),
+        sendPasswordResetEmail: () => Promise.resolve(),
+        sendMail: () => {},
+      },
+    };
+    await reconfigureServer(config);
+
+    const user = new Parse.User();
+    const username = 'exampleUsername';
+    const password = 'examplePassword';
+    user.setUsername(username);
+    user.setPassword(password);
+    user.setEmail('mail@example.com');
+    await user.signUp();
+
+    await expectAsync(Parse.User.logIn(username, 'incorrectPassword')).toBeRejected();
+    await expectAsync(Parse.User.logIn(username, password)).toBeRejected();
+
+    const sendPasswordResetEmail = spyOn(config.emailAdapter, 'sendPasswordResetEmail').and.callThrough();
+    await Parse.User.requestPasswordReset(user.getEmail());
+
+    const link = sendPasswordResetEmail.calls.all()[0].args[0].link;
+    const linkUrl = new URL(link);
+    const token = linkUrl.searchParams.get('token');
+    const newPassword = 'newPassword';
+    await request({
+      method: 'POST',
+      url: `${config.publicServerURL}/apps/test/request_password_reset`,
+      body: `new_password=${newPassword}&token=${token}&username=${username}`,
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded',
+      },
+      followRedirects: false,
+    });
+
+    await expectAsync(Parse.User.logIn(username, newPassword)).toBeResolved();
+  });
 });
diff --git a/src/AccountLockout.js b/src/AccountLockout.js
index 183c7959cc..0832dc19f9 100644
--- a/src/AccountLockout.js
+++ b/src/AccountLockout.js
@@ -158,6 +158,20 @@ export class AccountLockout {
       }
     });
   }
+
+  /**
+   * Removes the account lockout.
+   */
+  unlockAccount() {
+    return this._config.database.update(
+      '_User',
+      { username: this._user.username },
+      {
+        _failed_login_count: { __op: 'Delete' },
+        _account_lockout_expires_at: { __op: 'Delete' },
+      },
+    );
+  }
 }
 
 export default AccountLockout;
diff --git a/src/Controllers/UserController.js b/src/Controllers/UserController.js
index 014e8bd7ce..0b15134a08 100644
--- a/src/Controllers/UserController.js
+++ b/src/Controllers/UserController.js
@@ -4,6 +4,7 @@ import AdaptableController from './AdaptableController';
 import MailAdapter from '../Adapters/Email/MailAdapter';
 import rest from '../rest';
 import Parse from 'parse/node';
+import AccountLockout from '../AccountLockout';
 
 var RestQuery = require('../RestQuery');
 var Auth = require('../Auth');
@@ -258,7 +259,11 @@ export class UserController extends AdaptableController {
 
   updatePassword(username, token, password) {
     return this.checkResetTokenValidity(username, token)
-      .then(user => updateUserPassword(user.objectId, password, this.config))
+      .then(user => updateUserPassword(user, password, this.config))
+      .then(user => {
+        const accountLockoutPolicy = new AccountLockout(user, this.config);
+        return accountLockoutPolicy.unlockAccount();
+      })
       .catch(error => {
         if (error && error.message) {
           // in case of Parse.Error, fail with the error message only
@@ -302,16 +307,16 @@ export class UserController extends AdaptableController {
 }
 
 // Mark this private
-function updateUserPassword(userId, password, config) {
+function updateUserPassword(user, password, config) {
   return rest.update(
     config,
     Auth.master(config),
     '_User',
-    { objectId: userId },
+    { objectId: user.objectId },
     {
       password: password,
     }
-  );
+  ).then(() => user);
 }
 
 function buildEmailLink(destination, username, token, config) {

From 3514422f5dc80637dcc035661a62f99d188b9a65 Mon Sep 17 00:00:00 2001
From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com>
Date: Thu, 28 Jan 2021 16:09:26 +0100
Subject: [PATCH 5/8] added account policy option

---
 spec/AccountLockoutPolicy.spec.js |   83 +-
 src/AccountLockout.js             |    3 +
 src/Config.js                     |    8 +
 src/Options/Definitions.js        | 1197 ++++++++++++++---------------
 src/Options/docs.js               |    2 +
 src/Options/index.js              |    3 +
 6 files changed, 683 insertions(+), 613 deletions(-)

diff --git a/spec/AccountLockoutPolicy.spec.js b/spec/AccountLockoutPolicy.spec.js
index 6626f55f8f..90f995b6c9 100644
--- a/spec/AccountLockoutPolicy.spec.js
+++ b/spec/AccountLockoutPolicy.spec.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const Config = require('../lib/Config');
+const Definitions = require('../lib/Options/Definitions');
 const request = require('../lib/request');
 
 const loginWithWrongCredentialsShouldFail = function (username, password) {
@@ -340,14 +341,21 @@ describe('Account Lockout Policy: ', () => {
         done();
       });
   });
+});
 
-  it('allow login for locked account after password reset', async () => {
-    const config = {
-      appName: 'exampleApp',
-      accountLockout: {
+describe('lockout with password reset option', () => {
+  let sendPasswordResetEmail;
+
+  async function setup(options = {}) {
+    const accountLockout = Object.assign(
+      {
         duration: 10000,
         threshold: 1,
-      },
+      }, options
+    );
+    const config = {
+      appName: 'exampleApp',
+      accountLockout: accountLockout,
       publicServerURL: 'http://localhost:8378/1',
       emailAdapter: {
         sendVerificationEmail: () => Promise.resolve(),
@@ -357,6 +365,36 @@ describe('Account Lockout Policy: ', () => {
     };
     await reconfigureServer(config);
 
+    sendPasswordResetEmail = spyOn(config.emailAdapter, 'sendPasswordResetEmail').and.callThrough();
+  }
+
+  it('accepts valid unlockOnPasswordReset option', async () => {
+    const values = [true, false];
+
+    for (const value of values) {
+      await expectAsync(setup({ unlockOnPasswordReset: value })).toBeResolved();
+    }
+  });
+
+  it('rejects invalid unlockOnPasswordReset option', async () => {
+    const values = ["a", 0, {}, [], null];
+
+    for (const value of values) {
+      await expectAsync(setup({ unlockOnPasswordReset: value })).toBeRejected();
+    }
+  });
+
+  it('uses default value if unlockOnPasswordReset is not set', async () => {
+    await expectAsync(setup({ unlockOnPasswordReset: undefined })).toBeResolved();
+
+    const parseConfig = Config.get(Parse.applicationId);
+    expect(parseConfig.accountLockout.unlockOnPasswordReset).toBe(Definitions.AccountLockoutOptions.unlockOnPasswordReset.default);
+  });
+
+  it('allow login for locked account after password reset', async () => {
+    await setup({ unlockOnPasswordReset: true });
+    const config = Config.get(Parse.applicationId);
+
     const user = new Parse.User();
     const username = 'exampleUsername';
     const password = 'examplePassword';
@@ -368,9 +406,7 @@ describe('Account Lockout Policy: ', () => {
     await expectAsync(Parse.User.logIn(username, 'incorrectPassword')).toBeRejected();
     await expectAsync(Parse.User.logIn(username, password)).toBeRejected();
 
-    const sendPasswordResetEmail = spyOn(config.emailAdapter, 'sendPasswordResetEmail').and.callThrough();
     await Parse.User.requestPasswordReset(user.getEmail());
-
     const link = sendPasswordResetEmail.calls.all()[0].args[0].link;
     const linkUrl = new URL(link);
     const token = linkUrl.searchParams.get('token');
@@ -387,4 +423,37 @@ describe('Account Lockout Policy: ', () => {
 
     await expectAsync(Parse.User.logIn(username, newPassword)).toBeResolved();
   });
+
+  it('reject login for locked account after password reset (default)', async () => {
+    await setup();
+    const config = Config.get(Parse.applicationId);
+
+    const user = new Parse.User();
+    const username = 'exampleUsername';
+    const password = 'examplePassword';
+    user.setUsername(username);
+    user.setPassword(password);
+    user.setEmail('mail@example.com');
+    await user.signUp();
+
+    await expectAsync(Parse.User.logIn(username, 'incorrectPassword')).toBeRejected();
+    await expectAsync(Parse.User.logIn(username, password)).toBeRejected();
+
+    await Parse.User.requestPasswordReset(user.getEmail());
+    const link = sendPasswordResetEmail.calls.all()[0].args[0].link;
+    const linkUrl = new URL(link);
+    const token = linkUrl.searchParams.get('token');
+    const newPassword = 'newPassword';
+    await request({
+      method: 'POST',
+      url: `${config.publicServerURL}/apps/test/request_password_reset`,
+      body: `new_password=${newPassword}&token=${token}&username=${username}`,
+      headers: {
+        'Content-Type': 'application/x-www-form-urlencoded',
+      },
+      followRedirects: false,
+    });
+
+    await expectAsync(Parse.User.logIn(username, newPassword)).toBeRejected();
+  });
 });
diff --git a/src/AccountLockout.js b/src/AccountLockout.js
index 0832dc19f9..5dc6bd110d 100644
--- a/src/AccountLockout.js
+++ b/src/AccountLockout.js
@@ -163,6 +163,9 @@ export class AccountLockout {
    * Removes the account lockout.
    */
   unlockAccount() {
+    if (!this._config.accountLockout || !this._config.accountLockout.unlockOnPasswordReset) {
+      return Promise.resolve();
+    }
     return this._config.database.update(
       '_User',
       { username: this._user.username },
diff --git a/src/Config.js b/src/Config.js
index cd2717a737..da28d5add3 100644
--- a/src/Config.js
+++ b/src/Config.js
@@ -9,7 +9,9 @@ import net from 'net';
 import {
   IdempotencyOptions,
   FileUploadOptions,
+  AccountLockoutOptions,
 } from './Options/Definitions';
+import { isBoolean } from 'lodash';
 
 function removeTrailingSlash(str) {
   if (!str) {
@@ -146,6 +148,12 @@ export class Config {
       ) {
         throw 'Account lockout threshold should be an integer greater than 0 and less than 1000';
       }
+
+      if (accountLockout.unlockOnPasswordReset === undefined) {
+        accountLockout.unlockOnPasswordReset = AccountLockoutOptions.unlockOnPasswordReset.default;
+      } else if (!isBoolean(accountLockout.unlockOnPasswordReset)) {
+        throw 'Parse Server option accountLockout.unlockOnPasswordReset must be a boolean.';
+      }
     }
   }
 
diff --git a/src/Options/Definitions.js b/src/Options/Definitions.js
index 22e0680fce..5ebcb11354 100644
--- a/src/Options/Definitions.js
+++ b/src/Options/Definitions.js
@@ -3,626 +3,611 @@
 This code has been generated by resources/buildConfigDefinitions.js
 Do not edit manually, but update Options/index.js
 */
-var parsers = require('./parsers');
+var parsers = require("./parsers");
 
 module.exports.ParseServerOptions = {
-  accountLockout: {
-    env: 'PARSE_SERVER_ACCOUNT_LOCKOUT',
-    help: 'account lockout policy for failed login attempts',
-    action: parsers.objectParser,
-  },
-  allowClientClassCreation: {
-    env: 'PARSE_SERVER_ALLOW_CLIENT_CLASS_CREATION',
-    help: 'Enable (or disable) client class creation, defaults to true',
-    action: parsers.booleanParser,
-    default: true,
-  },
-  allowCustomObjectId: {
-    env: 'PARSE_SERVER_ALLOW_CUSTOM_OBJECT_ID',
-    help: 'Enable (or disable) custom objectId',
-    action: parsers.booleanParser,
-    default: false,
-  },
-  allowHeaders: {
-    env: 'PARSE_SERVER_ALLOW_HEADERS',
-    help: 'Add headers to Access-Control-Allow-Headers',
-    action: parsers.arrayParser,
-  },
-  allowOrigin: {
-    env: 'PARSE_SERVER_ALLOW_ORIGIN',
-    help: 'Sets the origin to Access-Control-Allow-Origin',
-  },
-  analyticsAdapter: {
-    env: 'PARSE_SERVER_ANALYTICS_ADAPTER',
-    help: 'Adapter module for the analytics',
-    action: parsers.moduleOrObjectParser,
-  },
-  appId: {
-    env: 'PARSE_SERVER_APPLICATION_ID',
-    help: 'Your Parse Application ID',
-    required: true,
-  },
-  appName: {
-    env: 'PARSE_SERVER_APP_NAME',
-    help: 'Sets the app name',
-  },
-  auth: {
-    env: 'PARSE_SERVER_AUTH_PROVIDERS',
-    help:
-      'Configuration for your authentication providers, as stringified JSON. See http://docs.parseplatform.org/parse-server/guide/#oauth-and-3rd-party-authentication',
-    action: parsers.objectParser,
-  },
-  cacheAdapter: {
-    env: 'PARSE_SERVER_CACHE_ADAPTER',
-    help: 'Adapter module for the cache',
-    action: parsers.moduleOrObjectParser,
-  },
-  cacheMaxSize: {
-    env: 'PARSE_SERVER_CACHE_MAX_SIZE',
-    help: 'Sets the maximum size for the in memory cache, defaults to 10000',
-    action: parsers.numberParser('cacheMaxSize'),
-    default: 10000,
-  },
-  cacheTTL: {
-    env: 'PARSE_SERVER_CACHE_TTL',
-    help: 'Sets the TTL for the in memory cache (in ms), defaults to 5000 (5 seconds)',
-    action: parsers.numberParser('cacheTTL'),
-    default: 5000,
-  },
-  clientKey: {
-    env: 'PARSE_SERVER_CLIENT_KEY',
-    help: 'Key for iOS, MacOS, tvOS clients',
-  },
-  cloud: {
-    env: 'PARSE_SERVER_CLOUD',
-    help: 'Full path to your cloud code main.js',
-  },
-  cluster: {
-    env: 'PARSE_SERVER_CLUSTER',
-    help: 'Run with cluster, optionally set the number of processes default to os.cpus().length',
-    action: parsers.numberOrBooleanParser,
-  },
-  collectionPrefix: {
-    env: 'PARSE_SERVER_COLLECTION_PREFIX',
-    help: 'A collection prefix for the classes',
-    default: '',
-  },
-  customPages: {
-    env: 'PARSE_SERVER_CUSTOM_PAGES',
-    help: 'custom pages for password validation and reset',
-    action: parsers.objectParser,
-    default: {},
-  },
-  databaseAdapter: {
-    env: 'PARSE_SERVER_DATABASE_ADAPTER',
-    help: 'Adapter module for the database',
-    action: parsers.moduleOrObjectParser,
-  },
-  databaseOptions: {
-    env: 'PARSE_SERVER_DATABASE_OPTIONS',
-    help: 'Options to pass to the mongodb client',
-    action: parsers.objectParser,
-  },
-  databaseURI: {
-    env: 'PARSE_SERVER_DATABASE_URI',
-    help: 'The full URI to your database. Supported databases are mongodb or postgres.',
-    required: true,
-    default: 'mongodb://localhost:27017/parse',
-  },
-  directAccess: {
-    env: 'PARSE_SERVER_ENABLE_EXPERIMENTAL_DIRECT_ACCESS',
-    help:
-      'Replace HTTP Interface when using JS SDK in current node runtime, defaults to false. Caution, this is an experimental feature that may not be appropriate for production.',
-    action: parsers.booleanParser,
-    default: false,
-  },
-  dotNetKey: {
-    env: 'PARSE_SERVER_DOT_NET_KEY',
-    help: 'Key for Unity and .Net SDK',
-  },
-  emailAdapter: {
-    env: 'PARSE_SERVER_EMAIL_ADAPTER',
-    help: 'Adapter module for email sending',
-    action: parsers.moduleOrObjectParser,
-  },
-  emailVerifyTokenReuseIfValid: {
-    env: 'PARSE_SERVER_EMAIL_VERIFY_TOKEN_REUSE_IF_VALID',
-    help:
-      'an existing email verify token should be reused when resend verification email is requested',
-    action: parsers.booleanParser,
-    default: false,
-  },
-  emailVerifyTokenValidityDuration: {
-    env: 'PARSE_SERVER_EMAIL_VERIFY_TOKEN_VALIDITY_DURATION',
-    help: 'Email verification token validity duration, in seconds',
-    action: parsers.numberParser('emailVerifyTokenValidityDuration'),
-  },
-  enableAnonymousUsers: {
-    env: 'PARSE_SERVER_ENABLE_ANON_USERS',
-    help: 'Enable (or disable) anonymous users, defaults to true',
-    action: parsers.booleanParser,
-    default: true,
-  },
-  enableExpressErrorHandler: {
-    env: 'PARSE_SERVER_ENABLE_EXPRESS_ERROR_HANDLER',
-    help: 'Enables the default express error handler for all errors',
-    action: parsers.booleanParser,
-    default: false,
-  },
-  enableSingleSchemaCache: {
-    env: 'PARSE_SERVER_ENABLE_SINGLE_SCHEMA_CACHE',
-    help:
-      'Use a single schema cache shared across requests. Reduces number of queries made to _SCHEMA, defaults to false, i.e. unique schema cache per request.',
-    action: parsers.booleanParser,
-    default: false,
-  },
-  encryptionKey: {
-    env: 'PARSE_SERVER_ENCRYPTION_KEY',
-    help: 'Key for encrypting your files',
-  },
-  expireInactiveSessions: {
-    env: 'PARSE_SERVER_EXPIRE_INACTIVE_SESSIONS',
-    help: 'Sets wether we should expire the inactive sessions, defaults to true',
-    action: parsers.booleanParser,
-    default: true,
-  },
-  fileKey: {
-    env: 'PARSE_SERVER_FILE_KEY',
-    help: 'Key for your files',
-  },
-  filesAdapter: {
-    env: 'PARSE_SERVER_FILES_ADAPTER',
-    help: 'Adapter module for the files sub-system',
-    action: parsers.moduleOrObjectParser,
-  },
-  fileUpload: {
-    env: 'PARSE_SERVER_FILE_UPLOAD_OPTIONS',
-    help: 'Options for file uploads',
-    action: parsers.objectParser,
-    default: {},
-  },
-  graphQLPath: {
-    env: 'PARSE_SERVER_GRAPHQL_PATH',
-    help: 'Mount path for the GraphQL endpoint, defaults to /graphql',
-    default: '/graphql',
-  },
-  graphQLSchema: {
-    env: 'PARSE_SERVER_GRAPH_QLSCHEMA',
-    help: 'Full path to your GraphQL custom schema.graphql file',
-  },
-  host: {
-    env: 'PARSE_SERVER_HOST',
-    help: 'The host to serve ParseServer on, defaults to 0.0.0.0',
-    default: '0.0.0.0',
-  },
-  idempotencyOptions: {
-    env: 'PARSE_SERVER_EXPERIMENTAL_IDEMPOTENCY_OPTIONS',
-    help:
-      'Options for request idempotency to deduplicate identical requests that may be caused by network issues. Caution, this is an experimental feature that may not be appropriate for production.',
-    action: parsers.objectParser,
-    default: {},
-  },
-  javascriptKey: {
-    env: 'PARSE_SERVER_JAVASCRIPT_KEY',
-    help: 'Key for the Javascript SDK',
-  },
-  jsonLogs: {
-    env: 'JSON_LOGS',
-    help: 'Log as structured JSON objects',
-    action: parsers.booleanParser,
-  },
-  liveQuery: {
-    env: 'PARSE_SERVER_LIVE_QUERY',
-    help: "parse-server's LiveQuery configuration object",
-    action: parsers.objectParser,
-  },
-  liveQueryServerOptions: {
-    env: 'PARSE_SERVER_LIVE_QUERY_SERVER_OPTIONS',
-    help: 'Live query server configuration options (will start the liveQuery server)',
-    action: parsers.objectParser,
-  },
-  loggerAdapter: {
-    env: 'PARSE_SERVER_LOGGER_ADAPTER',
-    help: 'Adapter module for the logging sub-system',
-    action: parsers.moduleOrObjectParser,
-  },
-  logLevel: {
-    env: 'PARSE_SERVER_LOG_LEVEL',
-    help: 'Sets the level for logs',
-  },
-  logsFolder: {
-    env: 'PARSE_SERVER_LOGS_FOLDER',
-    help: "Folder for the logs (defaults to './logs'); set to null to disable file based logging",
-    default: './logs',
-  },
-  masterKey: {
-    env: 'PARSE_SERVER_MASTER_KEY',
-    help: 'Your Parse Master Key',
-    required: true,
-  },
-  masterKeyIps: {
-    env: 'PARSE_SERVER_MASTER_KEY_IPS',
-    help: 'Restrict masterKey to be used by only these ips, defaults to [] (allow all ips)',
-    action: parsers.arrayParser,
-    default: [],
-  },
-  maxLimit: {
-    env: 'PARSE_SERVER_MAX_LIMIT',
-    help: 'Max value for limit option on queries, defaults to unlimited',
-    action: parsers.numberParser('maxLimit'),
-  },
-  maxLogFiles: {
-    env: 'PARSE_SERVER_MAX_LOG_FILES',
-    help:
-      "Maximum number of logs to keep. If not set, no logs will be removed. This can be a number of files or number of days. If using days, add 'd' as the suffix. (default: null)",
-    action: parsers.objectParser,
-  },
-  maxUploadSize: {
-    env: 'PARSE_SERVER_MAX_UPLOAD_SIZE',
-    help: 'Max file size for uploads, defaults to 20mb',
-    default: '20mb',
-  },
-  middleware: {
-    env: 'PARSE_SERVER_MIDDLEWARE',
-    help: 'middleware for express server, can be string or function',
-  },
-  mountGraphQL: {
-    env: 'PARSE_SERVER_MOUNT_GRAPHQL',
-    help: 'Mounts the GraphQL endpoint',
-    action: parsers.booleanParser,
-    default: false,
-  },
-  mountPath: {
-    env: 'PARSE_SERVER_MOUNT_PATH',
-    help: 'Mount path for the server, defaults to /parse',
-    default: '/parse',
-  },
-  mountPlayground: {
-    env: 'PARSE_SERVER_MOUNT_PLAYGROUND',
-    help: 'Mounts the GraphQL Playground - never use this option in production',
-    action: parsers.booleanParser,
-    default: false,
-  },
-  objectIdSize: {
-    env: 'PARSE_SERVER_OBJECT_ID_SIZE',
-    help: "Sets the number of characters in generated object id's, default 10",
-    action: parsers.numberParser('objectIdSize'),
-    default: 10,
-  },
-  passwordPolicy: {
-    env: 'PARSE_SERVER_PASSWORD_POLICY',
-    help: 'Password policy for enforcing password related rules',
-    action: parsers.objectParser,
-  },
-  playgroundPath: {
-    env: 'PARSE_SERVER_PLAYGROUND_PATH',
-    help: 'Mount path for the GraphQL Playground, defaults to /playground',
-    default: '/playground',
-  },
-  port: {
-    env: 'PORT',
-    help: 'The port to run the ParseServer, defaults to 1337.',
-    action: parsers.numberParser('port'),
-    default: 1337,
-  },
-  preserveFileName: {
-    env: 'PARSE_SERVER_PRESERVE_FILE_NAME',
-    help: 'Enable (or disable) the addition of a unique hash to the file names',
-    action: parsers.booleanParser,
-    default: false,
-  },
-  preventLoginWithUnverifiedEmail: {
-    env: 'PARSE_SERVER_PREVENT_LOGIN_WITH_UNVERIFIED_EMAIL',
-    help:
-      'Prevent user from login if email is not verified and PARSE_SERVER_VERIFY_USER_EMAILS is true, defaults to false',
-    action: parsers.booleanParser,
-    default: false,
-  },
-  protectedFields: {
-    env: 'PARSE_SERVER_PROTECTED_FIELDS',
-    help: 'Protected fields that should be treated with extra security when fetching details.',
-    action: parsers.objectParser,
-    default: {
-      _User: {
-        '*': ['email'],
-      },
-    },
-  },
-  publicServerURL: {
-    env: 'PARSE_PUBLIC_SERVER_URL',
-    help: 'Public URL to your parse server with http:// or https://.',
-  },
-  push: {
-    env: 'PARSE_SERVER_PUSH',
-    help:
-      'Configuration for push, as stringified JSON. See http://docs.parseplatform.org/parse-server/guide/#push-notifications',
-    action: parsers.objectParser,
-  },
-  readOnlyMasterKey: {
-    env: 'PARSE_SERVER_READ_ONLY_MASTER_KEY',
-    help: 'Read-only key, which has the same capabilities as MasterKey without writes',
-  },
-  restAPIKey: {
-    env: 'PARSE_SERVER_REST_API_KEY',
-    help: 'Key for REST calls',
-  },
-  revokeSessionOnPasswordReset: {
-    env: 'PARSE_SERVER_REVOKE_SESSION_ON_PASSWORD_RESET',
-    help:
-      "When a user changes their password, either through the reset password email or while logged in, all sessions are revoked if this is true. Set to false if you don't want to revoke sessions.",
-    action: parsers.booleanParser,
-    default: true,
-  },
-  scheduledPush: {
-    env: 'PARSE_SERVER_SCHEDULED_PUSH',
-    help: 'Configuration for push scheduling, defaults to false.',
-    action: parsers.booleanParser,
-    default: false,
-  },
-  schemaCacheTTL: {
-    env: 'PARSE_SERVER_SCHEMA_CACHE_TTL',
-    help:
-      'The TTL for caching the schema for optimizing read/write operations. You should put a long TTL when your DB is in production. default to 5000; set 0 to disable.',
-    action: parsers.numberParser('schemaCacheTTL'),
-    default: 5000,
-  },
-  serverCloseComplete: {
-    env: 'PARSE_SERVER_SERVER_CLOSE_COMPLETE',
-    help: 'Callback when server has closed',
-  },
-  serverStartComplete: {
-    env: 'PARSE_SERVER_SERVER_START_COMPLETE',
-    help: 'Callback when server has started',
-  },
-  serverURL: {
-    env: 'PARSE_SERVER_URL',
-    help: 'URL to your parse server with http:// or https://.',
-    required: true,
-  },
-  sessionLength: {
-    env: 'PARSE_SERVER_SESSION_LENGTH',
-    help: 'Session duration, in seconds, defaults to 1 year',
-    action: parsers.numberParser('sessionLength'),
-    default: 31536000,
-  },
-  silent: {
-    env: 'SILENT',
-    help: 'Disables console output',
-    action: parsers.booleanParser,
-  },
-  startLiveQueryServer: {
-    env: 'PARSE_SERVER_START_LIVE_QUERY_SERVER',
-    help: 'Starts the liveQuery server',
-    action: parsers.booleanParser,
-  },
-  userSensitiveFields: {
-    env: 'PARSE_SERVER_USER_SENSITIVE_FIELDS',
-    help:
-      'Personally identifiable information fields in the user table the should be removed for non-authorized users. Deprecated @see protectedFields',
-    action: parsers.arrayParser,
-  },
-  verbose: {
-    env: 'VERBOSE',
-    help: 'Set the logging to verbose',
-    action: parsers.booleanParser,
-  },
-  verifyUserEmails: {
-    env: 'PARSE_SERVER_VERIFY_USER_EMAILS',
-    help: 'Enable (or disable) user email validation, defaults to false',
-    action: parsers.booleanParser,
-    default: false,
-  },
-  webhookKey: {
-    env: 'PARSE_SERVER_WEBHOOK_KEY',
-    help: 'Key sent with outgoing webhook calls',
-  },
+  "accountLockout": {
+    "env": "PARSE_SERVER_ACCOUNT_LOCKOUT",
+    "help": "account lockout policy for failed login attempts",
+    "action": parsers.objectParser
+  },
+  "allowClientClassCreation": {
+    "env": "PARSE_SERVER_ALLOW_CLIENT_CLASS_CREATION",
+    "help": "Enable (or disable) client class creation, defaults to true",
+    "action": parsers.booleanParser,
+    "default": true
+  },
+  "allowCustomObjectId": {
+    "env": "PARSE_SERVER_ALLOW_CUSTOM_OBJECT_ID",
+    "help": "Enable (or disable) custom objectId",
+    "action": parsers.booleanParser,
+    "default": false
+  },
+  "allowHeaders": {
+    "env": "PARSE_SERVER_ALLOW_HEADERS",
+    "help": "Add headers to Access-Control-Allow-Headers",
+    "action": parsers.arrayParser
+  },
+  "allowOrigin": {
+    "env": "PARSE_SERVER_ALLOW_ORIGIN",
+    "help": "Sets the origin to Access-Control-Allow-Origin"
+  },
+  "analyticsAdapter": {
+    "env": "PARSE_SERVER_ANALYTICS_ADAPTER",
+    "help": "Adapter module for the analytics",
+    "action": parsers.moduleOrObjectParser
+  },
+  "appId": {
+    "env": "PARSE_SERVER_APPLICATION_ID",
+    "help": "Your Parse Application ID",
+    "required": true
+  },
+  "appName": {
+    "env": "PARSE_SERVER_APP_NAME",
+    "help": "Sets the app name"
+  },
+  "auth": {
+    "env": "PARSE_SERVER_AUTH_PROVIDERS",
+    "help": "Configuration for your authentication providers, as stringified JSON. See http://docs.parseplatform.org/parse-server/guide/#oauth-and-3rd-party-authentication",
+    "action": parsers.objectParser
+  },
+  "cacheAdapter": {
+    "env": "PARSE_SERVER_CACHE_ADAPTER",
+    "help": "Adapter module for the cache",
+    "action": parsers.moduleOrObjectParser
+  },
+  "cacheMaxSize": {
+    "env": "PARSE_SERVER_CACHE_MAX_SIZE",
+    "help": "Sets the maximum size for the in memory cache, defaults to 10000",
+    "action": parsers.numberParser("cacheMaxSize"),
+    "default": 10000
+  },
+  "cacheTTL": {
+    "env": "PARSE_SERVER_CACHE_TTL",
+    "help": "Sets the TTL for the in memory cache (in ms), defaults to 5000 (5 seconds)",
+    "action": parsers.numberParser("cacheTTL"),
+    "default": 5000
+  },
+  "clientKey": {
+    "env": "PARSE_SERVER_CLIENT_KEY",
+    "help": "Key for iOS, MacOS, tvOS clients"
+  },
+  "cloud": {
+    "env": "PARSE_SERVER_CLOUD",
+    "help": "Full path to your cloud code main.js"
+  },
+  "cluster": {
+    "env": "PARSE_SERVER_CLUSTER",
+    "help": "Run with cluster, optionally set the number of processes default to os.cpus().length",
+    "action": parsers.numberOrBooleanParser
+  },
+  "collectionPrefix": {
+    "env": "PARSE_SERVER_COLLECTION_PREFIX",
+    "help": "A collection prefix for the classes",
+    "default": ""
+  },
+  "customPages": {
+    "env": "PARSE_SERVER_CUSTOM_PAGES",
+    "help": "custom pages for password validation and reset",
+    "action": parsers.objectParser,
+    "default": {}
+  },
+  "databaseAdapter": {
+    "env": "PARSE_SERVER_DATABASE_ADAPTER",
+    "help": "Adapter module for the database",
+    "action": parsers.moduleOrObjectParser
+  },
+  "databaseOptions": {
+    "env": "PARSE_SERVER_DATABASE_OPTIONS",
+    "help": "Options to pass to the mongodb client",
+    "action": parsers.objectParser
+  },
+  "databaseURI": {
+    "env": "PARSE_SERVER_DATABASE_URI",
+    "help": "The full URI to your database. Supported databases are mongodb or postgres.",
+    "required": true,
+    "default": "mongodb://localhost:27017/parse"
+  },
+  "directAccess": {
+    "env": "PARSE_SERVER_ENABLE_EXPERIMENTAL_DIRECT_ACCESS",
+    "help": "Replace HTTP Interface when using JS SDK in current node runtime, defaults to false. Caution, this is an experimental feature that may not be appropriate for production.",
+    "action": parsers.booleanParser,
+    "default": false
+  },
+  "dotNetKey": {
+    "env": "PARSE_SERVER_DOT_NET_KEY",
+    "help": "Key for Unity and .Net SDK"
+  },
+  "emailAdapter": {
+    "env": "PARSE_SERVER_EMAIL_ADAPTER",
+    "help": "Adapter module for email sending",
+    "action": parsers.moduleOrObjectParser
+  },
+  "emailVerifyTokenReuseIfValid": {
+    "env": "PARSE_SERVER_EMAIL_VERIFY_TOKEN_REUSE_IF_VALID",
+    "help": "an existing email verify token should be reused when resend verification email is requested",
+    "action": parsers.booleanParser,
+    "default": false
+  },
+  "emailVerifyTokenValidityDuration": {
+    "env": "PARSE_SERVER_EMAIL_VERIFY_TOKEN_VALIDITY_DURATION",
+    "help": "Email verification token validity duration, in seconds",
+    "action": parsers.numberParser("emailVerifyTokenValidityDuration")
+  },
+  "enableAnonymousUsers": {
+    "env": "PARSE_SERVER_ENABLE_ANON_USERS",
+    "help": "Enable (or disable) anonymous users, defaults to true",
+    "action": parsers.booleanParser,
+    "default": true
+  },
+  "enableExpressErrorHandler": {
+    "env": "PARSE_SERVER_ENABLE_EXPRESS_ERROR_HANDLER",
+    "help": "Enables the default express error handler for all errors",
+    "action": parsers.booleanParser,
+    "default": false
+  },
+  "enableSingleSchemaCache": {
+    "env": "PARSE_SERVER_ENABLE_SINGLE_SCHEMA_CACHE",
+    "help": "Use a single schema cache shared across requests. Reduces number of queries made to _SCHEMA, defaults to false, i.e. unique schema cache per request.",
+    "action": parsers.booleanParser,
+    "default": false
+  },
+  "encryptionKey": {
+    "env": "PARSE_SERVER_ENCRYPTION_KEY",
+    "help": "Key for encrypting your files"
+  },
+  "expireInactiveSessions": {
+    "env": "PARSE_SERVER_EXPIRE_INACTIVE_SESSIONS",
+    "help": "Sets wether we should expire the inactive sessions, defaults to true",
+    "action": parsers.booleanParser,
+    "default": true
+  },
+  "fileKey": {
+    "env": "PARSE_SERVER_FILE_KEY",
+    "help": "Key for your files"
+  },
+  "filesAdapter": {
+    "env": "PARSE_SERVER_FILES_ADAPTER",
+    "help": "Adapter module for the files sub-system",
+    "action": parsers.moduleOrObjectParser
+  },
+  "fileUpload": {
+    "env": "PARSE_SERVER_FILE_UPLOAD_OPTIONS",
+    "help": "Options for file uploads",
+    "action": parsers.objectParser,
+    "default": {}
+  },
+  "graphQLPath": {
+    "env": "PARSE_SERVER_GRAPHQL_PATH",
+    "help": "Mount path for the GraphQL endpoint, defaults to /graphql",
+    "default": "/graphql"
+  },
+  "graphQLSchema": {
+    "env": "PARSE_SERVER_GRAPH_QLSCHEMA",
+    "help": "Full path to your GraphQL custom schema.graphql file"
+  },
+  "host": {
+    "env": "PARSE_SERVER_HOST",
+    "help": "The host to serve ParseServer on, defaults to 0.0.0.0",
+    "default": "0.0.0.0"
+  },
+  "idempotencyOptions": {
+    "env": "PARSE_SERVER_EXPERIMENTAL_IDEMPOTENCY_OPTIONS",
+    "help": "Options for request idempotency to deduplicate identical requests that may be caused by network issues. Caution, this is an experimental feature that may not be appropriate for production.",
+    "action": parsers.objectParser,
+    "default": {}
+  },
+  "javascriptKey": {
+    "env": "PARSE_SERVER_JAVASCRIPT_KEY",
+    "help": "Key for the Javascript SDK"
+  },
+  "jsonLogs": {
+    "env": "JSON_LOGS",
+    "help": "Log as structured JSON objects",
+    "action": parsers.booleanParser
+  },
+  "liveQuery": {
+    "env": "PARSE_SERVER_LIVE_QUERY",
+    "help": "parse-server's LiveQuery configuration object",
+    "action": parsers.objectParser
+  },
+  "liveQueryServerOptions": {
+    "env": "PARSE_SERVER_LIVE_QUERY_SERVER_OPTIONS",
+    "help": "Live query server configuration options (will start the liveQuery server)",
+    "action": parsers.objectParser
+  },
+  "loggerAdapter": {
+    "env": "PARSE_SERVER_LOGGER_ADAPTER",
+    "help": "Adapter module for the logging sub-system",
+    "action": parsers.moduleOrObjectParser
+  },
+  "logLevel": {
+    "env": "PARSE_SERVER_LOG_LEVEL",
+    "help": "Sets the level for logs"
+  },
+  "logsFolder": {
+    "env": "PARSE_SERVER_LOGS_FOLDER",
+    "help": "Folder for the logs (defaults to './logs'); set to null to disable file based logging",
+    "default": "./logs"
+  },
+  "masterKey": {
+    "env": "PARSE_SERVER_MASTER_KEY",
+    "help": "Your Parse Master Key",
+    "required": true
+  },
+  "masterKeyIps": {
+    "env": "PARSE_SERVER_MASTER_KEY_IPS",
+    "help": "Restrict masterKey to be used by only these ips, defaults to [] (allow all ips)",
+    "action": parsers.arrayParser,
+    "default": []
+  },
+  "maxLimit": {
+    "env": "PARSE_SERVER_MAX_LIMIT",
+    "help": "Max value for limit option on queries, defaults to unlimited",
+    "action": parsers.numberParser("maxLimit")
+  },
+  "maxLogFiles": {
+    "env": "PARSE_SERVER_MAX_LOG_FILES",
+    "help": "Maximum number of logs to keep. If not set, no logs will be removed. This can be a number of files or number of days. If using days, add 'd' as the suffix. (default: null)",
+    "action": parsers.objectParser
+  },
+  "maxUploadSize": {
+    "env": "PARSE_SERVER_MAX_UPLOAD_SIZE",
+    "help": "Max file size for uploads, defaults to 20mb",
+    "default": "20mb"
+  },
+  "middleware": {
+    "env": "PARSE_SERVER_MIDDLEWARE",
+    "help": "middleware for express server, can be string or function"
+  },
+  "mountGraphQL": {
+    "env": "PARSE_SERVER_MOUNT_GRAPHQL",
+    "help": "Mounts the GraphQL endpoint",
+    "action": parsers.booleanParser,
+    "default": false
+  },
+  "mountPath": {
+    "env": "PARSE_SERVER_MOUNT_PATH",
+    "help": "Mount path for the server, defaults to /parse",
+    "default": "/parse"
+  },
+  "mountPlayground": {
+    "env": "PARSE_SERVER_MOUNT_PLAYGROUND",
+    "help": "Mounts the GraphQL Playground - never use this option in production",
+    "action": parsers.booleanParser,
+    "default": false
+  },
+  "objectIdSize": {
+    "env": "PARSE_SERVER_OBJECT_ID_SIZE",
+    "help": "Sets the number of characters in generated object id's, default 10",
+    "action": parsers.numberParser("objectIdSize"),
+    "default": 10
+  },
+  "passwordPolicy": {
+    "env": "PARSE_SERVER_PASSWORD_POLICY",
+    "help": "Password policy for enforcing password related rules",
+    "action": parsers.objectParser
+  },
+  "playgroundPath": {
+    "env": "PARSE_SERVER_PLAYGROUND_PATH",
+    "help": "Mount path for the GraphQL Playground, defaults to /playground",
+    "default": "/playground"
+  },
+  "port": {
+    "env": "PORT",
+    "help": "The port to run the ParseServer, defaults to 1337.",
+    "action": parsers.numberParser("port"),
+    "default": 1337
+  },
+  "preserveFileName": {
+    "env": "PARSE_SERVER_PRESERVE_FILE_NAME",
+    "help": "Enable (or disable) the addition of a unique hash to the file names",
+    "action": parsers.booleanParser,
+    "default": false
+  },
+  "preventLoginWithUnverifiedEmail": {
+    "env": "PARSE_SERVER_PREVENT_LOGIN_WITH_UNVERIFIED_EMAIL",
+    "help": "Prevent user from login if email is not verified and PARSE_SERVER_VERIFY_USER_EMAILS is true, defaults to false",
+    "action": parsers.booleanParser,
+    "default": false
+  },
+  "protectedFields": {
+    "env": "PARSE_SERVER_PROTECTED_FIELDS",
+    "help": "Protected fields that should be treated with extra security when fetching details.",
+    "action": parsers.objectParser,
+    "default": {
+      "_User": {
+        "*": ["email"]
+      }
+    }
+  },
+  "publicServerURL": {
+    "env": "PARSE_PUBLIC_SERVER_URL",
+    "help": "Public URL to your parse server with http:// or https://."
+  },
+  "push": {
+    "env": "PARSE_SERVER_PUSH",
+    "help": "Configuration for push, as stringified JSON. See http://docs.parseplatform.org/parse-server/guide/#push-notifications",
+    "action": parsers.objectParser
+  },
+  "readOnlyMasterKey": {
+    "env": "PARSE_SERVER_READ_ONLY_MASTER_KEY",
+    "help": "Read-only key, which has the same capabilities as MasterKey without writes"
+  },
+  "restAPIKey": {
+    "env": "PARSE_SERVER_REST_API_KEY",
+    "help": "Key for REST calls"
+  },
+  "revokeSessionOnPasswordReset": {
+    "env": "PARSE_SERVER_REVOKE_SESSION_ON_PASSWORD_RESET",
+    "help": "When a user changes their password, either through the reset password email or while logged in, all sessions are revoked if this is true. Set to false if you don't want to revoke sessions.",
+    "action": parsers.booleanParser,
+    "default": true
+  },
+  "scheduledPush": {
+    "env": "PARSE_SERVER_SCHEDULED_PUSH",
+    "help": "Configuration for push scheduling, defaults to false.",
+    "action": parsers.booleanParser,
+    "default": false
+  },
+  "schemaCacheTTL": {
+    "env": "PARSE_SERVER_SCHEMA_CACHE_TTL",
+    "help": "The TTL for caching the schema for optimizing read/write operations. You should put a long TTL when your DB is in production. default to 5000; set 0 to disable.",
+    "action": parsers.numberParser("schemaCacheTTL"),
+    "default": 5000
+  },
+  "serverCloseComplete": {
+    "env": "PARSE_SERVER_SERVER_CLOSE_COMPLETE",
+    "help": "Callback when server has closed"
+  },
+  "serverStartComplete": {
+    "env": "PARSE_SERVER_SERVER_START_COMPLETE",
+    "help": "Callback when server has started"
+  },
+  "serverURL": {
+    "env": "PARSE_SERVER_URL",
+    "help": "URL to your parse server with http:// or https://.",
+    "required": true
+  },
+  "sessionLength": {
+    "env": "PARSE_SERVER_SESSION_LENGTH",
+    "help": "Session duration, in seconds, defaults to 1 year",
+    "action": parsers.numberParser("sessionLength"),
+    "default": 31536000
+  },
+  "silent": {
+    "env": "SILENT",
+    "help": "Disables console output",
+    "action": parsers.booleanParser
+  },
+  "startLiveQueryServer": {
+    "env": "PARSE_SERVER_START_LIVE_QUERY_SERVER",
+    "help": "Starts the liveQuery server",
+    "action": parsers.booleanParser
+  },
+  "userSensitiveFields": {
+    "env": "PARSE_SERVER_USER_SENSITIVE_FIELDS",
+    "help": "Personally identifiable information fields in the user table the should be removed for non-authorized users. Deprecated @see protectedFields",
+    "action": parsers.arrayParser
+  },
+  "verbose": {
+    "env": "VERBOSE",
+    "help": "Set the logging to verbose",
+    "action": parsers.booleanParser
+  },
+  "verifyUserEmails": {
+    "env": "PARSE_SERVER_VERIFY_USER_EMAILS",
+    "help": "Enable (or disable) user email validation, defaults to false",
+    "action": parsers.booleanParser,
+    "default": false
+  },
+  "webhookKey": {
+    "env": "PARSE_SERVER_WEBHOOK_KEY",
+    "help": "Key sent with outgoing webhook calls"
+  }
 };
 module.exports.CustomPagesOptions = {
-  choosePassword: {
-    env: 'PARSE_SERVER_CUSTOM_PAGES_CHOOSE_PASSWORD',
-    help: 'choose password page path',
-  },
-  invalidLink: {
-    env: 'PARSE_SERVER_CUSTOM_PAGES_INVALID_LINK',
-    help: 'invalid link page path',
-  },
-  invalidVerificationLink: {
-    env: 'PARSE_SERVER_CUSTOM_PAGES_INVALID_VERIFICATION_LINK',
-    help: 'invalid verification link page path',
-  },
-  linkSendFail: {
-    env: 'PARSE_SERVER_CUSTOM_PAGES_LINK_SEND_FAIL',
-    help: 'verification link send fail page path',
-  },
-  linkSendSuccess: {
-    env: 'PARSE_SERVER_CUSTOM_PAGES_LINK_SEND_SUCCESS',
-    help: 'verification link send success page path',
-  },
-  parseFrameURL: {
-    env: 'PARSE_SERVER_CUSTOM_PAGES_PARSE_FRAME_URL',
-    help: 'for masking user-facing pages',
-  },
-  passwordResetSuccess: {
-    env: 'PARSE_SERVER_CUSTOM_PAGES_PASSWORD_RESET_SUCCESS',
-    help: 'password reset success page path',
-  },
-  verifyEmailSuccess: {
-    env: 'PARSE_SERVER_CUSTOM_PAGES_VERIFY_EMAIL_SUCCESS',
-    help: 'verify email success page path',
-  },
+  "choosePassword": {
+    "env": "PARSE_SERVER_CUSTOM_PAGES_CHOOSE_PASSWORD",
+    "help": "choose password page path"
+  },
+  "invalidLink": {
+    "env": "PARSE_SERVER_CUSTOM_PAGES_INVALID_LINK",
+    "help": "invalid link page path"
+  },
+  "invalidVerificationLink": {
+    "env": "PARSE_SERVER_CUSTOM_PAGES_INVALID_VERIFICATION_LINK",
+    "help": "invalid verification link page path"
+  },
+  "linkSendFail": {
+    "env": "PARSE_SERVER_CUSTOM_PAGES_LINK_SEND_FAIL",
+    "help": "verification link send fail page path"
+  },
+  "linkSendSuccess": {
+    "env": "PARSE_SERVER_CUSTOM_PAGES_LINK_SEND_SUCCESS",
+    "help": "verification link send success page path"
+  },
+  "parseFrameURL": {
+    "env": "PARSE_SERVER_CUSTOM_PAGES_PARSE_FRAME_URL",
+    "help": "for masking user-facing pages"
+  },
+  "passwordResetSuccess": {
+    "env": "PARSE_SERVER_CUSTOM_PAGES_PASSWORD_RESET_SUCCESS",
+    "help": "password reset success page path"
+  },
+  "verifyEmailSuccess": {
+    "env": "PARSE_SERVER_CUSTOM_PAGES_VERIFY_EMAIL_SUCCESS",
+    "help": "verify email success page path"
+  }
 };
 module.exports.LiveQueryOptions = {
-  classNames: {
-    env: 'PARSE_SERVER_LIVEQUERY_CLASSNAMES',
-    help: "parse-server's LiveQuery classNames",
-    action: parsers.arrayParser,
-  },
-  pubSubAdapter: {
-    env: 'PARSE_SERVER_LIVEQUERY_PUB_SUB_ADAPTER',
-    help: 'LiveQuery pubsub adapter',
-    action: parsers.moduleOrObjectParser,
-  },
-  redisOptions: {
-    env: 'PARSE_SERVER_LIVEQUERY_REDIS_OPTIONS',
-    help: "parse-server's LiveQuery redisOptions",
-    action: parsers.objectParser,
-  },
-  redisURL: {
-    env: 'PARSE_SERVER_LIVEQUERY_REDIS_URL',
-    help: "parse-server's LiveQuery redisURL",
-  },
-  wssAdapter: {
-    env: 'PARSE_SERVER_LIVEQUERY_WSS_ADAPTER',
-    help: 'Adapter module for the WebSocketServer',
-    action: parsers.moduleOrObjectParser,
-  },
+  "classNames": {
+    "env": "PARSE_SERVER_LIVEQUERY_CLASSNAMES",
+    "help": "parse-server's LiveQuery classNames",
+    "action": parsers.arrayParser
+  },
+  "pubSubAdapter": {
+    "env": "PARSE_SERVER_LIVEQUERY_PUB_SUB_ADAPTER",
+    "help": "LiveQuery pubsub adapter",
+    "action": parsers.moduleOrObjectParser
+  },
+  "redisOptions": {
+    "env": "PARSE_SERVER_LIVEQUERY_REDIS_OPTIONS",
+    "help": "parse-server's LiveQuery redisOptions",
+    "action": parsers.objectParser
+  },
+  "redisURL": {
+    "env": "PARSE_SERVER_LIVEQUERY_REDIS_URL",
+    "help": "parse-server's LiveQuery redisURL"
+  },
+  "wssAdapter": {
+    "env": "PARSE_SERVER_LIVEQUERY_WSS_ADAPTER",
+    "help": "Adapter module for the WebSocketServer",
+    "action": parsers.moduleOrObjectParser
+  }
 };
 module.exports.LiveQueryServerOptions = {
-  appId: {
-    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.',
-  },
-  cacheTimeout: {
-    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 5 * 1000 ms (5 seconds).",
-    action: parsers.numberParser('cacheTimeout'),
-  },
-  keyPairs: {
-    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,
-  },
-  logLevel: {
-    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.',
-  },
-  masterKey: {
-    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.',
-  },
-  port: {
-    env: 'PARSE_LIVE_QUERY_SERVER_PORT',
-    help: 'The port to run the LiveQuery server, defaults to 1337.',
-    action: parsers.numberParser('port'),
-    default: 1337,
-  },
-  pubSubAdapter: {
-    env: 'PARSE_LIVE_QUERY_SERVER_PUB_SUB_ADAPTER',
-    help: 'LiveQuery pubsub adapter',
-    action: parsers.moduleOrObjectParser,
-  },
-  redisOptions: {
-    env: 'PARSE_LIVE_QUERY_SERVER_REDIS_OPTIONS',
-    help: "parse-server's LiveQuery redisOptions",
-    action: parsers.objectParser,
-  },
-  redisURL: {
-    env: 'PARSE_LIVE_QUERY_SERVER_REDIS_URL',
-    help: "parse-server's LiveQuery redisURL",
-  },
-  serverURL: {
-    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.',
-  },
-  websocketTimeout: {
-    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'),
-  },
-  wssAdapter: {
-    env: 'PARSE_LIVE_QUERY_SERVER_WSS_ADAPTER',
-    help: 'Adapter module for the WebSocketServer',
-    action: parsers.moduleOrObjectParser,
-  },
+  "appId": {
+    "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."
+  },
+  "cacheTimeout": {
+    "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 5 * 1000 ms (5 seconds).",
+    "action": parsers.numberParser("cacheTimeout")
+  },
+  "keyPairs": {
+    "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
+  },
+  "logLevel": {
+    "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."
+  },
+  "masterKey": {
+    "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."
+  },
+  "port": {
+    "env": "PARSE_LIVE_QUERY_SERVER_PORT",
+    "help": "The port to run the LiveQuery server, defaults to 1337.",
+    "action": parsers.numberParser("port"),
+    "default": 1337
+  },
+  "pubSubAdapter": {
+    "env": "PARSE_LIVE_QUERY_SERVER_PUB_SUB_ADAPTER",
+    "help": "LiveQuery pubsub adapter",
+    "action": parsers.moduleOrObjectParser
+  },
+  "redisOptions": {
+    "env": "PARSE_LIVE_QUERY_SERVER_REDIS_OPTIONS",
+    "help": "parse-server's LiveQuery redisOptions",
+    "action": parsers.objectParser
+  },
+  "redisURL": {
+    "env": "PARSE_LIVE_QUERY_SERVER_REDIS_URL",
+    "help": "parse-server's LiveQuery redisURL"
+  },
+  "serverURL": {
+    "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."
+  },
+  "websocketTimeout": {
+    "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")
+  },
+  "wssAdapter": {
+    "env": "PARSE_LIVE_QUERY_SERVER_WSS_ADAPTER",
+    "help": "Adapter module for the WebSocketServer",
+    "action": parsers.moduleOrObjectParser
+  }
 };
 module.exports.IdempotencyOptions = {
-  paths: {
-    env: 'PARSE_SERVER_EXPERIMENTAL_IDEMPOTENCY_PATHS',
-    help:
-      'An array of paths for which the feature should be enabled. The mount path must not be included, for example instead of `/parse/functions/myFunction` specifiy `functions/myFunction`. The entries are interpreted as regular expression, for example `functions/.*` matches all functions, `jobs/.*` matches all jobs, `classes/.*` matches all classes, `.*` matches all paths.',
-    action: parsers.arrayParser,
-    default: [],
-  },
-  ttl: {
-    env: 'PARSE_SERVER_EXPERIMENTAL_IDEMPOTENCY_TTL',
-    help:
-      'The duration in seconds after which a request record is discarded from the database, defaults to 300s.',
-    action: parsers.numberParser('ttl'),
-    default: 300,
-  },
+  "paths": {
+    "env": "PARSE_SERVER_EXPERIMENTAL_IDEMPOTENCY_PATHS",
+    "help": "An array of paths for which the feature should be enabled. The mount path must not be included, for example instead of `/parse/functions/myFunction` specifiy `functions/myFunction`. The entries are interpreted as regular expression, for example `functions/.*` matches all functions, `jobs/.*` matches all jobs, `classes/.*` matches all classes, `.*` matches all paths.",
+    "action": parsers.arrayParser,
+    "default": []
+  },
+  "ttl": {
+    "env": "PARSE_SERVER_EXPERIMENTAL_IDEMPOTENCY_TTL",
+    "help": "The duration in seconds after which a request record is discarded from the database, defaults to 300s.",
+    "action": parsers.numberParser("ttl"),
+    "default": 300
+  }
 };
 module.exports.AccountLockoutOptions = {
-  duration: {
-    env: 'PARSE_SERVER_ACCOUNT_LOCKOUT_DURATION',
-    help:
-      'number of minutes that a locked-out account remains locked out before automatically becoming unlocked.',
-    action: parsers.numberParser('duration'),
-  },
-  threshold: {
-    env: 'PARSE_SERVER_ACCOUNT_LOCKOUT_THRESHOLD',
-    help: 'number of failed sign-in attempts that will cause a user account to be locked',
-    action: parsers.numberParser('threshold'),
-  },
+  "duration": {
+    "env": "PARSE_SERVER_ACCOUNT_LOCKOUT_DURATION",
+    "help": "number of minutes that a locked-out account remains locked out before automatically becoming unlocked.",
+    "action": parsers.numberParser("duration")
+  },
+  "threshold": {
+    "env": "PARSE_SERVER_ACCOUNT_LOCKOUT_THRESHOLD",
+    "help": "number of failed sign-in attempts that will cause a user account to be locked",
+    "action": parsers.numberParser("threshold")
+  },
+  "unlockOnPasswordReset": {
+    "env": "PARSE_SERVER_ACCOUNT_LOCKOUT_UNLOCK_ON_PASSWORD_RESET",
+    "help": "Is true if the account lock should be removed after a successful password reset.",
+    "action": parsers.booleanParser,
+    "default": false
+  }
 };
 module.exports.PasswordPolicyOptions = {
-  doNotAllowUsername: {
-    env: 'PARSE_SERVER_PASSWORD_POLICY_DO_NOT_ALLOW_USERNAME',
-    help: 'disallow username in passwords',
-    action: parsers.booleanParser,
-  },
-  maxPasswordAge: {
-    env: 'PARSE_SERVER_PASSWORD_POLICY_MAX_PASSWORD_AGE',
-    help: 'days for password expiry',
-    action: parsers.numberParser('maxPasswordAge'),
-  },
-  maxPasswordHistory: {
-    env: 'PARSE_SERVER_PASSWORD_POLICY_MAX_PASSWORD_HISTORY',
-    help: 'setting to prevent reuse of previous n passwords',
-    action: parsers.numberParser('maxPasswordHistory'),
-  },
-  resetTokenReuseIfValid: {
-    env: 'PARSE_SERVER_PASSWORD_POLICY_RESET_TOKEN_REUSE_IF_VALID',
-    help: "resend token if it's still valid",
-    action: parsers.booleanParser,
-  },
-  resetTokenValidityDuration: {
-    env: 'PARSE_SERVER_PASSWORD_POLICY_RESET_TOKEN_VALIDITY_DURATION',
-    help: 'time for token to expire',
-    action: parsers.numberParser('resetTokenValidityDuration'),
-  },
-  validatorCallback: {
-    env: 'PARSE_SERVER_PASSWORD_POLICY_VALIDATOR_CALLBACK',
-    help: 'a callback function to be invoked to validate the password',
-  },
-  validatorPattern: {
-    env: 'PARSE_SERVER_PASSWORD_POLICY_VALIDATOR_PATTERN',
-    help: 'a RegExp object or a regex string representing the pattern to enforce',
-  },
+  "doNotAllowUsername": {
+    "env": "PARSE_SERVER_PASSWORD_POLICY_DO_NOT_ALLOW_USERNAME",
+    "help": "disallow username in passwords",
+    "action": parsers.booleanParser
+  },
+  "maxPasswordAge": {
+    "env": "PARSE_SERVER_PASSWORD_POLICY_MAX_PASSWORD_AGE",
+    "help": "days for password expiry",
+    "action": parsers.numberParser("maxPasswordAge")
+  },
+  "maxPasswordHistory": {
+    "env": "PARSE_SERVER_PASSWORD_POLICY_MAX_PASSWORD_HISTORY",
+    "help": "setting to prevent reuse of previous n passwords",
+    "action": parsers.numberParser("maxPasswordHistory")
+  },
+  "resetTokenReuseIfValid": {
+    "env": "PARSE_SERVER_PASSWORD_POLICY_RESET_TOKEN_REUSE_IF_VALID",
+    "help": "resend token if it's still valid",
+    "action": parsers.booleanParser
+  },
+  "resetTokenValidityDuration": {
+    "env": "PARSE_SERVER_PASSWORD_POLICY_RESET_TOKEN_VALIDITY_DURATION",
+    "help": "time for token to expire",
+    "action": parsers.numberParser("resetTokenValidityDuration")
+  },
+  "validatorCallback": {
+    "env": "PARSE_SERVER_PASSWORD_POLICY_VALIDATOR_CALLBACK",
+    "help": "a callback function to be invoked to validate the password"
+  },
+  "validatorPattern": {
+    "env": "PARSE_SERVER_PASSWORD_POLICY_VALIDATOR_PATTERN",
+    "help": "a RegExp object or a regex string representing the pattern to enforce"
+  }
 };
 module.exports.FileUploadOptions = {
-  enableForAnonymousUser: {
-    env: 'PARSE_SERVER_FILE_UPLOAD_ENABLE_FOR_ANONYMOUS_USER',
-    help: 'Is true if file upload should be allowed for anonymous users.',
-    action: parsers.booleanParser,
-    default: false,
-  },
-  enableForAuthenticatedUser: {
-    env: 'PARSE_SERVER_FILE_UPLOAD_ENABLE_FOR_AUTHENTICATED_USER',
-    help: 'Is true if file upload should be allowed for authenticated users.',
-    action: parsers.booleanParser,
-    default: true,
-  },
-  enableForPublic: {
-    env: 'PARSE_SERVER_FILE_UPLOAD_ENABLE_FOR_PUBLIC',
-    help: 'Is true if file upload should be allowed for anyone, regardless of user authentication.',
-    action: parsers.booleanParser,
-    default: false,
-  },
+  "enableForAnonymousUser": {
+    "env": "PARSE_SERVER_FILE_UPLOAD_ENABLE_FOR_ANONYMOUS_USER",
+    "help": "Is true if file upload should be allowed for anonymous users.",
+    "action": parsers.booleanParser,
+    "default": false
+  },
+  "enableForAuthenticatedUser": {
+    "env": "PARSE_SERVER_FILE_UPLOAD_ENABLE_FOR_AUTHENTICATED_USER",
+    "help": "Is true if file upload should be allowed for authenticated users.",
+    "action": parsers.booleanParser,
+    "default": true
+  },
+  "enableForPublic": {
+    "env": "PARSE_SERVER_FILE_UPLOAD_ENABLE_FOR_PUBLIC",
+    "help": "Is true if file upload should be allowed for anyone, regardless of user authentication.",
+    "action": parsers.booleanParser,
+    "default": false
+  }
 };
diff --git a/src/Options/docs.js b/src/Options/docs.js
index a70fa8bff2..015135ce07 100644
--- a/src/Options/docs.js
+++ b/src/Options/docs.js
@@ -126,6 +126,7 @@
  * @interface AccountLockoutOptions
  * @property {Number} duration number of minutes that a locked-out account remains locked out before automatically becoming unlocked.
  * @property {Number} threshold number of failed sign-in attempts that will cause a user account to be locked
+ * @property {Boolean} unlockOnPasswordReset Is true if the account lock should be removed after a successful password reset.
  */
 
 /**
@@ -145,3 +146,4 @@
  * @property {Boolean} enableForAuthenticatedUser Is true if file upload should be allowed for authenticated users.
  * @property {Boolean} enableForPublic Is true if file upload should be allowed for anyone, regardless of user authentication.
  */
+
diff --git a/src/Options/index.js b/src/Options/index.js
index 84a9283bbc..b8fd077f1c 100644
--- a/src/Options/index.js
+++ b/src/Options/index.js
@@ -301,6 +301,9 @@ export interface AccountLockoutOptions {
   duration: ?number;
   /* number of failed sign-in attempts that will cause a user account to be locked */
   threshold: ?number;
+  /* Is true if the account lock should be removed after a successful password reset.
+  :DEFAULT: false */
+  unlockOnPasswordReset: ?boolean;
 }
 
 export interface PasswordPolicyOptions {

From 080fd0ca484b196f5842f13819f5b4e07f536516 Mon Sep 17 00:00:00 2001
From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com>
Date: Thu, 28 Jan 2021 16:16:03 +0100
Subject: [PATCH 6/8] added changelog entry

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a12739f78..23a856e12d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@
 ### master
 [Full Changelog](https://github.com/parse-community/parse-server/compare/4.5.0...master)
 
+- IMPROVE: Added new account lockout policy option `accountLockout.unlockOnPasswordReset` to automatically unlock account on password reset. [#7146](https://github.com/parse-community/parse-server/pull/7146). Thanks to [Manuel Trezza](https://github.com/mtrezza).
+
 __BREAKING CHANGES:__
 - NEW: Added file upload restriction. File upload is now only allowed for authenticated users by default for improved security. To allow file upload also for Anonymous Users or Public, set the `fileUpload` parameter in the [Parse Server Options](https://parseplatform.org/parse-server/api/master/ParseServerOptions.html). [#7071](https://github.com/parse-community/parse-server/pull/7071). Thanks to [dblythy](https://github.com/dblythy).
 ___

From 0bb6743b4e6dbc4b17dd44d60e01e545206dbc6b Mon Sep 17 00:00:00 2001
From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com>
Date: Thu, 28 Jan 2021 16:18:03 +0100
Subject: [PATCH 7/8] Added docs entry

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 7a5a707575..70053e8438 100644
--- a/README.md
+++ b/README.md
@@ -307,6 +307,8 @@ var server = ParseServer({
   accountLockout: {
     duration: 5, // duration policy setting determines the number of minutes that a locked-out account remains locked out before automatically becoming unlocked. Set it to a value greater than 0 and less than 100000.
     threshold: 3, // threshold policy setting determines the number of failed sign-in attempts that will cause a user account to be locked. Set it to an integer value greater than 0 and less than 1000.
+    unlockOnPasswordReset: true, // Is true if the account lock should be removed after a successful password reset. Default: false.
+}
   },
   // optional settings to enforce password policies
   passwordPolicy: {

From fbc87484af24e10b063b81b9b3ea3085ea45f88e Mon Sep 17 00:00:00 2001
From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com>
Date: Thu, 28 Jan 2021 17:19:41 +0100
Subject: [PATCH 8/8] moved changelog entry to correct position

---
 CHANGELOG.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23a856e12d..411142f523 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,11 +3,10 @@
 ### master
 [Full Changelog](https://github.com/parse-community/parse-server/compare/4.5.0...master)
 
-- IMPROVE: Added new account lockout policy option `accountLockout.unlockOnPasswordReset` to automatically unlock account on password reset. [#7146](https://github.com/parse-community/parse-server/pull/7146). Thanks to [Manuel Trezza](https://github.com/mtrezza).
-
 __BREAKING CHANGES:__
 - NEW: Added file upload restriction. File upload is now only allowed for authenticated users by default for improved security. To allow file upload also for Anonymous Users or Public, set the `fileUpload` parameter in the [Parse Server Options](https://parseplatform.org/parse-server/api/master/ParseServerOptions.html). [#7071](https://github.com/parse-community/parse-server/pull/7071). Thanks to [dblythy](https://github.com/dblythy).
 ___
+- IMPROVE: Added new account lockout policy option `accountLockout.unlockOnPasswordReset` to automatically unlock account on password reset. [#7146](https://github.com/parse-community/parse-server/pull/7146). Thanks to [Manuel Trezza](https://github.com/mtrezza).
 - IMPROVE: Optimize queries on classes with pointer permissions. [#7061](https://github.com/parse-community/parse-server/pull/7061). Thanks to [Pedro Diaz](https://github.com/pdiaz)
 - FIX: request.context for afterFind triggers. [#7078](https://github.com/parse-community/parse-server/pull/7078). Thanks to [dblythy](https://github.com/dblythy)
 - NEW: Added convenience method Parse.Cloud.sendEmail(...) to send email via email adapter in Cloud Code. [#7089](https://github.com/parse-community/parse-server/pull/7089). Thanks to [dblythy](https://github.com/dblythy)