Merge branch 'master' into snyk-upgrade-5e0fcce6684aa5bee2f660563eb8c08e

Author: dplewis

package-lock.json

@@ -42,13 +42,13 @@
     "intersect": "1.0.1",
     "jsonwebtoken": "8.5.1",
     "jwks-rsa": "1.11.0",
-    "ldapjs": "2.2.0",
+    "ldapjs": "2.2.1",
     "lodash": "4.17.20",
     "lru-cache": "5.1.1",
     "mime": "2.4.6",
     "mongodb": "3.6.3",
     "parse": "2.18.0",
-    "pg-promise": "10.7.3",
+    "pg-promise": "10.8.1",
     "pluralize": "8.0.0",
     "redis": "3.0.2",
     "semver": "7.3.2",
@@ -87,7 +87,7 @@
     "jsdoc": "3.6.3",
     "jsdoc-babel": "0.5.0",
     "lint-staged": "10.2.3",
-    "mongodb-runner": "4.8.0",
+    "mongodb-runner": "mongodb-js/runner",
     "node-fetch": "2.6.1",
     "nyc": "15.1.0",
     "prettier": "2.0.5"
@@ -113,7 +113,7 @@
     "node": ">= 8"
   },
   "bin": {
-    "parse-server": "./bin/parse-server"
+    "parse-server": "bin/parse-server"
   },
   "optionalDependencies": {
     "@node-rs/bcrypt": "0.4.1"

package.json

@@ -40,20 +40,17 @@ function getCommentValue(comment) {
 }
 
 function getENVPrefix(iface) {
-  if (iface.id.name === 'ParseServerOptions') {
-    return 'PARSE_SERVER_';
+  const options = {
+    'ParseServerOptions' : 'PARSE_SERVER_',
+    'CustomPagesOptions' : 'PARSE_SERVER_CUSTOM_PAGES_',
+    'LiveQueryServerOptions' : 'PARSE_LIVE_QUERY_SERVER_',
+    'LiveQueryOptions' : 'PARSE_SERVER_LIVEQUERY_',
+    'IdempotencyOptions' : 'PARSE_SERVER_EXPERIMENTAL_IDEMPOTENCY_',
+    'AccountLockoutOptions' : 'PARSE_SERVER_ACCOUNT_LOCKOUT_',
+    'PasswordPolicyOptions' : 'PARSE_SERVER_PASSWORD_POLICY_'
   }
-  if (iface.id.name === 'CustomPagesOptions') {
-    return 'PARSE_SERVER_CUSTOM_PAGES_';
-  }
-  if (iface.id.name === 'LiveQueryServerOptions') {
-    return 'PARSE_LIVE_QUERY_SERVER_';
-  }
-  if (iface.id.name === 'LiveQueryOptions') {
-    return 'PARSE_SERVER_LIVEQUERY_';
-  }
-  if (iface.id.name === 'IdempotencyOptions') {
-    return 'PARSE_SERVER_EXPERIMENTAL_IDEMPOTENCY_';
+  if (options[iface.id.name]) {
+    return options[iface.id.name]
   }
 }