chore(release): 5.2.1-alpha.2 [skip ci]

## [5.2.1-alpha.2](https://github.com/parse-community/parse-server/compare/5.2.1-alpha.1...5.2.1-alpha.2) (2022-03-26) ### Performance Improvements * reduce database operations when using the constant parameter in Cloud Function validation ([#7892](https://github.com/parse-community/parse-server/issues/7892)) ([48bd512](https://github.com/parse-community/parse-server/commit/48bd512eeb47666967dff8c5e723ddc5b7801daa))
perf: reduce database operations when using the constant parameter in Cloud Function validation (#7892 )
2026-08-09 13:03:18 +00:00 · 2022-03-26 14:30:48 +00:00 · 2022-03-26 15:29:39 +01:00 · 2022-03-26 02:40:21 +00:00 · 2022-03-26 03:39:16 +01:00 · 2022-03-25 19:47:05 +01:00
53 changed files with 2777 additions and 2136 deletions
@@ -6,7 +6,7 @@ on:
    branches:
      - '**'
 env:
-  NODE_VERSION: 14.18.1
+  NODE_VERSION: 16.13.0
  PARSE_SERVER_TEST_TIMEOUT: 20000
 jobs:
  check-ci:
@@ -105,43 +105,43 @@ jobs:
            MONGODB_VERSION: 5.0.3
            MONGODB_TOPOLOGY: replicaset
            MONGODB_STORAGE_ENGINE: wiredTiger
-            NODE_VERSION: 14.18.1
+            NODE_VERSION: 16.13.0
          - name: MongoDB 4.4, ReplicaSet, WiredTiger
            MONGODB_VERSION: 4.4.10
            MONGODB_TOPOLOGY: replicaset
            MONGODB_STORAGE_ENGINE: wiredTiger
-            NODE_VERSION: 14.18.1
+            NODE_VERSION: 16.13.0
          - name: MongoDB 4.2, ReplicaSet, WiredTiger
            MONGODB_VERSION: 4.2.17
            MONGODB_TOPOLOGY: replicaset
            MONGODB_STORAGE_ENGINE: wiredTiger
-            NODE_VERSION: 14.18.1
+            NODE_VERSION: 16.13.0
          - name: MongoDB 4.0, ReplicaSet, WiredTiger
            MONGODB_VERSION: 4.0.27
            MONGODB_TOPOLOGY: replicaset
            MONGODB_STORAGE_ENGINE: wiredTiger
-            NODE_VERSION: 14.18.1
+            NODE_VERSION: 16.13.0
          - name: MongoDB 4.0, Standalone, MMAPv1
            MONGODB_VERSION: 4.0.27
            MONGODB_TOPOLOGY: standalone
            MONGODB_STORAGE_ENGINE: mmapv1
-            NODE_VERSION: 14.18.1
+            NODE_VERSION: 16.13.0
          - name: Redis Cache
            PARSE_SERVER_TEST_CACHE: redis
            MONGODB_VERSION: 4.4.10
            MONGODB_TOPOLOGY: standalone
            MONGODB_STORAGE_ENGINE: wiredTiger
-            NODE_VERSION: 14.18.1
+            NODE_VERSION: 16.13.0
          - name: Node 12
            MONGODB_VERSION: 4.4.10
            MONGODB_TOPOLOGY: standalone
            MONGODB_STORAGE_ENGINE: wiredTiger
            NODE_VERSION: 12.22.7
-          - name: Node 15
+          - name: Node 14
            MONGODB_VERSION: 4.4.10
            MONGODB_TOPOLOGY: standalone
            MONGODB_STORAGE_ENGINE: wiredTiger
-            NODE_VERSION: 15.14.0
+            NODE_VERSION: 14.18.1
      fail-fast: false
    name: ${{ matrix.name }}
    timeout-minutes: 15
@@ -183,19 +183,22 @@ jobs:
        include:
          - name: PostgreSQL 11, PostGIS 3.0
            POSTGRES_IMAGE: postgis/postgis:11-3.0
-            NODE_VERSION: 14.18.1
+            NODE_VERSION: 16.13.0
          - name: PostgreSQL 11, PostGIS 3.1
            POSTGRES_IMAGE: postgis/postgis:11-3.1
-            NODE_VERSION: 14.18.1
-          - name: PostgreSQL 12, PostGIS 3.1
-            POSTGRES_IMAGE: postgis/postgis:12-3.1
-            NODE_VERSION: 14.18.1
-          - name: PostgreSQL 13, PostGIS 3.1
-            POSTGRES_IMAGE: postgis/postgis:13-3.1
-            NODE_VERSION: 14.18.1
-          - name: PostgreSQL 14, PostGIS 3.1
-            POSTGRES_IMAGE: postgis/postgis:14-3.1
-            NODE_VERSION: 14.18.1
+            NODE_VERSION: 16.13.0
+          - name: PostgreSQL 11, PostGIS 3.2
+            POSTGRES_IMAGE: postgis/postgis:11-3.2
+            NODE_VERSION: 16.13.0
+          - name: PostgreSQL 12, PostGIS 3.2
+            POSTGRES_IMAGE: postgis/postgis:12-3.2
+            NODE_VERSION: 16.13.0
+          - name: PostgreSQL 13, PostGIS 3.2
+            POSTGRES_IMAGE: postgis/postgis:13-3.2
+            NODE_VERSION: 16.13.0
+          - name: PostgreSQL 14, PostGIS 3.2
+            POSTGRES_IMAGE: postgis/postgis:14-3.2
+            NODE_VERSION: 16.13.0
      fail-fast: false
    name: ${{ matrix.name }}
    timeout-minutes: 15
@@ -30,7 +30,7 @@ jobs:
      - run: npx semantic-release
        env:
          GH_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
      - name: Determine tag on current commit
        id: tag
@@ -42,8 +42,7 @@ Details:
 - Suitable environment: experimental


-[log_release]: https://github.com/parse-community/parse-server/blob/release/CHANGELOG.md
-<!--[log_release]: https://github.com/parse-community/parse-server/blob/release/changelogs/CHANGELOG_release.md -->
+[log_release]: https://github.com/parse-community/parse-server/blob/release/changelogs/CHANGELOG_release.md
 [log_beta]: https://github.com/parse-community/parse-server/blob/beta/changelogs/CHANGELOG_beta.md
 [log_alpha]: https://github.com/parse-community/parse-server/blob/alpha/changelogs/CHANGELOG_alpha.md
 [branch_release]: https://github.com/parse-community/parse-server/tree/release
@@ -22,6 +22,11 @@
 - [Pull Request](#pull-request)
  - [Breaking Change](#breaking-change)
 - [Merging](#merging)
+  - [Breaking Change](#breaking-change-1)
+  - [Reverting](#reverting)
+- [Releasing](#releasing)
+  - [General Considerations](#general-considerations)
+  - [Major Release / Long-Term-Support](#major-release--long-term-support)
 - [Versioning](#versioning)
 - [Code of Conduct](#code-of-conduct)

@@ -154,7 +159,7 @@ If your pull request introduces a change that may affect the storage or retrieva
 [PostGIS images (select one with v2.2 or higher) on docker dashboard](https://hub.docker.com/r/postgis/postgis) is based off of the official [postgres](https://registry.hub.docker.com/_/postgres/) image and will work out-of-the-box (as long as you create a user with the necessary extensions for each of your Parse databases; see below). To launch the compatible Postgres instance, copy and paste the following line into your shell:

 ```
-docker run -d --name parse-postgres -p 5432:5432 -e POSTGRES_PASSWORD=password --rm postgis/postgis:13-3.1-alpine && sleep 20 && docker exec -it parse-postgres psql -U postgres -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' && docker exec -it parse-postgres psql -U postgres -c 'CREATE EXTENSION pgcrypto; CREATE EXTENSION postgis;' -d parse_server_postgres_adapter_test_database && docker exec -it parse-postgres psql -U postgres -c 'CREATE EXTENSION postgis_topology;' -d parse_server_postgres_adapter_test_database
+docker run -d --name parse-postgres -p 5432:5432 -e POSTGRES_PASSWORD=password --rm postgis/postgis:13-3.2-alpine && sleep 20 && docker exec -it parse-postgres psql -U postgres -c 'CREATE DATABASE parse_server_postgres_adapter_test_database;' && docker exec -it parse-postgres psql -U postgres -c 'CREATE EXTENSION pgcrypto; CREATE EXTENSION postgis;' -d parse_server_postgres_adapter_test_database && docker exec -it parse-postgres psql -U postgres -c 'CREATE EXTENSION postgis_topology;' -d parse_server_postgres_adapter_test_database
 ```
 To stop the Postgres instance:

@@ -162,7 +167,7 @@ To stop the Postgres instance:
 docker stop parse-postgres
 ```

-You can also use the [postgis/postgis:13-3.1-alpine](https://hub.docker.com/r/postgis/postgis) image in a Dockerfile and copy this [script](https://github.com/parse-community/parse-server/blob/master/scripts/before_script_postgres.sh) to the image by adding the following lines:
+You can also use the [postgis/postgis:13-3.2-alpine](https://hub.docker.com/r/postgis/postgis) image in a Dockerfile and copy this [script](https://github.com/parse-community/parse-server/blob/master/scripts/before_script_postgres.sh) to the image by adding the following lines:

 ```
 #Install additional scripts. These are run in abc order during initial start
@@ -303,7 +308,7 @@ For release automation, the title of pull requests needs to be written in a defi
 ```

 The _type_ is the category of change that is made, possible types are:
- `feat` - add a new feature
+- `feat` - add a new feature or improve an existing feature
 - `fix` - fix a bug
 - `refactor` - refactor code without impact on features or performance
 - `docs` - add or edit code comments, documentation, GitHub pages
@@ -335,8 +340,13 @@ If a pull request contains a braking change, the description of the pull request

 The following guide is for anyone who merges a contributor pull request into the working branch, the working branch into a release branch, a release branch into another release branch, or any other direct commits such as hotfixes into release branches or the working branch.

- For changelog generation, only the commit message set when merging the pull request is relevant. The title and description of the GitHub pull request as authored by the contributor have no influence on the changelog generation. However, the title of the GitHub pull request should be used as the commit message.
- If the pull request contains a breaking change, the commit message must contain the phrase `BREAKING CHANGE`, capitalized and without any formatting, followed by a short description of the breaking change and ideally how the developer should address it, all in a single line. This line should contain more details focusing on the "breaking” aspect of the change and is intended to assist the developer in adapting. Keep it concise, as it will become part of the changelog entry, for example:
+- A contributor pull request must be merged into the working branch using `Squash and Merge`, to create a single commit message that describes the change.
+- A release branch or the default branch must be merged into another release branch using `Merge Commit`, to preserve each individual commit message that describes its respective change.
+- For changelog generation, only the commit message set when merging the pull request is relevant. The title and description of the GitHub pull request as authored by the contributor have no influence on the changelog generation. However, the title of the GitHub pull request should be used as the commit message. See the following chapters for considerations in special scenarios, e.g. merging a breaking change or reverting a commit.
+
+### Breaking Change
+
+If the pull request contains a breaking change, the commit message must contain the phrase `BREAKING CHANGE`, capitalized and without any formatting, followed by a short description of the breaking change and ideally how the developer should address it, all in a single line. This line should contain more details focusing on the "breaking” aspect of the change and is intended to assist the developer in adapting. Keep it concise, as it will become part of the changelog entry, for example:

  ```
  fix: remove handle from door
@@ -344,8 +354,55 @@ The following guide is for anyone who merges a contributor pull request into the
  BREAKING CHANGE: You cannot open the door anymore by using a handle. See the [#migration guide](http://example.com) for more details.
  ```
  Keep in mind that in a repository with release automation, merging such a commit message will trigger a release with a major version increment.
- A contributor pull request must be merged into the working branch using `Squash and Merge`, to create a single commit message that describes the change.
- A release branch or the default branch must be merged into another release branch using `Merge Commit`, to preserve each individual commit message that describes its respective change.
+
+### Reverting
+
+If the commit reverts a previous commit, use the prefix `revert:`, followed by the header of the reverted commit. In the body of the commit message add `This reverts commit <hash>.`, where the hash is the SHA of the commit being reverted. For example:
+
+  ```
+  revert: fix: remove handle from door
+  
+  This reverts commit 1234567890abcdef.
+  ```
+
+⚠️ A `revert` prefix will *always* trigger a release. Generally, a commit that did not trigger a release when it was initially merged should also not trigger a release when it is reverted. For example, do not use the `revert` prefix when reverting a commit that has a `ci` prefix:
+
+  ```
+  ci: add something
+  ```
+  is reverted with:
+  ```
+  ci: remove something
+  ```
+  instead of:
+  ```
+  revert: ci: add something
+  
+  This reverts commit 1234567890abcdef.
+  ```
+
+## Releasing
+
+### General Considerations
+
+- The `package-lock.json` file has to be deleted and recreated by npm from scratch in regular intervals using the `npm i` command. It is not enough to only update the file via automated security pull requests (e.g. dependabot, snyk), that can create inconsistencies between sub-devependencies of a dependency and increase the chances of vulnerabilities. The file should be recreated once every release cycle which is usually monthly.
+
+### Major Release / Long-Term-Support
+
+Long-Term-Support (LTS) is provided for the previous Parse Server major version. For example, Parse Server 4.x will receive security updates until Parse Server 5.x is superseded by Parse Server 6.x and becomes the new LTS version. While the current major version is published on branch `release`, a LTS version is published on branch `release-#.x.x`, for example `release-4.x.x` for the Parse Server 4.x LTS branch. 
+
+#### Preparing Release
+
+The following changes are done in the `alpha` branch, before publishing the last `beta` version that will eventually become the major release. This way the changes trickle naturally through all branches and code consistency is ensured among branches.
+
+- Make sure all [deprecations](https://github.com/parse-community/parse-server/blob/alpha/DEPRECATIONS.md) are reflected in code, old code is removed and the deprecations table is updated.
+- Add the future LTS branch `release-#.x.x` to the branch list in [release.config.js](https://github.com/parse-community/parse-server/blob/alpha/release.config.js) so that the branch will later be recognized for release automation.
+
+#### Publishing Release
+
+1. Create LTS branch `release-#.x.x` off the latest version tag on `release` branch.
+2. Create temporary branch `build-release` off branch `beta` and create a pull request with `release` as the base branch.
+3. Merge branch `build-release` into `release`. Given that there will be breaking changes, a new major release will be created. In the unlikely case that there have been no breaking changes between the previous major release and the upcoming release, a major version increment has to be triggered manually. See the docs of the release automation framework for how to do that.

 ## Versioning

@@ -5,17 +5,16 @@
 [![Build Status](https://github.com/parse-community/parse-server/workflows/ci/badge.svg?branch=alpha)](https://github.com/parse-community/parse-server/actions?query=workflow%3Aci+branch%3Aalpha)
 [![Snyk Badge](https://snyk.io/test/github/parse-community/parse-server/badge.svg)](https://snyk.io/test/github/parse-community/parse-server)
 [![Coverage](https://img.shields.io/codecov/c/github/parse-community/parse-server/alpha.svg)](https://codecov.io/github/parse-community/parse-server?branch=alpha)
+[![auto-release](https://img.shields.io/badge/%F0%9F%9A%80-auto--release-9e34eb.svg)](https://github.com/parse-community/parse-dashboard/releases)

-[![Node Version](https://img.shields.io/badge/nodejs-12,_14,_15-green.svg?logo=node.js&style=flat)](https://nodejs.org)
+[![Node Version](https://img.shields.io/badge/nodejs-12,_14,_16-green.svg?logo=node.js&style=flat)](https://nodejs.org)
 [![MongoDB Version](https://img.shields.io/badge/mongodb-4.0,_4.2,_4.4,_5.0-green.svg?logo=mongodb&style=flat)](https://www.mongodb.com)
 [![Postgres Version](https://img.shields.io/badge/postgresql-11,_12,_13,_14-green.svg?logo=postgresql&style=flat)](https://www.postgresql.org)
-[![auto-release](https://img.shields.io/badge/%F0%9F%9A%80-auto--release-9e34eb.svg)](https://github.com/parse-community/parse-dashboard/releases)

 [![npm latest version](https://img.shields.io/npm/v/parse-server/latest.svg)](https://www.npmjs.com/package/parse-server)
 [![npm beta version](https://img.shields.io/npm/v/parse-server/beta.svg)](https://www.npmjs.com/package/parse-server)
 [![npm alpha version](https://img.shields.io/npm/v/parse-server/alpha.svg)](https://www.npmjs.com/package/parse-server)

-
 [![Backers on Open Collective](https://opencollective.com/parse-server/backers/badge.svg)][open-collective-link]
 [![Sponsors on Open Collective](https://opencollective.com/parse-server/sponsors/badge.svg)][open-collective-link]
 [![License][license-svg]][license-link]
@@ -30,11 +29,15 @@ The full documentation for Parse Server is available in the [wiki](https://githu

 ---

-A big *thank you* to all our backers and sponsors who support the development of Parse Platform!
+A big *thank you* 🙏 to our [sponsors](#sponsors) and [backers](#backers) who support the development of Parse Platform!

-### 💎 Diamond Sponsors
-    
-[![Sponsor](https://opencollective.com/parse-server/sponsor/0/avatar.svg)](https://opencollective.com/parse-server/sponsor/0/website)
+### Diamond Sponsors
+
+[![Diamond Sponsors](https://opencollective.com/parse-server/tiers/diamond-sponsor.svg?avatarHeight=70&button=false)](https://opencollective.com/parse-server/contribute/diamond-sponsor-10560)
+
+#### Bronze Sponsors
+
+[![Bronze Sponsors](https://opencollective.com/parse-server/tiers/bronze-sponsor.svg?avatarHeight=36&button=false)](https://opencollective.com/parse-server/contribute/bronze-sponsor-10559)

 ---

@@ -113,8 +116,8 @@ Parse Server is continuously tested with the most recent releases of Node.js to
 |------------|----------------|-------------|---------------|
 | Node.js 12 | 12.22.7        | April 2022  | ✅ Yes        |
 | Node.js 14 | 14.18.1        | April 2023  | ✅ Yes        |
-| Node.js 15 | 15.14.0        | June 2021   | ✅ Yes        |
-| Node.js 16 | 16.x.x         | April 2024  | ❌ Not tested |
+| Node.js 16 | 16.13.0        | April 2024  | ✅ Yes        |
+| Node.js 17 | 17.x           | June 2022   | ❌ Not tested |

 #### MongoDB
 Parse Server is continuously tested with the most recent releases of MongoDB to ensure compatibility. We follow the [MongoDB support schedule](https://www.mongodb.com/support-policy) and only test against versions that are officially supported and have not reached their end-of-life date.
@@ -131,10 +134,10 @@ Parse Server is continuously tested with the most recent releases of PostgreSQL

 | Version     | PostGIS Version | End-of-Life   | Parse Server Support End | Compatible |
 |-------------|-----------------|---------------|--------------------------|------------|
-| Postgres 11 | 3.0, 3.1        | November 2023 | April 2022               | ✅ Yes     |
-| Postgres 12 | 3.1             | November 2024 | April 2023               | ✅ Yes     |
-| Postgres 13 | 3.1             | November 2025 | April 2024               | ✅ Yes     |
-| Postgres 14 | 3.1             | November 2026 | April 2025               | ✅ Yes     |
+| Postgres 11 | 3.0, 3.1, 3.2   | November 2023 | April 2022               | ✅ Yes     |
+| Postgres 12 | 3.2             | November 2024 | April 2023               | ✅ Yes     |
+| Postgres 13 | 3.2             | November 2025 | April 2024               | ✅ Yes     |
+| Postgres 14 | 3.2             | November 2026 | April 2025               | ✅ Yes     |

 ### Locally
 ```bash
@@ -486,11 +489,12 @@ You can also find more adapters maintained by the community by searching on [npm

 Parse Server allows developers to choose from several options when hosting files:

-* `GridFSBucketAdapter`, which is backed by MongoDB;
-* `S3Adapter`, which is backed by [Amazon S3](https://aws.amazon.com/s3/); or
-* `GCSAdapter`, which is backed by [Google Cloud Storage](https://cloud.google.com/storage/)
+* `GridFSBucketAdapter` - which is backed by MongoDB
+* `S3Adapter` - which is backed by [Amazon S3](https://aws.amazon.com/s3/)
+* `GCSAdapter` - which is backed by [Google Cloud Storage](https://cloud.google.com/storage/)
+* `FSAdapter` - local file storage

-`GridFSBucketAdapter` is used by default and requires no setup, but if you're interested in using S3 or Google Cloud Storage, additional configuration information is available in the [Parse Server guide](http://docs.parseplatform.org/parse-server/guide/#configuring-file-adapters).
+`GridFSBucketAdapter` is used by default and requires no setup, but if you're interested in using Amazon S3, Google Cloud Storage, or local file storage, additional configuration information is available in the [Parse Server guide](http://docs.parseplatform.org/parse-server/guide/#configuring-file-adapters).

 ## Idempotency Enforcement
 
@@ -521,9 +525,26 @@ let api = new ParseServer({
 | `idempotencyOptions.paths` | yes      | `Array<String>` | `[]`          | `.*` (all paths, includes the examples below), <br>`functions/.*` (all functions), <br>`jobs/.*` (all jobs), <br>`classes/.*` (all classes), <br>`functions/.*` (all functions), <br>`users` (user creation / update), <br>`installations` (installation creation / update) | PARSE_SERVER_EXPERIMENTAL_IDEMPOTENCY_PATHS   | An array of path patterns that have to match the request path for request deduplication to be enabled. The mount path must not be included, for example to match the request path `/parse/functions/myFunction` specify the path pattern `functions/myFunction`. A trailing slash of the request path is ignored, for example the path pattern `functions/myFunction` matches both `/parse/functions/myFunction` and `/parse/functions/myFunction/`. |
 | `idempotencyOptions.ttl`   | yes      | `Integer`       | `300`         | `60` (60 seconds)                                                                                                                                                                                                                                                           | PARSE_SERVER_EXPERIMENTAL_IDEMPOTENCY_TTL     | The duration in seconds after which a request record is discarded from the database. Duplicate requests due to network issues can be expected to arrive within milliseconds up to several seconds. This value must be greater than `0`.                                                                                                                                                                                                              |

-### Notes <!-- omit in toc -->
+### Postgres <!-- omit in toc -->

- This feature is currently only available for MongoDB and not for Postgres.
+To use this feature in Postgres, you will need to create a cron job using [pgAdmin](https://www.pgadmin.org/docs/pgadmin4/development/pgagent_jobs.html) or similar to call the Postgres function `idempotency_delete_expired_records()` that deletes expired idempotency records. You can find an example script below. Make sure the script has the same privileges to log into Postgres as Parse Server.
+
+```bash
+#!/bin/bash
+
+set -e
+psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
+    SELECT idempotency_delete_expired_records();
+EOSQL
+
+exec "$@"
+```
+
+Assuming the script above is named, `parse_idempotency_delete_expired_records.sh`, a cron job that runs the script every 2 minutes may look like:
+
+```bash
+2 * * * * /root/parse_idempotency_delete_expired_records.sh >/dev/null 2>&1
+```

 ## Localization

@@ -1,3 +1,221 @@
+## [5.2.1-alpha.2](https://github.com/parse-community/parse-server/compare/5.2.1-alpha.1...5.2.1-alpha.2) (2022-03-26)
+
+
+### Performance Improvements
+
+* reduce database operations when using the constant parameter in Cloud Function validation ([#7892](https://github.com/parse-community/parse-server/issues/7892)) ([48bd512](https://github.com/parse-community/parse-server/commit/48bd512eeb47666967dff8c5e723ddc5b7801daa))
+
+## [5.2.1-alpha.1](https://github.com/parse-community/parse-server/compare/5.2.0...5.2.1-alpha.1) (2022-03-26)
+
+
+### Bug Fixes
+
+* return correct response when revert is used in beforeSave ([#7839](https://github.com/parse-community/parse-server/issues/7839)) ([f63fb2b](https://github.com/parse-community/parse-server/commit/f63fb2b338c908f0e7a648d338c26b9daa50c8f2))
+
+# [5.2.0-alpha.3](https://github.com/parse-community/parse-server/compare/5.2.0-alpha.2...5.2.0-alpha.3) (2022-03-24)
+
+
+### Bug Fixes
+
+* security bump minimist from 1.2.5 to 1.2.6 ([#7884](https://github.com/parse-community/parse-server/issues/7884)) ([c5cf282](https://github.com/parse-community/parse-server/commit/c5cf282d11ffdc023764f8e7539a2bd6bc246fe1))
+
+# [5.2.0-alpha.2](https://github.com/parse-community/parse-server/compare/5.2.0-alpha.1...5.2.0-alpha.2) (2022-03-24)
+
+
+### Bug Fixes
+
+* sensitive keyword detection may produce false positives ([#7881](https://github.com/parse-community/parse-server/issues/7881)) ([0d6f9e9](https://github.com/parse-community/parse-server/commit/0d6f9e951d9e186e95e96d8869066ce7022bad02))
+
+# [5.2.0-alpha.1](https://github.com/parse-community/parse-server/compare/5.1.1...5.2.0-alpha.1) (2022-03-23)
+
+
+### Features
+
+* improved LiveQuery error logging with additional information ([#7837](https://github.com/parse-community/parse-server/issues/7837)) ([443a509](https://github.com/parse-community/parse-server/commit/443a5099059538d379fe491793a5871fcbb4f377))
+
+# [5.0.0-alpha.29](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.28...5.0.0-alpha.29) (2022-03-12)
+
+
+### Features
+
+* bump required node engine to >=12.22.10 ([#7846](https://github.com/parse-community/parse-server/issues/7846)) ([5ace99d](https://github.com/parse-community/parse-server/commit/5ace99d542a11e422af46d9fd6b1d3d2513b34cf))
+
+
+### BREAKING CHANGES
+
+* This requires Node.js version >=12.22.10. ([5ace99d](5ace99d))
+
+# [5.0.0-alpha.28](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.27...5.0.0-alpha.28) (2022-03-12)
+
+
+### Bug Fixes
+
+* security vulnerability that allows remote code execution (GHSA-p6h4-93qp-jhcm) ([#7844](https://github.com/parse-community/parse-server/issues/7844)) ([e569f40](https://github.com/parse-community/parse-server/commit/e569f402b1fd8648fb0d1523b71b2a03273902a5))
+
+# [5.0.0-alpha.27](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.26...5.0.0-alpha.27) (2022-03-12)
+
+
+### Reverts
+
+* update node engine to 2.22.0 ([#7827](https://github.com/parse-community/parse-server/issues/7827)) ([f235412](https://github.com/parse-community/parse-server/commit/f235412c1b6c2b173b7531f285429ea7214b56a2))
+
+# [5.0.0-alpha.26](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.25...5.0.0-alpha.26) (2022-02-25)
+
+
+### Bug Fixes
+
+* package.json & package-lock.json to reduce vulnerabilities ([#7823](https://github.com/parse-community/parse-server/issues/7823)) ([5ca2288](https://github.com/parse-community/parse-server/commit/5ca228882332b65f3ac05407e6e4da1ee3ef3749))
+
+# [5.0.0-alpha.25](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.24...5.0.0-alpha.25) (2022-02-23)
+
+
+### Bug Fixes
+
+* upgrade winston from 3.5.0 to 3.5.1 ([#7820](https://github.com/parse-community/parse-server/issues/7820)) ([4af253d](https://github.com/parse-community/parse-server/commit/4af253d1f8654a6f57b5137ad310cdacadc922cc))
+
+# [5.0.0-alpha.24](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.23...5.0.0-alpha.24) (2022-02-10)
+
+
+### Bug Fixes
+
+* security upgrade follow-redirects from 1.14.7 to 1.14.8 ([#7801](https://github.com/parse-community/parse-server/issues/7801)) ([70088a9](https://github.com/parse-community/parse-server/commit/70088a95a78393da2a4ac68be81e63107747626a))
+
+# [5.0.0-alpha.23](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.22...5.0.0-alpha.23) (2022-02-06)
+
+
+### Bug Fixes
+
+* server crash using GraphQL due to missing @apollo/client peer dependency ([#7787](https://github.com/parse-community/parse-server/issues/7787)) ([08089d6](https://github.com/parse-community/parse-server/commit/08089d6fcbb215412448ce7d92b21b9fe6c929f2))
+
+# [5.0.0-alpha.22](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.21...5.0.0-alpha.22) (2022-02-06)
+
+
+### Features
+
+* upgrade to MongoDB Node.js driver 4.x for MongoDB 5.0 support ([#7794](https://github.com/parse-community/parse-server/issues/7794)) ([f88aa2a](https://github.com/parse-community/parse-server/commit/f88aa2a62a533e5344d1c13dd38c5a0b283a480a))
+
+
+### BREAKING CHANGES
+
+* The MongoDB GridStore adapter has been removed. By default, Parse Server already uses GridFS, so if you do not manually use the GridStore adapter, you can ignore this change. ([f88aa2a](f88aa2a))
+
+# [5.0.0-alpha.21](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.20...5.0.0-alpha.21) (2022-01-25)
+
+
+### Features
+
+* add Cloud Code context to `ParseObject.fetch` ([#7779](https://github.com/parse-community/parse-server/issues/7779)) ([315290d](https://github.com/parse-community/parse-server/commit/315290d16110110938f80a6b779cc2d1db58c552))
+
+# [5.0.0-alpha.20](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.19...5.0.0-alpha.20) (2022-01-22)
+
+
+### Bug Fixes
+
+* bump node-fetch from 2.6.1 to 3.1.1 ([#7782](https://github.com/parse-community/parse-server/issues/7782)) ([9082351](https://github.com/parse-community/parse-server/commit/90823514113a1a085ebc818f7109b3fd7591346f))
+
+# [5.0.0-alpha.19](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.18...5.0.0-alpha.19) (2022-01-22)
+
+
+### Bug Fixes
+
+* bump nanoid from 3.1.25 to 3.2.0 ([#7781](https://github.com/parse-community/parse-server/issues/7781)) ([f5f63bf](https://github.com/parse-community/parse-server/commit/f5f63bfc64d3481ed944ceb5e9f50b33dccd1ce9))
+
+# [5.0.0-alpha.18](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.17...5.0.0-alpha.18) (2022-01-13)
+
+
+### Bug Fixes
+
+* security upgrade follow-redirects from 1.14.6 to 1.14.7 ([#7769](https://github.com/parse-community/parse-server/issues/7769)) ([8f5a861](https://github.com/parse-community/parse-server/commit/8f5a8618cfa7ed9a2a239a095abffa8f3fd8d31a))
+
+# [5.0.0-alpha.17](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.16...5.0.0-alpha.17) (2022-01-13)
+
+
+### Bug Fixes
+
+* schema cache not cleared in some cases ([#7678](https://github.com/parse-community/parse-server/issues/7678)) ([5af6e5d](https://github.com/parse-community/parse-server/commit/5af6e5dfaa129b1a350afcba4fb381b21c4cc35d))
+
+# [5.0.0-alpha.16](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.15...5.0.0-alpha.16) (2022-01-02)
+
+
+### Features
+
+* add Idempotency to Postgres ([#7750](https://github.com/parse-community/parse-server/issues/7750)) ([0c3feaa](https://github.com/parse-community/parse-server/commit/0c3feaaa1751964c0db89f25674935c3354b1538))
+
+# [5.0.0-alpha.15](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.14...5.0.0-alpha.15) (2022-01-02)
+
+
+### Features
+
+* support `postgresql` protocol in database URI ([#7757](https://github.com/parse-community/parse-server/issues/7757)) ([caf4a23](https://github.com/parse-community/parse-server/commit/caf4a2341f554b28e3918c53e7e897a3ca47bf8b))
+
+# [5.0.0-alpha.14](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.13...5.0.0-alpha.14) (2022-01-02)
+
+
+### Features
+
+* support relativeTime query constraint on Postgres ([#7747](https://github.com/parse-community/parse-server/issues/7747)) ([16b1b2a](https://github.com/parse-community/parse-server/commit/16b1b2a19714535ca805f2dbb3b561d8f6a519a7))
+
+# [5.0.0-alpha.13](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.12...5.0.0-alpha.13) (2021-12-08)
+
+
+### Bug Fixes
+
+* node engine compatibility did not include node 16 ([#7739](https://github.com/parse-community/parse-server/issues/7739)) ([ea7c014](https://github.com/parse-community/parse-server/commit/ea7c01400f992a1263543706fe49b6174758a2d6))
+
+# [5.0.0-alpha.12](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.11...5.0.0-alpha.12) (2021-12-06)
+
+
+### Bug Fixes
+
+* adding or modifying a nested property requires addField permissions ([#7679](https://github.com/parse-community/parse-server/issues/7679)) ([6a6248b](https://github.com/parse-community/parse-server/commit/6a6248b6cb2e732d17131e18e659943b894ed2f1))
+
+# [5.0.0-alpha.11](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.10...5.0.0-alpha.11) (2021-11-29)
+
+
+### Bug Fixes
+
+* upgrade mime from 2.5.2 to 3.0.0 ([#7725](https://github.com/parse-community/parse-server/issues/7725)) ([f5ef98b](https://github.com/parse-community/parse-server/commit/f5ef98bde32083403c0e30a12162fcc1e52cac37))
+
+# [5.0.0-alpha.10](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.9...5.0.0-alpha.10) (2021-11-29)
+
+
+### Bug Fixes
+
+* upgrade parse from 3.3.1 to 3.4.0 ([#7723](https://github.com/parse-community/parse-server/issues/7723)) ([d4c1f47](https://github.com/parse-community/parse-server/commit/d4c1f473073764cb0570c633fc4a30669c2ce889))
+
+# [5.0.0-alpha.9](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.8...5.0.0-alpha.9) (2021-11-27)
+
+
+### Bug Fixes
+
+* unable to use objectId size higher than 19 on GraphQL API ([#7627](https://github.com/parse-community/parse-server/issues/7627)) ([ed86c80](https://github.com/parse-community/parse-server/commit/ed86c807721cc52a1a5a9dea0b768717eec269ed))
+
+# [5.0.0-alpha.8](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.7...5.0.0-alpha.8) (2021-11-18)
+
+
+### Features
+
+* add support for Node 16 ([#7707](https://github.com/parse-community/parse-server/issues/7707)) ([45cc58c](https://github.com/parse-community/parse-server/commit/45cc58c7e5e640a46c5d508019a3aa81242964b1))
+
+
+### BREAKING CHANGES
+
+* Removes official Node 15 support which has reached it end-of-life date. ([45cc58c](45cc58c))
+
+# [5.0.0-alpha.7](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.6...5.0.0-alpha.7) (2021-11-12)
+
+
+### Bug Fixes
+
+* node engine range has no upper limit to exclude incompatible node versions ([#7692](https://github.com/parse-community/parse-server/issues/7692)) ([573558d](https://github.com/parse-community/parse-server/commit/573558d3adcbcc6222c92003829867e1a73eef94))
+
+# [5.0.0-alpha.6](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.5...5.0.0-alpha.6) (2021-11-10)
+
+
+### Reverts
+
+* refactor: allow ES import for cloud string if package type is module ([b64640c](https://github.com/parse-community/parse-server/commit/b64640c5705f733798783e68d216e957044ef23c))
+
 # [5.0.0-alpha.5](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.4...5.0.0-alpha.5) (2021-11-01)


@@ -1,3 +1,61 @@
+# [5.2.0-beta.2](https://github.com/parse-community/parse-server/compare/5.2.0-beta.1...5.2.0-beta.2) (2022-03-24)
+
+
+### Bug Fixes
+
+* security bump minimist from 1.2.5 to 1.2.6 ([#7884](https://github.com/parse-community/parse-server/issues/7884)) ([c5cf282](https://github.com/parse-community/parse-server/commit/c5cf282d11ffdc023764f8e7539a2bd6bc246fe1))
+* sensitive keyword detection may produce false positives ([#7881](https://github.com/parse-community/parse-server/issues/7881)) ([0d6f9e9](https://github.com/parse-community/parse-server/commit/0d6f9e951d9e186e95e96d8869066ce7022bad02))
+
+# [5.2.0-beta.1](https://github.com/parse-community/parse-server/compare/5.1.1...5.2.0-beta.1) (2022-03-23)
+
+
+### Features
+
+* improved LiveQuery error logging with additional information ([#7837](https://github.com/parse-community/parse-server/issues/7837)) ([443a509](https://github.com/parse-community/parse-server/commit/443a5099059538d379fe491793a5871fcbb4f377))
+
+# [5.0.0-beta.10](https://github.com/parse-community/parse-server/compare/5.0.0-beta.9...5.0.0-beta.10) (2022-03-15)
+
+
+### Bug Fixes
+
+* adding or modifying a nested property requires addField permissions ([#7679](https://github.com/parse-community/parse-server/issues/7679)) ([6a6248b](https://github.com/parse-community/parse-server/commit/6a6248b6cb2e732d17131e18e659943b894ed2f1))
+* bump nanoid from 3.1.25 to 3.2.0 ([#7781](https://github.com/parse-community/parse-server/issues/7781)) ([f5f63bf](https://github.com/parse-community/parse-server/commit/f5f63bfc64d3481ed944ceb5e9f50b33dccd1ce9))
+* bump node-fetch from 2.6.1 to 3.1.1 ([#7782](https://github.com/parse-community/parse-server/issues/7782)) ([9082351](https://github.com/parse-community/parse-server/commit/90823514113a1a085ebc818f7109b3fd7591346f))
+* node engine compatibility did not include node 16 ([#7739](https://github.com/parse-community/parse-server/issues/7739)) ([ea7c014](https://github.com/parse-community/parse-server/commit/ea7c01400f992a1263543706fe49b6174758a2d6))
+* node engine range has no upper limit to exclude incompatible node versions ([#7692](https://github.com/parse-community/parse-server/issues/7692)) ([573558d](https://github.com/parse-community/parse-server/commit/573558d3adcbcc6222c92003829867e1a73eef94))
+* package.json & package-lock.json to reduce vulnerabilities ([#7823](https://github.com/parse-community/parse-server/issues/7823)) ([5ca2288](https://github.com/parse-community/parse-server/commit/5ca228882332b65f3ac05407e6e4da1ee3ef3749))
+* schema cache not cleared in some cases ([#7678](https://github.com/parse-community/parse-server/issues/7678)) ([5af6e5d](https://github.com/parse-community/parse-server/commit/5af6e5dfaa129b1a350afcba4fb381b21c4cc35d))
+* security upgrade follow-redirects from 1.14.6 to 1.14.7 ([#7769](https://github.com/parse-community/parse-server/issues/7769)) ([8f5a861](https://github.com/parse-community/parse-server/commit/8f5a8618cfa7ed9a2a239a095abffa8f3fd8d31a))
+* security upgrade follow-redirects from 1.14.7 to 1.14.8 ([#7801](https://github.com/parse-community/parse-server/issues/7801)) ([70088a9](https://github.com/parse-community/parse-server/commit/70088a95a78393da2a4ac68be81e63107747626a))
+* security vulnerability that allows remote code execution (GHSA-p6h4-93qp-jhcm) ([#7844](https://github.com/parse-community/parse-server/issues/7844)) ([e569f40](https://github.com/parse-community/parse-server/commit/e569f402b1fd8648fb0d1523b71b2a03273902a5))
+* server crash using GraphQL due to missing @apollo/client peer dependency ([#7787](https://github.com/parse-community/parse-server/issues/7787)) ([08089d6](https://github.com/parse-community/parse-server/commit/08089d6fcbb215412448ce7d92b21b9fe6c929f2))
+* unable to use objectId size higher than 19 on GraphQL API ([#7627](https://github.com/parse-community/parse-server/issues/7627)) ([ed86c80](https://github.com/parse-community/parse-server/commit/ed86c807721cc52a1a5a9dea0b768717eec269ed))
+* upgrade mime from 2.5.2 to 3.0.0 ([#7725](https://github.com/parse-community/parse-server/issues/7725)) ([f5ef98b](https://github.com/parse-community/parse-server/commit/f5ef98bde32083403c0e30a12162fcc1e52cac37))
+* upgrade parse from 3.3.1 to 3.4.0 ([#7723](https://github.com/parse-community/parse-server/issues/7723)) ([d4c1f47](https://github.com/parse-community/parse-server/commit/d4c1f473073764cb0570c633fc4a30669c2ce889))
+* upgrade winston from 3.5.0 to 3.5.1 ([#7820](https://github.com/parse-community/parse-server/issues/7820)) ([4af253d](https://github.com/parse-community/parse-server/commit/4af253d1f8654a6f57b5137ad310cdacadc922cc))
+
+### Features
+
+* add Cloud Code context to `ParseObject.fetch` ([#7779](https://github.com/parse-community/parse-server/issues/7779)) ([315290d](https://github.com/parse-community/parse-server/commit/315290d16110110938f80a6b779cc2d1db58c552))
+* add Idempotency to Postgres ([#7750](https://github.com/parse-community/parse-server/issues/7750)) ([0c3feaa](https://github.com/parse-community/parse-server/commit/0c3feaaa1751964c0db89f25674935c3354b1538))
+* add support for Node 16 ([#7707](https://github.com/parse-community/parse-server/issues/7707)) ([45cc58c](https://github.com/parse-community/parse-server/commit/45cc58c7e5e640a46c5d508019a3aa81242964b1))
+* bump required node engine to >=12.22.10 ([#7846](https://github.com/parse-community/parse-server/issues/7846)) ([5ace99d](https://github.com/parse-community/parse-server/commit/5ace99d542a11e422af46d9fd6b1d3d2513b34cf))
+* support `postgresql` protocol in database URI ([#7757](https://github.com/parse-community/parse-server/issues/7757)) ([caf4a23](https://github.com/parse-community/parse-server/commit/caf4a2341f554b28e3918c53e7e897a3ca47bf8b))
+* support relativeTime query constraint on Postgres ([#7747](https://github.com/parse-community/parse-server/issues/7747)) ([16b1b2a](https://github.com/parse-community/parse-server/commit/16b1b2a19714535ca805f2dbb3b561d8f6a519a7))
+* upgrade to MongoDB Node.js driver 4.x for MongoDB 5.0 support ([#7794](https://github.com/parse-community/parse-server/issues/7794)) ([f88aa2a](https://github.com/parse-community/parse-server/commit/f88aa2a62a533e5344d1c13dd38c5a0b283a480a))
+
+### Reverts
+
+* refactor: allow ES import for cloud string if package type is module ([b64640c](https://github.com/parse-community/parse-server/commit/b64640c5705f733798783e68d216e957044ef23c))
+* update node engine to 2.22.0 ([#7827](https://github.com/parse-community/parse-server/issues/7827)) ([f235412](https://github.com/parse-community/parse-server/commit/f235412c1b6c2b173b7531f285429ea7214b56a2))
+
+
+### BREAKING CHANGES
+
+* This requires Node.js version >=12.22.10. ([5ace99d](5ace99d))
+* The MongoDB GridStore adapter has been removed. By default, Parse Server already uses GridFS, so if you do not manually use the GridStore adapter, you can ignore this change. ([f88aa2a](f88aa2a))
+* Removes official Node 15 support which has reached it end-of-life date. ([45cc58c](45cc58c))
+
 # [5.0.0-beta.9](https://github.com/parse-community/parse-server/compare/5.0.0-beta.8...5.0.0-beta.9) (2022-03-12)


@@ -1,122 +1,169 @@
-# [5.0.0](https://github.com/parse-community/parse-server/compare/4.5.0...5.0.0) (2022-03-14)
+# [5.2.0](https://github.com/parse-community/parse-server/compare/5.1.1...5.2.0) (2022-03-24)


 ### Bug Fixes

-* add deprecation warning for `Parse.Cloud.httpRequest` ([#7595](https://github.com/parse-community/parse-server/issues/7595)) ([ab1dddd](https://github.com/parse-community/parse-server/commit/ab1dddd406589800e1a8ebe8381b9da702e9c641))
-* add support for descending sorting of full text search ([#7496](https://github.com/parse-community/parse-server/issues/7496)) ([8ed9442](https://github.com/parse-community/parse-server/commit/8ed94421e69b1d4fde4ec3625a1f4cfbd6d39c2b))
-* allow LiveQuery on Parse.Session ([#7554](https://github.com/parse-community/parse-server/issues/7554)) ([caee281](https://github.com/parse-community/parse-server/commit/caee281bc58901fea7cead21d6a9a0bb2022d91b))
-* combined `and` query with relational query condition returns incorrect results ([#7593](https://github.com/parse-community/parse-server/issues/7593)) ([174886e](https://github.com/parse-community/parse-server/commit/174886e385e091c6bbd4a84891ef95f80b50d05c))
-* empty file tags cause upload error for some providers ([#7300](https://github.com/parse-community/parse-server/issues/7300)) ([4d16702](https://github.com/parse-community/parse-server/commit/4d167026aebed38bf3a3b74599ab3771d1da3245))
-* **Logger:** Handle interpolating stdout ([#7114](https://github.com/parse-community/parse-server/issues/7114)) ([1ede078](https://github.com/parse-community/parse-server/commit/1ede078154213d3426cc492612ce41bdb1eda43b))
-* improve security by deprecating creating users with public access by default ([#7319](https://github.com/parse-community/parse-server/issues/7319)) ([484c2e8](https://github.com/parse-community/parse-server/commit/484c2e81cace608eb28508a0926b17b3ba9e6233))
-* node engine range has no upper limit to exclude incompatible node versions ([#7693](https://github.com/parse-community/parse-server/issues/7693)) ([6a54dac](https://github.com/parse-community/parse-server/commit/6a54dac24d9fb63a44f311b8d414f4aa64140f32))
-* package.json & package-lock.json to reduce vulnerabilities ([#7112](https://github.com/parse-community/parse-server/issues/7112)) ([7b8d8dd](https://github.com/parse-community/parse-server/commit/7b8d8ddbb0de583621a4d2ede95793c6516bc4c0))
-* package.json & package-lock.json to reduce vulnerabilities ([#7218](https://github.com/parse-community/parse-server/issues/7218)) ([0476832](https://github.com/parse-community/parse-server/commit/047683219daf7940590db1237f6826a038bdc41d))
-* package.json & package-lock.json to reduce vulnerabilities ([#7373](https://github.com/parse-community/parse-server/issues/7373)) ([b6843de](https://github.com/parse-community/parse-server/commit/b6843de904bf273bf664d94536defa39f91751b3))
-* package.json & package-lock.json to reduce vulnerabilities ([#7405](https://github.com/parse-community/parse-server/issues/7405)) ([d915bac](https://github.com/parse-community/parse-server/commit/d915bacee7c6ded60b303582d2a6b85d42dc3cf4))
-* package.json & package-lock.json to reduce vulnerabilities ([#7423](https://github.com/parse-community/parse-server/issues/7423)) ([bea4707](https://github.com/parse-community/parse-server/commit/bea4707783febc0fc6ea055835ffbc517cd2b067))
-* package.json & package-lock.json to reduce vulnerabilities ([#7509](https://github.com/parse-community/parse-server/issues/7509)) ([65c967a](https://github.com/parse-community/parse-server/commit/65c967a4c446aebb535cbbbcb0ceb38d45da7859))
-* Pass customObjectId in beforeSave ([#7167](https://github.com/parse-community/parse-server/issues/7167)) ([7224cde](https://github.com/parse-community/parse-server/commit/7224cde0232d79fea0f4b2d0bc2cb7641ec467d8)), closes [#6733](https://github.com/parse-community/parse-server/issues/6733)
-* **utils:** permutation helper ([#7355](https://github.com/parse-community/parse-server/issues/7355)) ([91be6bb](https://github.com/parse-community/parse-server/commit/91be6bb59a61c126b7a25431655064342464905c))
-* schema cache not cleared in some cases ([#7771](https://github.com/parse-community/parse-server/issues/7771)) ([3b92fa1](https://github.com/parse-community/parse-server/commit/3b92fa1ca9e8889127a32eba913d68309397ca2c))
-* security upgrade follow-redirects from 1.14.2 to 1.14.7 ([#7772](https://github.com/parse-community/parse-server/issues/7772)) ([4bd34b1](https://github.com/parse-community/parse-server/commit/4bd34b189bc9f5aa2e70b7e7c1a456e91b6de773))
-* security upgrade follow-redirects from 1.14.7 to 1.14.8 ([#7802](https://github.com/parse-community/parse-server/issues/7802)) ([7029b27](https://github.com/parse-community/parse-server/commit/7029b274ca87bc8058617f29865d683dc3b351a1))
-* security vulnerability that allows remote code execution (GHSA-p6h4-93qp-jhcm) ([#7843](https://github.com/parse-community/parse-server/issues/7843)) ([971adb5](https://github.com/parse-community/parse-server/commit/971adb54387b0ede31be05ca407d5f35b4575c83))
-* set objects in afterFind triggers ([#7311](https://github.com/parse-community/parse-server/issues/7311)) ([68a3a87](https://github.com/parse-community/parse-server/commit/68a3a875017d545253f0438c5d4c1c2b6c6c3b22))
-* setting a field to null does not delete it via GraphQL API ([#7649](https://github.com/parse-community/parse-server/issues/7649)) ([626fad2](https://github.com/parse-community/parse-server/commit/626fad2e71017dcc62196c487de5f908fa43000b))
-* unable to use objectId size higher than 19 on GraphQL API ([#7722](https://github.com/parse-community/parse-server/issues/7722)) ([8ee0445](https://github.com/parse-community/parse-server/commit/8ee0445c0aeeb88dff2559b46ade408071d22143))
-* upgrade @apollographql/graphql-playground-html from 1.6.26 to 1.6.27 ([#7274](https://github.com/parse-community/parse-server/issues/7274)) ([a05e9b1](https://github.com/parse-community/parse-server/commit/a05e9b1c0fee8ad917812637256faa1e0a1b40f6))
-* upgrade @apollographql/graphql-playground-html from 1.6.27 to 1.6.28 ([#7411](https://github.com/parse-community/parse-server/issues/7411)) ([c58bf57](https://github.com/parse-community/parse-server/commit/c58bf57f51ebc9df3a624fb3ecdacdf4647f1dea))
-* upgrade @apollographql/graphql-playground-html from 1.6.28 to 1.6.29 ([#7473](https://github.com/parse-community/parse-server/issues/7473)) ([39f7c83](https://github.com/parse-community/parse-server/commit/39f7c831e6493cff9cd64195b64e886fda4624f8))
-* upgrade @parse/simple-mailgun-adapter from 1.1.0 to 1.2.0 ([#7109](https://github.com/parse-community/parse-server/issues/7109)) ([8ff0d08](https://github.com/parse-community/parse-server/commit/8ff0d08dcf5a9ada931359df3e78543445312f15))
-* upgrade apollo-server-express from 2.19.0 to 2.19.1 ([#7122](https://github.com/parse-community/parse-server/issues/7122)) ([33bdd87](https://github.com/parse-community/parse-server/commit/33bdd8709266f17489c319e43b3f2a7d8ea27fd5))
-* upgrade apollo-server-express from 2.19.1 to 2.19.2 ([#7165](https://github.com/parse-community/parse-server/issues/7165)) ([4b6e9ff](https://github.com/parse-community/parse-server/commit/4b6e9ffc3d2c1969c285c94f7cf2cfc7af03227e))
-* upgrade apollo-server-express from 2.19.2 to 2.20.0 ([#7239](https://github.com/parse-community/parse-server/issues/7239)) ([d10e990](https://github.com/parse-community/parse-server/commit/d10e99007b70816707944060905cff7da5018eb0))
-* upgrade apollo-server-express from 2.21.0 to 2.21.1 ([#7308](https://github.com/parse-community/parse-server/issues/7308)) ([3dc4597](https://github.com/parse-community/parse-server/commit/3dc459746dbd4a2d245f2bde688cd087a5b74703))
-* upgrade apollo-server-express from 2.21.1 to 2.22.1 ([#7357](https://github.com/parse-community/parse-server/issues/7357)) ([25690ad](https://github.com/parse-community/parse-server/commit/25690ad515551bda33dd581789ffeb9a218c8033))
-* upgrade apollo-server-express from 2.22.1 to 2.22.2 ([#7362](https://github.com/parse-community/parse-server/issues/7362)) ([181fbf9](https://github.com/parse-community/parse-server/commit/181fbf9d46bee61b5c67a411b4a41c38d201cc73))
-* upgrade apollo-server-express from 2.22.2 to 2.23.0 ([#7380](https://github.com/parse-community/parse-server/issues/7380)) ([87476da](https://github.com/parse-community/parse-server/commit/87476da31e28e064fa7192998c67de9c31ac18a6))
-* upgrade apollo-server-express from 2.23.0 to 2.24.0 ([#7395](https://github.com/parse-community/parse-server/issues/7395)) ([ff5755b](https://github.com/parse-community/parse-server/commit/ff5755b05ac554a107a443a8870f4c2442b0a5f3))
-* upgrade apollo-server-express from 2.24.0 to 2.24.1 ([#7424](https://github.com/parse-community/parse-server/issues/7424)) ([bfdb6a9](https://github.com/parse-community/parse-server/commit/bfdb6a93e8c0d78524820b32abaff174776520f3))
-* upgrade apollo-server-express from 2.24.1 to 2.25.0 ([#7435](https://github.com/parse-community/parse-server/issues/7435)) ([4e5eba6](https://github.com/parse-community/parse-server/commit/4e5eba6c6c7bc6e643ac6477df15beea1ba60364))
-* upgrade apollo-server-express from 2.25.0 to 2.25.1 ([#7449](https://github.com/parse-community/parse-server/issues/7449)) ([682f1bf](https://github.com/parse-community/parse-server/commit/682f1bf14388e134fbd993e274f5738ec2e57e02))
-* upgrade apollo-server-express from 2.25.1 to 2.25.2 ([#7465](https://github.com/parse-community/parse-server/issues/7465)) ([1fe4708](https://github.com/parse-community/parse-server/commit/1fe47087a92c80e7ee8cc6e3e26b3a67f8df68ee))
-* upgrade follow-redirects from 1.13.0 to 1.13.1 ([#7106](https://github.com/parse-community/parse-server/issues/7106)) ([16b4aad](https://github.com/parse-community/parse-server/commit/16b4aadfe2b5b5b24e6e3bbe22c93a92f02c9eb3))
-* upgrade follow-redirects from 1.13.1 to 1.13.2 ([#7194](https://github.com/parse-community/parse-server/issues/7194)) ([738ba9f](https://github.com/parse-community/parse-server/commit/738ba9fc704a770bd1e2af23bca31ed7202f99cd))
-* upgrade follow-redirects from 1.13.2 to 1.13.3 ([#7285](https://github.com/parse-community/parse-server/issues/7285)) ([d144819](https://github.com/parse-community/parse-server/commit/d144819d21b59b11dc957346748ce3200349a6b7))
-* upgrade follow-redirects from 1.13.3 to 1.14.0 ([#7389](https://github.com/parse-community/parse-server/issues/7389)) ([38c01c6](https://github.com/parse-community/parse-server/commit/38c01c6bc32fe769c3a636e45b389e2a995c2ee6))
-* upgrade follow-redirects from 1.14.0 to 1.14.1 ([#7408](https://github.com/parse-community/parse-server/issues/7408)) ([8976ecc](https://github.com/parse-community/parse-server/commit/8976ecc4a9c91eeb1d0f3448eff7720b43c7747a))
-* upgrade graphql from 15.4.0 to 15.5.0 ([#7201](https://github.com/parse-community/parse-server/issues/7201)) ([5a09687](https://github.com/parse-community/parse-server/commit/5a0968721d6d04cdde86d3df569a77910bcae803))
-* upgrade graphql from 15.5.0 to 15.5.1 ([#7462](https://github.com/parse-community/parse-server/issues/7462)) ([bbd7ee7](https://github.com/parse-community/parse-server/commit/bbd7ee7313e19c43b15e16027439739590393dd1))
-* upgrade graphql from 15.5.1 to 15.5.2 ([#7587](https://github.com/parse-community/parse-server/issues/7587)) ([dee4d96](https://github.com/parse-community/parse-server/commit/dee4d9662749eb699891c8a3797fa0b0467c6355))
-* upgrade graphql from 15.5.2 to 15.5.3 ([#7596](https://github.com/parse-community/parse-server/issues/7596)) ([bcbc035](https://github.com/parse-community/parse-server/commit/bcbc035627c552a7940bec4ae210ca1522215246))
-* upgrade graphql from 15.5.3 to 15.6.0 ([#7612](https://github.com/parse-community/parse-server/issues/7612)) ([407ed6e](https://github.com/parse-community/parse-server/commit/407ed6ee36ea42d7eb525f42b1f3da6f41230504))
-* upgrade graphql-relay from 0.6.0 to 0.7.0 ([#7443](https://github.com/parse-community/parse-server/issues/7443)) ([770e36f](https://github.com/parse-community/parse-server/commit/770e36ff43c42e4ed3db73a30436079a0460a1f0))
-* upgrade graphql-relay from 0.7.0 to 0.8.0 ([#7467](https://github.com/parse-community/parse-server/issues/7467)) ([9923cd3](https://github.com/parse-community/parse-server/commit/9923cd3869ab80e70c5ca9765628ba0a28a6facc))
-* upgrade graphql-tag from 2.10.1 to 2.12.0 ([#7234](https://github.com/parse-community/parse-server/issues/7234)) ([add67fd](https://github.com/parse-community/parse-server/commit/add67fdd2284a58386f6afd35edeaa8534579e33))
-* upgrade graphql-tag from 2.12.0 to 2.12.1 ([#7282](https://github.com/parse-community/parse-server/issues/7282)) ([36de1db](https://github.com/parse-community/parse-server/commit/36de1db65dc3c2bbf8f8051ee1862a06ef41e7f9))
-* upgrade graphql-tag from 2.12.1 to 2.12.2 ([#7325](https://github.com/parse-community/parse-server/issues/7325)) ([50e5557](https://github.com/parse-community/parse-server/commit/50e55571fdaa1ac3ca43d215c4bc62136d684873))
-* upgrade graphql-tag from 2.12.2 to 2.12.4 ([#7396](https://github.com/parse-community/parse-server/issues/7396)) ([8099cb0](https://github.com/parse-community/parse-server/commit/8099cb05a48956b073f3e7d96c30b69292c06adc))
-* upgrade graphql-tag from 2.12.4 to 2.12.5 ([#7466](https://github.com/parse-community/parse-server/issues/7466)) ([2b3355c](https://github.com/parse-community/parse-server/commit/2b3355cb022724838499a5d83c0d532040953566))
-* upgrade jwks-rsa from 1.11.0 to 1.12.0 ([#7102](https://github.com/parse-community/parse-server/issues/7102)) ([029edbf](https://github.com/parse-community/parse-server/commit/029edbf706c4b1754afbb5ce69600a373b91cb9b))
-* upgrade jwks-rsa from 1.12.1 to 1.12.2 ([#7147](https://github.com/parse-community/parse-server/issues/7147)) ([bcb2b52](https://github.com/parse-community/parse-server/commit/bcb2b52f7a1322a780b95b77081827d6c8c25840))
-* upgrade jwks-rsa from 1.12.2 to 1.12.3 ([#7284](https://github.com/parse-community/parse-server/issues/7284)) ([a53d74c](https://github.com/parse-community/parse-server/commit/a53d74c13b86d43e1694132feddccce6ee2bede9))
-* upgrade ldapjs from 2.2.2 to 2.2.3 ([#7095](https://github.com/parse-community/parse-server/issues/7095)) ([fb465e5](https://github.com/parse-community/parse-server/commit/fb465e599e8768b9e229ec8689e033d7063e50b3))
-* upgrade ldapjs from 2.2.3 to 2.2.4 ([#7275](https://github.com/parse-community/parse-server/issues/7275)) ([35f0c55](https://github.com/parse-community/parse-server/commit/35f0c55e93dc0572049a85befbc80175620f7d29))
-* upgrade ldapjs from 2.2.4 to 2.3.0 ([#7436](https://github.com/parse-community/parse-server/issues/7436)) ([7df6c02](https://github.com/parse-community/parse-server/commit/7df6c020b18b8ea9d04b718fa4e070be800b9268))
-* upgrade ldapjs from 2.3.0 to 2.3.1 ([#7524](https://github.com/parse-community/parse-server/issues/7524)) ([dee5a13](https://github.com/parse-community/parse-server/commit/dee5a13a85336cdd9d3bcd938c4118fffe8b9670))
-* upgrade mime from 2.4.6 to 2.4.7 ([#7110](https://github.com/parse-community/parse-server/issues/7110)) ([fefcabe](https://github.com/parse-community/parse-server/commit/fefcabe858f3817dca337390c2198abbf12f9bdf))
-* upgrade mime from 2.4.7 to 2.5.0 ([#7166](https://github.com/parse-community/parse-server/issues/7166)) ([6097e82](https://github.com/parse-community/parse-server/commit/6097e82194772847954dc2c2b7559543cc7531cc))
-* upgrade mime from 2.5.0 to 2.5.2 ([#7261](https://github.com/parse-community/parse-server/issues/7261)) ([687f4b7](https://github.com/parse-community/parse-server/commit/687f4b7cf245ce578674a4cc0e0d276b23d5780d))
-* upgrade mongodb from 3.6.6 to 3.6.7 ([#7425](https://github.com/parse-community/parse-server/issues/7425)) ([61affe2](https://github.com/parse-community/parse-server/commit/61affe26293f7218e88878d027514d68975cfc8c))
-* upgrade mongodb from 3.6.7 to 3.6.8 ([#7430](https://github.com/parse-community/parse-server/issues/7430)) ([c36588e](https://github.com/parse-community/parse-server/commit/c36588e3c2d16fab3f38aecc77f0e827bda38f95))
-* upgrade mongodb from 3.6.8 to 3.6.9 ([#7445](https://github.com/parse-community/parse-server/issues/7445)) ([17cf1a4](https://github.com/parse-community/parse-server/commit/17cf1a46e557b502b132c415b922508e032209a9))
-* upgrade mongodb from 3.6.9 to 3.6.10 ([#7474](https://github.com/parse-community/parse-server/issues/7474)) ([45d29cc](https://github.com/parse-community/parse-server/commit/45d29cc58c373c9e1d489dbd7a750f2a0f6bc89b))
-* upgrade mustache from 4.1.0 to 4.2.0 ([#7358](https://github.com/parse-community/parse-server/issues/7358)) ([94b7b32](https://github.com/parse-community/parse-server/commit/94b7b320062579e788df6c9f72d7a786f98f7cc5))
-* upgrade parse from 3.1.0 to 3.2.0 ([#7378](https://github.com/parse-community/parse-server/issues/7378)) ([e9f54e2](https://github.com/parse-community/parse-server/commit/e9f54e2bddd8430864b1628ab077a0a3aae73e47))
-* upgrade pg-promise from 10.10.1 to 10.10.2 ([#7399](https://github.com/parse-community/parse-server/issues/7399)) ([d365f1f](https://github.com/parse-community/parse-server/commit/d365f1f7cb44cfdeac9931308ff25dcd9ba3d79b))
-* upgrade pg-promise from 10.10.2 to 10.11.0 ([#7510](https://github.com/parse-community/parse-server/issues/7510)) ([a967e79](https://github.com/parse-community/parse-server/commit/a967e7921961ea7a33ae9ff02555839cecf2b15f))
-* upgrade pg-promise from 10.8.1 to 10.8.6 ([#7118](https://github.com/parse-community/parse-server/issues/7118)) ([8851810](https://github.com/parse-community/parse-server/commit/8851810a85747456cd2f3e5d3876371306b8c23d))
-* upgrade pg-promise from 10.8.6 to 10.8.7 ([#7148](https://github.com/parse-community/parse-server/issues/7148)) ([231c669](https://github.com/parse-community/parse-server/commit/231c669133eea494f2db7f23fdff2e9d004c9e18))
-* upgrade pg-promise from 10.8.7 to 10.9.0 ([#7168](https://github.com/parse-community/parse-server/issues/7168)) ([fcacd4d](https://github.com/parse-community/parse-server/commit/fcacd4d24e34ff48367d2c68bb97743b8a20216c))
-* upgrade pg-promise from 10.9.0 to 10.9.1 ([#7170](https://github.com/parse-community/parse-server/issues/7170)) ([cca493b](https://github.com/parse-community/parse-server/commit/cca493b9fb33a4c34eaaf624ec4aedd18b11dca7))
-* upgrade pg-promise from 10.9.1 to 10.9.2 ([#7209](https://github.com/parse-community/parse-server/issues/7209)) ([c05102b](https://github.com/parse-community/parse-server/commit/c05102b90c925498459b45c755298cb482ac596c))
-* upgrade redis from 3.1.1 to 3.1.2 ([#7387](https://github.com/parse-community/parse-server/issues/7387)) ([f65bd22](https://github.com/parse-community/parse-server/commit/f65bd228fb3491ba217558ec288dd2ee60d0d37d))
-* upgrade semver from 7.3.2 to 7.3.4 ([#7092](https://github.com/parse-community/parse-server/issues/7092)) ([7e687b1](https://github.com/parse-community/parse-server/commit/7e687b1e943372d105ca359177824241af278534))
-* upgrade subscriptions-transport-ws from 0.9.19 to 0.10.0 ([#7450](https://github.com/parse-community/parse-server/issues/7450)) ([d36a53b](https://github.com/parse-community/parse-server/commit/d36a53b2bfade99942e3c9b827c9abb38d2de26b))
-* upgrade uuid from 8.3.1 to 8.3.2 ([#7101](https://github.com/parse-community/parse-server/issues/7101)) ([f17a063](https://github.com/parse-community/parse-server/commit/f17a063209b451da291918dac165e177f0bee6a0))
-* upgrade winston-daily-rotate-file from 4.5.0 to 4.5.1 ([#7309](https://github.com/parse-community/parse-server/issues/7309)) ([8643ae4](https://github.com/parse-community/parse-server/commit/8643ae438f1ea48c93d2860889568f9f3a5a62b8))
-* upgrade winston-daily-rotate-file from 4.5.1 to 4.5.2 ([#7376](https://github.com/parse-community/parse-server/issues/7376)) ([e143fb1](https://github.com/parse-community/parse-server/commit/e143fb1bf6a52bb21c483fbf72f74d2282cfbeee))
-* upgrade winston-daily-rotate-file from 4.5.2 to 4.5.3 ([#7398](https://github.com/parse-community/parse-server/issues/7398)) ([e9d8ed4](https://github.com/parse-community/parse-server/commit/e9d8ed4acb03160c8f6d669859fe57d8281937b4))
-* upgrade winston-daily-rotate-file from 4.5.3 to 4.5.4 ([#7402](https://github.com/parse-community/parse-server/issues/7402)) ([4f80a5f](https://github.com/parse-community/parse-server/commit/4f80a5f4afbc008d2f642ee0c581a25483240e9a))
-* upgrade winston-daily-rotate-file from 4.5.4 to 4.5.5 ([#7407](https://github.com/parse-community/parse-server/issues/7407)) ([5abbeeb](https://github.com/parse-community/parse-server/commit/5abbeeb8d11be810993c528b8458be894039a5fc))
-* upgrade ws from 7.4.0 to 7.4.1 ([#7098](https://github.com/parse-community/parse-server/issues/7098)) ([1068838](https://github.com/parse-community/parse-server/commit/106883809c96a758bb23ae6dd7fff7465fbd8f60))
-* upgrade ws from 7.4.1 to 7.4.2 ([#7132](https://github.com/parse-community/parse-server/issues/7132)) ([857d4ec](https://github.com/parse-community/parse-server/commit/857d4ecfd5a383d6debd849a1af1d45820aee0c0))
-* upgrade ws from 7.4.2 to 7.4.3 ([#7224](https://github.com/parse-community/parse-server/issues/7224)) ([ec8f784](https://github.com/parse-community/parse-server/commit/ec8f78424f0043fa74ef1f3a7baa96a3d1e95b59))
-* upgrade ws from 7.4.3 to 7.4.4 ([#7298](https://github.com/parse-community/parse-server/issues/7298)) ([a080e4c](https://github.com/parse-community/parse-server/commit/a080e4c766c33cc5b5c304bbdba69e93743f9db1))
-* upgrade ws from 7.4.4 to 7.4.5 ([#7381](https://github.com/parse-community/parse-server/issues/7381)) ([34f3dd9](https://github.com/parse-community/parse-server/commit/34f3dd9e7e1908b713355ddb235b1e5d02634663))
-* upgrade ws from 7.5.3 to 8.2.1 ([#7580](https://github.com/parse-community/parse-server/issues/7580)) ([c3da290](https://github.com/parse-community/parse-server/commit/c3da2908fabfa4f7f49c0f6d5b3d32de692dd388))
-* upgrade ws from 8.2.1 to 8.2.2 ([#7598](https://github.com/parse-community/parse-server/issues/7598)) ([20cb333](https://github.com/parse-community/parse-server/commit/20cb3333aba67fb89e4e2cda586c559bdb4a23ef))
+* security bump minimist from 1.2.5 to 1.2.6 ([#7884](https://github.com/parse-community/parse-server/issues/7884)) ([c5cf282](https://github.com/parse-community/parse-server/commit/c5cf282d11ffdc023764f8e7539a2bd6bc246fe1))
+* sensitive keyword detection may produce false positives ([#7881](https://github.com/parse-community/parse-server/issues/7881)) ([0d6f9e9](https://github.com/parse-community/parse-server/commit/0d6f9e951d9e186e95e96d8869066ce7022bad02))

 ### Features

-* add support for Postgres 14 ([#7644](https://github.com/parse-community/parse-server/issues/7644)) ([090350a](https://github.com/parse-community/parse-server/commit/090350a7a0fac945394ca1cb24b290316ef06aa7))
-* add user-defined schema and migrations ([#7418](https://github.com/parse-community/parse-server/issues/7418)) ([25d5c30](https://github.com/parse-community/parse-server/commit/25d5c30be2111be332eb779eb0697774a17da7af))
-* alphabetical graphql api, fix internal reassign, enhanced Graphql schema cache system ([#7344](https://github.com/parse-community/parse-server/issues/7344)) ([85ef721](https://github.com/parse-community/parse-server/commit/85ef7217b04e36395e46316004293e9c8ca67df9))
-* bump required node engine to >=12.22.10 ([#7848](https://github.com/parse-community/parse-server/issues/7848)) ([23a3488](https://github.com/parse-community/parse-server/commit/23a3488f15511fafbe0e1d7ff0ef8355f9cb0215))
-* **LiveQuery:** Support $and, $nor, $containedBy, $geoWithin ([#7113](https://github.com/parse-community/parse-server/issues/7113)) ([93781b2](https://github.com/parse-community/parse-server/commit/93781b2195d8074032d2c4dfd77a56acf17dc9e1))
-* **AggregateRouter:** support native mongodb syntax in aggregation pipelines ([#7339](https://github.com/parse-community/parse-server/issues/7339)) ([8fddac3](https://github.com/parse-community/parse-server/commit/8fddac39bf866886c3b432219acc4d5e8169ddc0))
+* improved LiveQuery error logging with additional information ([#7837](https://github.com/parse-community/parse-server/issues/7837)) ([443a509](https://github.com/parse-community/parse-server/commit/443a5099059538d379fe491793a5871fcbb4f377))
+
+## [5.1.1](https://github.com/parse-community/parse-server/compare/5.1.0...5.1.1) (2022-03-18)
+

 ### Reverts

-* refactor: allow ES import for cloud string if package type is module ([#7691](https://github.com/parse-community/parse-server/issues/7691)) ([200d4ba](https://github.com/parse-community/parse-server/commit/200d4ba9a527016a65668738c7728696f443bd53))
+* ci: temporarily disable breaking change detection ([#7861](https://github.com/parse-community/parse-server/issues/7861)) ([effed92](https://github.com/parse-community/parse-server/commit/effed92cabd88676fdf9eca2e079a4d8be017f1b))
+
+# [5.1.0](https://github.com/parse-community/parse-server/compare/5.0.0...5.1.0) (2022-03-18)
+
+
+### Bug Fixes
+
+* adding or modifying a nested property requires addField permissions ([#7679](https://github.com/parse-community/parse-server/issues/7679)) ([6a6248b](https://github.com/parse-community/parse-server/commit/6a6248b6cb2e732d17131e18e659943b894ed2f1))
+* bump nanoid from 3.1.25 to 3.2.0 ([#7781](https://github.com/parse-community/parse-server/issues/7781)) ([f5f63bf](https://github.com/parse-community/parse-server/commit/f5f63bfc64d3481ed944ceb5e9f50b33dccd1ce9))
+* bump node-fetch from 2.6.1 to 3.1.1 ([#7782](https://github.com/parse-community/parse-server/issues/7782)) ([9082351](https://github.com/parse-community/parse-server/commit/90823514113a1a085ebc818f7109b3fd7591346f))
+* node engine compatibility did not include node 16 ([#7739](https://github.com/parse-community/parse-server/issues/7739)) ([ea7c014](https://github.com/parse-community/parse-server/commit/ea7c01400f992a1263543706fe49b6174758a2d6))
+* node engine range has no upper limit to exclude incompatible node versions ([#7692](https://github.com/parse-community/parse-server/issues/7692)) ([573558d](https://github.com/parse-community/parse-server/commit/573558d3adcbcc6222c92003829867e1a73eef94))
+* package.json & package-lock.json to reduce vulnerabilities ([#7823](https://github.com/parse-community/parse-server/issues/7823)) ([5ca2288](https://github.com/parse-community/parse-server/commit/5ca228882332b65f3ac05407e6e4da1ee3ef3749))
+* schema cache not cleared in some cases ([#7678](https://github.com/parse-community/parse-server/issues/7678)) ([5af6e5d](https://github.com/parse-community/parse-server/commit/5af6e5dfaa129b1a350afcba4fb381b21c4cc35d))
+* security upgrade follow-redirects from 1.14.6 to 1.14.7 ([#7769](https://github.com/parse-community/parse-server/issues/7769)) ([8f5a861](https://github.com/parse-community/parse-server/commit/8f5a8618cfa7ed9a2a239a095abffa8f3fd8d31a))
+* security upgrade follow-redirects from 1.14.7 to 1.14.8 ([#7801](https://github.com/parse-community/parse-server/issues/7801)) ([70088a9](https://github.com/parse-community/parse-server/commit/70088a95a78393da2a4ac68be81e63107747626a))
+* security vulnerability that allows remote code execution (GHSA-p6h4-93qp-jhcm) ([#7844](https://github.com/parse-community/parse-server/issues/7844)) ([e569f40](https://github.com/parse-community/parse-server/commit/e569f402b1fd8648fb0d1523b71b2a03273902a5))
+* server crash using GraphQL due to missing @apollo/client peer dependency ([#7787](https://github.com/parse-community/parse-server/issues/7787)) ([08089d6](https://github.com/parse-community/parse-server/commit/08089d6fcbb215412448ce7d92b21b9fe6c929f2))
+* unable to use objectId size higher than 19 on GraphQL API ([#7627](https://github.com/parse-community/parse-server/issues/7627)) ([ed86c80](https://github.com/parse-community/parse-server/commit/ed86c807721cc52a1a5a9dea0b768717eec269ed))
+* upgrade mime from 2.5.2 to 3.0.0 ([#7725](https://github.com/parse-community/parse-server/issues/7725)) ([f5ef98b](https://github.com/parse-community/parse-server/commit/f5ef98bde32083403c0e30a12162fcc1e52cac37))
+* upgrade parse from 3.3.1 to 3.4.0 ([#7723](https://github.com/parse-community/parse-server/issues/7723)) ([d4c1f47](https://github.com/parse-community/parse-server/commit/d4c1f473073764cb0570c633fc4a30669c2ce889))
+* upgrade winston from 3.5.0 to 3.5.1 ([#7820](https://github.com/parse-community/parse-server/issues/7820)) ([4af253d](https://github.com/parse-community/parse-server/commit/4af253d1f8654a6f57b5137ad310cdacadc922cc))
+
+### Features
+
+* add Cloud Code context to `ParseObject.fetch` ([#7779](https://github.com/parse-community/parse-server/issues/7779)) ([315290d](https://github.com/parse-community/parse-server/commit/315290d16110110938f80a6b779cc2d1db58c552))
+* add Idempotency to Postgres ([#7750](https://github.com/parse-community/parse-server/issues/7750)) ([0c3feaa](https://github.com/parse-community/parse-server/commit/0c3feaaa1751964c0db89f25674935c3354b1538))
+* add support for Node 16 ([#7707](https://github.com/parse-community/parse-server/issues/7707)) ([45cc58c](https://github.com/parse-community/parse-server/commit/45cc58c7e5e640a46c5d508019a3aa81242964b1))
+* bump required node engine to >=12.22.10 ([#7846](https://github.com/parse-community/parse-server/issues/7846)) ([5ace99d](https://github.com/parse-community/parse-server/commit/5ace99d542a11e422af46d9fd6b1d3d2513b34cf))
+* support `postgresql` protocol in database URI ([#7757](https://github.com/parse-community/parse-server/issues/7757)) ([caf4a23](https://github.com/parse-community/parse-server/commit/caf4a2341f554b28e3918c53e7e897a3ca47bf8b))
+* support relativeTime query constraint on Postgres ([#7747](https://github.com/parse-community/parse-server/issues/7747)) ([16b1b2a](https://github.com/parse-community/parse-server/commit/16b1b2a19714535ca805f2dbb3b561d8f6a519a7))
+* upgrade to MongoDB Node.js driver 4.x for MongoDB 5.0 support ([#7794](https://github.com/parse-community/parse-server/issues/7794)) ([f88aa2a](https://github.com/parse-community/parse-server/commit/f88aa2a62a533e5344d1c13dd38c5a0b283a480a))
+
+### Reverts
+
+* refactor: allow ES import for cloud string if package type is module ([b64640c](https://github.com/parse-community/parse-server/commit/b64640c5705f733798783e68d216e957044ef23c))
+* update node engine to 2.22.0 ([#7827](https://github.com/parse-community/parse-server/issues/7827)) ([f235412](https://github.com/parse-community/parse-server/commit/f235412c1b6c2b173b7531f285429ea7214b56a2))
+
+### ⚠️ NOTABLE CHANGES
+
+*The following changes would formally require a major version increment (Parse Server 6.0), but given their low relevance they are released as part of this minor version increment (Parse Server 5.1).*
+
+* The MongoDB GridStore adapter has been removed. By default, Parse Server already uses GridFS, so if you do not manually use the GridStore adapter, you can ignore this change. Parse Server uses the GridFSBucket adapter instead of GridStore adapter by default since 2018. ([f88aa2a](f88aa2a))
+* Removes official Node 15 support which has already reached it End-of-Life date. ([45cc58c](45cc58c))
+
+
+# [5.0.0](https://github.com/parse-community/parse-server/compare/4.10.7...5.0.0) (2022-03-14)


 ### BREAKING CHANGES
+- Improved schema caching through database real-time hooks. Reduces DB queries, decreases Parse Query execution time and fixes a potential schema memory leak. If multiple Parse Server instances connect to the same DB (for example behind a load balancer), set the [Parse Server Option](https://parseplatform.org/parse-server/api/master/ParseServerOptions.html) `databaseOptions.enableSchemaHooks: true` to enable this feature and keep the schema in sync across all instances. Failing to do so will cause a schema change to not propagate to other instances and re-syncing will only happen when these instances restart. The options `enableSingleSchemaCache` and `schemaCacheTTL` have been removed. To use this feature with MongoDB, a replica set cluster with [change stream](https://docs.mongodb.com/manual/changeStreams/#availability) support is required. (Diamond Lewis, SebC) [#7214](https://github.com/parse-community/parse-server/issues/7214)
+- Fix security vulnerability that allows remote code execution; as part of the fix a new security feature scans for sensitive keywords in request data to prevent JavaScript prototype pollution. If such a keyword is found, the request is rejected with HTTP response code `400` and Parse Error `105` (`INVALID_KEY_NAME`). By default these keywords are: `{_bsontype: "Code"}`, `constructor`, `__proto__`. If you are using any of these keywords in your request data, you can override the default keywords by setting the new Parse Server option `requestKeywordDenylist` to `[]` and specify your own keywords as needed. ([GHSA-p6h4-93qp-jhcm](https://github.com/advisories/GHSA-p6h4-93qp-jhcm)) ([#7843](https://github.com/parse-community/parse-server/issues/7843)) ([971adb5](https://github.com/parse-community/parse-server/commit/971adb54387b0ede31be05ca407d5f35b4575c83))
+- 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) (dblythy, Manuel Trezza) [#7071](https://github.com/parse-community/parse-server/pull/7071)
+- Removed [parse-server-simple-mailgun-adapter](https://github.com/parse-community/parse-server-simple-mailgun-adapter) dependency; to continue using the adapter it has to be explicitly installed (Manuel Trezza) [#7321](https://github.com/parse-community/parse-server/pull/7321)
+- Remove support for MongoDB 3.6 which has reached its End-of-Life date and PostgreSQL 10 (Manuel Trezza) [#7315](https://github.com/parse-community/parse-server/pull/7315)
+- Remove support for Node 10 which has reached its End-of-Life date (Manuel Trezza) [#7314](https://github.com/parse-community/parse-server/pull/7314)
+- Bump required Node engine to >=12.22.10 ([#7848](https://github.com/parse-community/parse-server/issues/7848)) ([23a3488](https://github.com/parse-community/parse-server/commit/23a3488f15511fafbe0e1d7ff0ef8355f9cb0215))
+- Remove S3 Files Adapter from Parse Server, instead install separately as `@parse/s3-files-adapter` (Manuel Trezza) [#7324](https://github.com/parse-community/parse-server/pull/7324)
+- Remove Session field `restricted`; the field was a code artifact from a feature that never existed in Open Source Parse Server; if you have been using this field for custom purposes, consider that for new Parse Server installations the field does not exist anymore in the schema, and for existing installations the field default value `false` will not be set anymore when creating a new session (Manuel Trezza) [#7543](https://github.com/parse-community/parse-server/pull/7543)
+- To delete a field via the GraphQL API, the field value has to be set to `null`. Previously, setting a field value to `null` would save a null value in the database, which was not according to the [GraphQL specs](https://spec.graphql.org/June2018/#sec-Null-Value). To delete a file field use `file: null`, the previous way of using `file: { file: null }` has become obsolete. ([626fad2](626fad2))

-* This requires Node.js version >=12.22.10. ([23a3488](23a3488))
-* To delete a field via the GraphQL API, the field value has to be set to `null`. Previously, setting a field value to `null` would save a null value in the database, which was not according to the [GraphQL specs](https://spec.graphql.org/June2018/#sec-Null-Value). To delete a file field use `file: null`, the previous way of using `file: { file: null }` has become obsolete. ([626fad2](626fad2))
+### Notable Changes
+- Alphabetical ordered GraphQL API, improved GraphQL Schema cache system and fix GraphQL input reassign issue (Moumouls) [#7344](https://github.com/parse-community/parse-server/issues/7344)
+- Added Parse Server Security Check to report weak security settings (Manuel Trezza, dblythy) [#7247](https://github.com/parse-community/parse-server/issues/7247)
+- EXPERIMENTAL: Added new page router with placeholder rendering and localization of custom and feature pages such as password reset and email verification (Manuel Trezza) [#7128](https://github.com/parse-community/parse-server/pull/7128)
+- EXPERIMENTAL: Added custom routes to easily customize flows for password reset, email verification or build entirely new flows (Manuel Trezza) [#7231](https://github.com/parse-community/parse-server/pull/7231)
+- Added Deprecation Policy to govern the introduction of breaking changes in a phased pattern that is more predictable for developers (Manuel Trezza) [#7199](https://github.com/parse-community/parse-server/pull/7199)
+- Add REST API endpoint `/loginAs` to create session of any user with master key; allows to impersonate another user. (GormanFletcher) [#7406](https://github.com/parse-community/parse-server/pull/7406)
+- Add official support for MongoDB 5.0 (Manuel Trezza) [#7469](https://github.com/parse-community/parse-server/pull/7469)
+- Added Parse Server Configuration `enforcePrivateUsers`, which will remove public access by default on new Parse.Users (dblythy) [#7319](https://github.com/parse-community/parse-server/pull/7319)
+- add support for Postgres 14 ([#7644](https://github.com/parse-community/parse-server/issues/7644)) ([090350a](https://github.com/parse-community/parse-server/commit/090350a7a0fac945394ca1cb24b290316ef06aa7))
+- add user-defined schema and migrations ([#7418](https://github.com/parse-community/parse-server/issues/7418)) ([25d5c30](https://github.com/parse-community/parse-server/commit/25d5c30be2111be332eb779eb0697774a17da7af))
+- setting a field to null does not delete it via GraphQL API ([#7649](https://github.com/parse-community/parse-server/issues/7649)) ([626fad2](https://github.com/parse-community/parse-server/commit/626fad2e71017dcc62196c487de5f908fa43000b))
+- combined `and` query with relational query condition returns incorrect results ([#7593](https://github.com/parse-community/parse-server/issues/7593)) ([174886e](https://github.com/parse-community/parse-server/commit/174886e385e091c6bbd4a84891ef95f80b50d05c))
+- node engine range has no upper limit to exclude incompatible node versions ([#7693](https://github.com/parse-community/parse-server/issues/7693)) ([6a54dac](https://github.com/parse-community/parse-server/commit/6a54dac24d9fb63a44f311b8d414f4aa64140f32))
+- unable to use objectId size higher than 19 on GraphQL API ([#7722](https://github.com/parse-community/parse-server/issues/7722)) ([8ee0445](https://github.com/parse-community/parse-server/commit/8ee0445c0aeeb88dff2559b46ade408071d22143))
+- schema cache not cleared in some cases ([#7771](https://github.com/parse-community/parse-server/issues/7771)) ([3b92fa1](https://github.com/parse-community/parse-server/commit/3b92fa1ca9e8889127a32eba913d68309397ca2c))
+
+### Other Changes
+- Support native mongodb syntax in aggregation pipelines (Raschid JF Rafeally) [#7339](https://github.com/parse-community/parse-server/pull/7339)
+- Fix error when a not yet inserted job is updated (Antonio Davi Macedo Coelho de Castro) [#7196](https://github.com/parse-community/parse-server/pull/7196)
+- request.context for afterFind triggers (dblythy) [#7078](https://github.com/parse-community/parse-server/pull/7078)
+- Winston Logger interpolating stdout to console (dplewis) [#7114](https://github.com/parse-community/parse-server/pull/7114)
+- Added convenience method `Parse.Cloud.sendEmail(...)` to send email via email adapter in Cloud Code (dblythy) [#7089](https://github.com/parse-community/parse-server/pull/7089)
+- LiveQuery support for $and, $nor, $containedBy, $geoWithin, $geoIntersects queries (dplewis) [#7113](https://github.com/parse-community/parse-server/pull/7113)
+- Supporting patterns in LiveQuery server's config parameter `classNames` (Nes-si) [#7131](https://github.com/parse-community/parse-server/pull/7131)
+- Added `requireAnyUserRoles` and `requireAllUserRoles` for Parse Cloud validator (dblythy) [#7097](https://github.com/parse-community/parse-server/pull/7097)
+- Support Facebook Limited Login (miguel-s) [#7219](https://github.com/parse-community/parse-server/pull/7219)
+- Removed Stage name check on aggregate pipelines (BRETT71) [#7237](https://github.com/parse-community/parse-server/pull/7237)
+- Retry transactions on MongoDB when it fails due to transient error (Antonio Davi Macedo Coelho de Castro) [#7187](https://github.com/parse-community/parse-server/pull/7187)
+- Bump tests to use Mongo 4.4.4 (Antonio Davi Macedo Coelho de Castro) [#7184](https://github.com/parse-community/parse-server/pull/7184)
+- Added new account lockout policy option `accountLockout.unlockOnPasswordReset` to automatically unlock account on password reset (Manuel Trezza) [#7146](https://github.com/parse-community/parse-server/pull/7146)
+- Test Parse Server continuously against all recent MongoDB versions that have not reached their end-of-life support date, added MongoDB compatibility table to Parse Server docs (Manuel Trezza) [#7161](https://github.com/parse-community/parse-server/pull/7161)
+- Test Parse Server continuously against all recent Node.js versions that have not reached their end-of-life support date, added Node.js compatibility table to Parse Server docs (Manuel Trezza) [7161](https://github.com/parse-community/parse-server/pull/7177)
+- Throw error on invalid Cloud Function validation configuration (dblythy) [#7154](https://github.com/parse-community/parse-server/pull/7154)
+- Allow Cloud Validator `options` to be async (dblythy) [#7155](https://github.com/parse-community/parse-server/pull/7155)
+- Optimize queries on classes with pointer permissions (Pedro Diaz) [#7061](https://github.com/parse-community/parse-server/pull/7061)
+- Test Parse Server continuously against all relevant Postgres versions (minor versions), added Postgres compatibility table to Parse Server docs (Corey Baker) [#7176](https://github.com/parse-community/parse-server/pull/7176)
+- Randomize test suite (Diamond Lewis) [#7265](https://github.com/parse-community/parse-server/pull/7265)
+- LDAP: Properly unbind client on group search error (Diamond Lewis) [#7265](https://github.com/parse-community/parse-server/pull/7265)
+- Improve data consistency in Push and Job Status update (Diamond Lewis) [#7267](https://github.com/parse-community/parse-server/pull/7267)
+- Excluding keys that have trailing edges.node when performing GraphQL resolver (Chris Bland) [#7273](https://github.com/parse-community/parse-server/pull/7273)
+- Added centralized feature deprecation with standardized warning logs (Manuel Trezza) [#7303](https://github.com/parse-community/parse-server/pull/7303)
+- Use Node.js 15.13.0 in CI (Olle Jonsson) [#7312](https://github.com/parse-community/parse-server/pull/7312)
+- Fix file upload issue for S3 compatible storage (Linode, DigitalOcean) by avoiding empty tags property when creating a file (Ali Oguzhan Yildiz) [#7300](https://github.com/parse-community/parse-server/pull/7300)
+- Add building Docker image as CI check (Manuel Trezza) [#7332](https://github.com/parse-community/parse-server/pull/7332)
+- Add NPM package-lock version check to CI (Manuel Trezza) [#7333](https://github.com/parse-community/parse-server/pull/7333)
+- Fix incorrect LiveQuery events triggered for multiple subscriptions on the same class with different events [#7341](https://github.com/parse-community/parse-server/pull/7341)
+- Fix select and excludeKey queries to properly accept JSON string arrays. Also allow nested fields in exclude (Corey Baker) [#7242](https://github.com/parse-community/parse-server/pull/7242)
+- Fix LiveQuery server crash when using $all query operator on a missing object key (Jason Posthuma) [#7421](https://github.com/parse-community/parse-server/pull/7421)
+- Added runtime deprecation warnings (Manuel Trezza) [#7451](https://github.com/parse-community/parse-server/pull/7451)
+- Add ability to pass context of an object via a header, X-Parse-Cloud-Context, for Cloud Code triggers. The header addition allows client SDK's to add context without injecting _context in the body of JSON objects (Corey Baker) [#7437](https://github.com/parse-community/parse-server/pull/7437)
+- Add CI check to add changelog entry (Manuel Trezza) [#7512](https://github.com/parse-community/parse-server/pull/7512)
+- Refactor: uniform issue templates across repos (Manuel Trezza) [#7528](https://github.com/parse-community/parse-server/pull/7528)
+- ci: bump ci environment (Manuel Trezza) [#7539](https://github.com/parse-community/parse-server/pull/7539)
+- CI now pushes docker images to Docker Hub (Corey Baker) [#7548](https://github.com/parse-community/parse-server/pull/7548)
+- Allow afterFind and afterLiveQueryEvent to set unsaved pointers and keys (dblythy) [#7310](https://github.com/parse-community/parse-server/pull/7310)
+- Allow setting descending sort to full text queries (dblythy) [#7496](https://github.com/parse-community/parse-server/pull/7496)
+- Allow cloud string for ES modules (Daniel Blyth) [#7560](https://github.com/parse-community/parse-server/pull/7560)
+- docs: Introduce deprecation ID for reference in comments and online search (Manuel Trezza) [#7562](https://github.com/parse-community/parse-server/pull/7562)
+- refactor: deprecate `Parse.Cloud.httpRequest`; it is recommended to use a HTTP library instead. (Daniel Blyth) [#7595](https://github.com/parse-community/parse-server/pull/7595)
+- refactor: Modernize HTTPRequest tests (brandongregoryscott) [#7604](https://github.com/parse-community/parse-server/pull/7604)
+- Allow liveQuery on Session class (Daniel Blyth) [#7554](https://github.com/parse-community/parse-server/pull/7554)
+- security upgrade follow-redirects from 1.14.2 to 1.14.7 ([#7772](https://github.com/parse-community/parse-server/issues/7772)) ([4bd34b1](https://github.com/parse-community/parse-server/commit/4bd34b189bc9f5aa2e70b7e7c1a456e91b6de773))
+- security upgrade follow-redirects from 1.14.7 to 1.14.8 ([#7802](https://github.com/parse-community/parse-server/issues/7802)) ([7029b27](https://github.com/parse-community/parse-server/commit/7029b274ca87bc8058617f29865d683dc3b351a1))
+- Add node engine version check (Manuel Trezza) [#7574](https://github.com/parse-community/parse-server/pull/7574)
+
+## [4.10.7](https://github.com/parse-community/parse-server/compare/4.10.6...4.10.7) (2022-03-11)
+
+
+### Bug Fixes
+
+* security vulnerability that allows remote code execution ([GHSA-p6h4-93qp-jhcm](https://github.com/parse-community/parse-server/security/advisories/GHSA-p6h4-93qp-jhcm)) ([#7841](https://github.com/parse-community/parse-server/issues/7841)) ([886bfd7](https://github.com/parse-community/parse-server/commit/886bfd7cac69496e3f73d4bb536f0eec3cba0e4d))
+
+  Note that as part of the fix a new security feature scans for sensitive keywords in request data to prevent JavaScript prototype pollution. If such a keyword is found, the request is rejected with HTTP response code `400` and Parse Error `105` (`INVALID_KEY_NAME`). By default these keywords are: `{_bsontype: "Code"}`, `constructor`, `__proto__`. If you are using any of these keywords in your request data, you can override the default keywords by setting the new Parse Server option `requestKeywordDenylist` to `[]` and specify your own keywords as needed.
+
+## [4.10.6](https://github.com/parse-community/parse-server/compare/4.10.5...4.10.6) (2022-02-12)
+
+
+### Bug Fixes
+
+* update graphql dependencies to work with Parse Dashboard ([#7658](https://github.com/parse-community/parse-server/issues/7658)) ([350ecde](https://github.com/parse-community/parse-server/commit/350ecdee590f1b9d721895b2c79306c01622c3fc))
+
+## [4.10.5](https://github.com/parse-community/parse-server/compare/4.10.4...4.10.5) (2022-02-12)
+
+
+### Bug Fixes
+
+* security upgrade follow-redirects from 1.13.0 to 1.14.8 ([#7803](https://github.com/parse-community/parse-server/issues/7803)) ([611332e](https://github.com/parse-community/parse-server/commit/611332ea33831258efd3dd2f2c621c2e35fc95d3))

 # [4.10.4](https://github.com/parse-community/parse-server/compare/4.10.3...4.10.4)

@@ -1,4 +1,4 @@
-'use strict'
+'use strict';

 const CiVersionCheck = require('./CiVersionCheck');
 const mongoVersionList = require('mongodb-version-list');
@@ -14,9 +14,8 @@ async function check() {
 * Check the MongoDB versions used in test environments.
 */
 async function checkMongoDbVersions() {
-
  const releasedVersions = await new Promise((resolve, reject) => {
-    mongoVersionList(function(error, versions) {
+    mongoVersionList(function (error, versions) {
      if (error) {
        reject(error);
      }
@@ -47,7 +46,6 @@ async function checkMongoDbVersions() {
 * Check the Nodejs versions used in test environments.
 */
 async function checkNodeVersions() {
-
  const allVersions = await allNodeVersions();
  const releasedVersions = allVersions.versions;

@@ -62,7 +60,8 @@ async function checkNodeVersions() {
    ignoreReleasedVersions: [
      '<12.0.0', // These versions have reached their end-of-life support date
      '>=13.0.0 <14.0.0', // These versions have reached their end-of-life support date
-      '>=16.0.0', // This version has not been officially released yet
+      '>=15.0.0 <16.0.0', // These versions have reached their end-of-life support date
+      '>=17.0.0', // These versions are not officially supported yet
    ],
  }).check();
 }
@@ -75,17 +75,21 @@ class NodeEngineCheck {

    // For each file
    for (const file of files) {
-
      // Get node version
      const contentString = await fs.readFile(file, 'utf-8');
-      const contentJson = JSON.parse(contentString);
-      const version = ((contentJson || {}).engines || {}).node;
+      try {
+        const contentJson = JSON.parse(contentString);
+        const version = ((contentJson || {}).engines || {}).node;

-      // Add response
-      response.push({
-        file: file,
-        nodeVersion: version
-      });
+        // Add response
+        response.push({
+          file: file,
+          nodeVersion: version
+        });
+      } catch(e) {
+        console.log(`Ignoring file because it is not valid JSON: ${file}`);
+        core.warning(`Ignoring file because it is not valid JSON: ${file}`);
+      }
    }

    // If results should be cleaned by removing undefined node versions
@@ -1,6 +1,6 @@
 {
  "name": "parse-server",
-  "version": "5.0.0",
+  "version": "5.2.1-alpha.2",
  "description": "An express module providing a Parse-compatible API server",
  "main": "lib/index.js",
  "repository": {
@@ -20,45 +20,46 @@
  "license": "BSD-3-Clause",
  "dependencies": {
    "@apollographql/graphql-playground-html": "1.6.29",
-    "@graphql-tools/links": "6.2.5",
+    "@graphql-tools/links": "8.2.2",
+    "@apollo/client": "3.5.8",
    "@graphql-tools/stitch": "6.2.4",
    "@graphql-tools/utils": "6.2.4",
-    "@parse/fs-files-adapter": "1.2.0",
-    "@parse/push-adapter": "3.4.1",
+    "@parse/fs-files-adapter": "1.2.1",
+    "@parse/push-adapter": "4.1.0",
    "apollo-server-express": "2.25.2",
    "bcryptjs": "2.4.3",
-    "body-parser": "1.19.0",
+    "body-parser": "1.19.1",
    "commander": "5.1.0",
    "cors": "2.8.5",
    "deepcopy": "2.1.0",
-    "express": "4.17.1",
+    "express": "4.17.2",
    "follow-redirects": "1.14.8",
-    "graphql": "15.6.0",
+    "graphql": "15.7.1",
    "graphql-list-fields": "2.0.2",
    "graphql-relay": "0.7.0",
-    "graphql-tag": "2.12.5",
+    "graphql-tag": "2.12.6",
    "graphql-upload": "11.0.0",
    "intersect": "1.0.1",
    "jsonwebtoken": "8.5.1",
-    "jwks-rsa": "1.12.3",
+    "jwks-rsa": "2.0.5",
    "ldapjs": "2.3.1",
    "lodash": "4.17.21",
-    "lru-cache": "5.1.1",
-    "mime": "2.5.2",
-    "mongodb": "3.6.11",
+    "lru-cache": "6.0.0",
+    "mime": "3.0.0",
+    "mongodb": "4.3.1",
    "mustache": "4.2.0",
-    "parse": "3.3.1",
+    "parse": "3.4.1",
    "pg-monitor": "1.4.1",
-    "pg-promise": "10.11.0",
+    "pg-promise": "10.11.1",
    "pluralize": "8.0.0",
    "redis": "3.1.2",
    "semver": "7.3.5",
-    "subscriptions-transport-ws": "0.10.0",
+    "subscriptions-transport-ws": "0.11.0",
    "tv4": "1.3.0",
    "uuid": "8.3.2",
-    "winston": "3.3.3",
-    "winston-daily-rotate-file": "4.5.5",
-    "ws": "8.2.2"
+    "winston": "3.5.1",
+    "winston-daily-rotate-file": "4.6.0",
+    "ws": "8.2.3"
  },
  "devDependencies": {
    "@actions/core": "1.2.6",
@@ -68,6 +69,7 @@
    "@babel/plugin-transform-flow-strip-types": "7.9.0",
    "@babel/preset-env": "7.10.0",
    "@parse/minami": "1.0.0",
+    "@saithodev/semantic-release-backmerge": "2.1.2",
    "@semantic-release/changelog": "5.0.1",
    "@semantic-release/commit-analyzer": "8.0.1",
    "@semantic-release/git": "9.0.0",
@@ -75,12 +77,7 @@
    "@semantic-release/npm": "7.1.3",
    "@semantic-release/release-notes-generator": "9.0.3",
    "all-node-versions": "8.0.0",
-    "apollo-cache-inmemory": "1.6.6",
-    "apollo-client": "2.6.10",
-    "apollo-link": "1.2.14",
-    "apollo-link-http": "1.5.17",
-    "apollo-link-ws": "1.0.20",
-    "apollo-upload-client": "13.0.0",
+    "apollo-upload-client": "16.0.0",
    "apollo-utilities": "1.3.4",
    "babel-eslint": "10.1.0",
    "bcrypt-nodejs": "0.0.3",
@@ -101,7 +98,7 @@
    "mock-mail-adapter": "file:spec/dependencies/mock-mail-adapter",
    "mongodb-runner": "4.8.1",
    "mongodb-version-list": "1.0.0",
-    "node-fetch": "2.6.1",
+    "node-fetch": "3.1.1",
    "nyc": "15.1.0",
    "prettier": "2.0.5",
    "semantic-release": "17.4.6",
@@ -122,12 +119,13 @@
    "test:mongodb:4.0.27": "npm run test:mongodb --dbversion=4.0.27",
    "test:mongodb:4.2.17": "npm run test:mongodb --dbversion=4.2.17",
    "test:mongodb:4.4.10": "npm run test:mongodb --dbversion=4.4.10",
+    "test:mongodb:5.0.5": "npm run test:mongodb --dbversion=5.0.5",
    "posttest:mongodb": "mongodb-runner stop",
-    "pretest": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=4.4.10} MONGODB_TOPOLOGY=${MONGODB_TOPOLOGY:=standalone} MONGODB_STORAGE_ENGINE=${MONGODB_STORAGE_ENGINE:=wiredTiger} mongodb-runner start",
-    "testonly": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=4.4.10} MONGODB_TOPOLOGY=${MONGODB_TOPOLOGY:=standalone} MONGODB_STORAGE_ENGINE=${MONGODB_STORAGE_ENGINE:=wiredTiger} TESTING=1 jasmine",
+    "pretest": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=5.0.5} MONGODB_TOPOLOGY=${MONGODB_TOPOLOGY:=standalone} MONGODB_STORAGE_ENGINE=${MONGODB_STORAGE_ENGINE:=wiredTiger} mongodb-runner start",
+    "testonly": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=5.0.5} MONGODB_TOPOLOGY=${MONGODB_TOPOLOGY:=standalone} MONGODB_STORAGE_ENGINE=${MONGODB_STORAGE_ENGINE:=wiredTiger} TESTING=1 jasmine",
    "test": "npm run testonly",
-    "posttest": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=4.4.10} MONGODB_TOPOLOGY=${MONGODB_TOPOLOGY:=standalone} MONGODB_STORAGE_ENGINE=${MONGODB_STORAGE_ENGINE:=wiredTiger} mongodb-runner stop",
-    "coverage": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=4.4.10} MONGODB_TOPOLOGY=${MONGODB_TOPOLOGY:=standalone} MONGODB_STORAGE_ENGINE=${MONGODB_STORAGE_ENGINE:=wiredTiger} TESTING=1 nyc jasmine",
+    "posttest": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=5.0.5} MONGODB_TOPOLOGY=${MONGODB_TOPOLOGY:=standalone} MONGODB_STORAGE_ENGINE=${MONGODB_STORAGE_ENGINE:=wiredTiger} mongodb-runner stop",
+    "coverage": "cross-env MONGODB_VERSION=${MONGODB_VERSION:=5.0.5} MONGODB_TOPOLOGY=${MONGODB_TOPOLOGY:=standalone} MONGODB_STORAGE_ENGINE=${MONGODB_STORAGE_ENGINE:=wiredTiger} TESTING=1 nyc jasmine",
    "start": "node ./bin/parse-server",
    "prettier": "prettier --write {src,spec}/{**/*,*}.js",
    "prepare": "npm run build",
@@ -135,7 +133,7 @@
    "madge:circular": "node_modules/.bin/madge ./src --circular"
  },
  "engines": {
-    "node": ">=12.22.10 <16"
+    "node": ">=12.22.10 <17"
  },
  "bin": {
    "parse-server": "bin/parse-server"
@@ -83,6 +83,16 @@ async function config() {
      ['@semantic-release/git', {
        assets: [changelogFile, 'package.json', 'package-lock.json', 'npm-shrinkwrap.json'],
      }],
+      [
+        "@saithodev/semantic-release-backmerge",
+        {
+          "branches": [
+            { from: "beta", to: "alpha" },
+            { from: "release", to: "beta" },
+            { from: "release", to: "alpha" },
+          ]
+        }
+      ],
      ['@semantic-release/github', {
        successComment: getReleaseComment(),
        labels: ['type:ci'],
@@ -326,22 +326,24 @@ describe('AudiencesRouter', () => {
      { name: 'My Audience', query: JSON.stringify({ deviceType: 'ios' }) },
      { useMasterKey: true }
    ).then(audience => {
-      database.collection('test__Audience').updateOne(
-        { _id: audience.objectId },
-        {
-          $set: {
-            times_used: 1,
-            _last_used: now,
-          },
-        },
-        {},
-        error => {
-          expect(error).toEqual(null);
+      database
+        .collection('test__Audience')
+        .updateOne(
+          { _id: audience.objectId },
+          {
+            $set: {
+              times_used: 1,
+              _last_used: now,
+            },
+          }
+        )
+        .then(result => {
+          expect(result).toBeTruthy();
          database
            .collection('test__Audience')
            .find({ _id: audience.objectId })
            .toArray((error, rows) => {
-              expect(error).toEqual(null);
+              expect(error).toEqual(undefined);
              expect(rows[0]['times_used']).toEqual(1);
              expect(rows[0]['_last_used']).toEqual(now);
              Parse._request(
@@ -361,8 +363,7 @@ describe('AudiencesRouter', () => {
                  done.fail(error);
                });
            });
-        }
-      );
+        });
    });
  });

@@ -1707,6 +1707,26 @@ describe('Apple Game Center Auth adapter', () => {
      expect(e.message).toBe('Apple Game Center - invalid publicKeyUrl: invalid.com');
    }
  });
+
+  it('validateAuthData invalid public key http url', async () => {
+    const authData = {
+      id: 'G:1965586982',
+      publicKeyUrl: 'http://static.gc.apple.com/public-key/gc-prod-4.cer',
+      timestamp: 1565257031287,
+      signature: '1234',
+      salt: 'DzqqrQ==',
+      bundleId: 'cloud.xtralife.gamecenterauth',
+    };
+
+    try {
+      await gcenter.validateAuthData(authData);
+      fail();
+    } catch (e) {
+      expect(e.message).toBe(
+        'Apple Game Center - invalid publicKeyUrl: http://static.gc.apple.com/public-key/gc-prod-4.cer'
+      );
+    }
+  });
 });

 describe('phant auth adapter', () => {
@@ -1494,6 +1494,110 @@ describe('Cloud Code', () => {
    });
  });

+  it('before save can revert fields', async () => {
+    Parse.Cloud.beforeSave('TestObject', ({ object }) => {
+      object.revert('foo');
+      return object;
+    });
+
+    Parse.Cloud.afterSave('TestObject', ({ object }) => {
+      expect(object.get('foo')).toBeUndefined();
+      return object;
+    });
+
+    const obj = new TestObject();
+    obj.set('foo', 'bar');
+    await obj.save();
+
+    expect(obj.get('foo')).toBeUndefined();
+    await obj.fetch();
+
+    expect(obj.get('foo')).toBeUndefined();
+  });
+
+  it('before save can revert fields with existing object', async () => {
+    Parse.Cloud.beforeSave(
+      'TestObject',
+      ({ object }) => {
+        object.revert('foo');
+        return object;
+      },
+      {
+        skipWithMasterKey: true,
+      }
+    );
+
+    Parse.Cloud.afterSave(
+      'TestObject',
+      ({ object }) => {
+        expect(object.get('foo')).toBe('bar');
+        return object;
+      },
+      {
+        skipWithMasterKey: true,
+      }
+    );
+
+    const obj = new TestObject();
+    obj.set('foo', 'bar');
+    await obj.save(null, { useMasterKey: true });
+
+    expect(obj.get('foo')).toBe('bar');
+    obj.set('foo', 'yolo');
+    await obj.save();
+    expect(obj.get('foo')).toBe('bar');
+  });
+
+  it('can unset in afterSave', async () => {
+    Parse.Cloud.beforeSave('TestObject', ({ object }) => {
+      if (!object.existed()) {
+        object.set('secret', true);
+        return object;
+      }
+      object.revert('secret');
+    });
+
+    Parse.Cloud.afterSave('TestObject', ({ object }) => {
+      object.unset('secret');
+    });
+
+    Parse.Cloud.beforeFind(
+      'TestObject',
+      ({ query }) => {
+        query.exclude('secret');
+      },
+      {
+        skipWithMasterKey: true,
+      }
+    );
+
+    const obj = new TestObject();
+    await obj.save();
+    expect(obj.get('secret')).toBeUndefined();
+    await obj.fetch();
+    expect(obj.get('secret')).toBeUndefined();
+    await obj.fetch({ useMasterKey: true });
+    expect(obj.get('secret')).toBe(true);
+  });
+
+  it('should revert in beforeSave', async () => {
+    Parse.Cloud.beforeSave('MyObject', ({ object }) => {
+      if (!object.existed()) {
+        object.set('count', 0);
+        return object;
+      }
+      object.revert('count');
+      return object;
+    });
+    const obj = await new Parse.Object('MyObject').save();
+    expect(obj.get('count')).toBe(0);
+    obj.set('count', 10);
+    await obj.save();
+    expect(obj.get('count')).toBe(0);
+    await obj.fetch();
+    expect(obj.get('count')).toBe(0);
+  });
+
  it('beforeSave should not sanitize database', async done => {
    const { adapter } = Config.get(Parse.applicationId).database;
    const spy = spyOn(adapter, 'findOneAndUpdate').and.callThrough();
@@ -1860,6 +1964,36 @@ describe('afterSave hooks', () => {
    const myObject = new MyObject();
    myObject.save().then(() => done());
  });
+
+  it('should unset in afterSave', async () => {
+    Parse.Cloud.afterSave(
+      'MyObject',
+      ({ object }) => {
+        object.unset('secret');
+      },
+      {
+        skipWithMasterKey: true,
+      }
+    );
+    const obj = new Parse.Object('MyObject');
+    obj.set('secret', 'bar');
+    await obj.save();
+    expect(obj.get('secret')).toBeUndefined();
+    await obj.fetch();
+    expect(obj.get('secret')).toBe('bar');
+  });
+
+  it('should unset', async () => {
+    Parse.Cloud.beforeSave('MyObject', ({ object }) => {
+      object.set('secret', 'hidden');
+    });
+
+    Parse.Cloud.afterSave('MyObject', ({ object }) => {
+      object.unset('secret');
+    });
+    const obj = await new Parse.Object('MyObject').save();
+    expect(obj.get('secret')).toBeUndefined();
+  });
 });

 describe('beforeDelete hooks', () => {
@@ -1999,6 +2133,25 @@ describe('beforeFind hooks', () => {
    });
  });

+  it('should have object found with nested relational data query', async () => {
+    const obj1 = Parse.Object.extend('TestObject');
+    const obj2 = Parse.Object.extend('TestObject2');
+    let item2 = new obj2();
+    item2 = await item2.save();
+    let item1 = new obj1();
+    const relation = item1.relation('rel');
+    relation.add(item2);
+    item1 = await item1.save();
+    Parse.Cloud.beforeFind('TestObject', req => {
+      const additionalQ = new Parse.Query('TestObject');
+      additionalQ.equalTo('rel', item2);
+      return Parse.Query.and(req.query, additionalQ);
+    });
+    const q = new Parse.Query('TestObject');
+    const res = await q.first();
+    expect(res.id).toEqual(item1.id);
+  });
+
  it('should use the modified exclude query', async () => {
    Parse.Cloud.beforeFind('MyObject', req => {
      const q = req.query;
@@ -3205,6 +3358,21 @@ describe('afterLogin hook', () => {
    const query = new Parse.Query(TestObject);
    await query.find({ context: { a: 'a' } });
  });
+
+  it('beforeFind and afterFind should have access to context while making fetch call', async () => {
+    Parse.Cloud.beforeFind('TestObject', req => {
+      expect(req.context.a).toEqual('a');
+      expect(req.context.b).toBeUndefined();
+      req.context.b = 'b';
+    });
+    Parse.Cloud.afterFind('TestObject', req => {
+      expect(req.context.a).toEqual('a');
+      expect(req.context.b).toEqual('b');
+    });
+    const obj = new TestObject();
+    await obj.save();
+    await obj.fetch({ context: { a: 'a' } });
+  });
 });

 describe('saveFile hooks', () => {
@@ -3516,23 +3684,4 @@ describe('sendEmail', () => {
      'Failed to send email because no mail adapter is configured for Parse Server.'
    );
  });
-
-  it('should have object found with nested relational data query', async () => {
-    const obj1 = Parse.Object.extend('TestObject');
-    const obj2 = Parse.Object.extend('TestObject2');
-    let item2 = new obj2();
-    item2 = await item2.save();
-    let item1 = new obj1();
-    const relation = item1.relation('rel');
-    relation.add(item2);
-    item1 = await item1.save();
-    Parse.Cloud.beforeFind('TestObject', req => {
-      const additionalQ = new Parse.Query('TestObject');
-      additionalQ.equalTo('rel', item2);
-      return Parse.Query.and(req.query, additionalQ);
-    });
-    const q = new Parse.Query('TestObject');
-    const res = await q.first();
-    expect(res.id).toEqual(item1.id);
-  });
 });
@@ -3,7 +3,6 @@ const WinstonLoggerAdapter = require('../lib/Adapters/Logger/WinstonLoggerAdapte
  .WinstonLoggerAdapter;
 const GridFSBucketAdapter = require('../lib/Adapters/Files/GridFSBucketAdapter')
  .GridFSBucketAdapter;
-const GridStoreAdapter = require('../lib/Adapters/Files/GridStoreAdapter').GridStoreAdapter;
 const Config = require('../lib/Config');
 const FilesController = require('../lib/Controllers/FilesController').default;
 const databaseURI = 'mongodb://localhost:27017/parse';
@@ -24,8 +23,8 @@ const mockAdapter = {
 describe('FilesController', () => {
  it('should properly expand objects', done => {
    const config = Config.get(Parse.applicationId);
-    const gridStoreAdapter = new GridFSBucketAdapter('mongodb://localhost:27017/parse');
-    const filesController = new FilesController(gridStoreAdapter);
+    const gridFSAdapter = new GridFSBucketAdapter('mongodb://localhost:27017/parse');
+    const filesController = new FilesController(gridFSAdapter);
    const result = filesController.expandFilesInObject(config, function () {});

    expect(result).toBeUndefined();
@@ -88,19 +87,19 @@ describe('FilesController', () => {

  it('should add a unique hash to the file name when the preserveFileName option is false', done => {
    const config = Config.get(Parse.applicationId);
-    const gridStoreAdapter = new GridFSBucketAdapter('mongodb://localhost:27017/parse');
-    spyOn(gridStoreAdapter, 'createFile');
-    gridStoreAdapter.createFile.and.returnValue(Promise.resolve());
+    const gridFSAdapter = new GridFSBucketAdapter('mongodb://localhost:27017/parse');
+    spyOn(gridFSAdapter, 'createFile');
+    gridFSAdapter.createFile.and.returnValue(Promise.resolve());
    const fileName = 'randomFileName.pdf';
    const regexEscapedFileName = fileName.replace(/\./g, '\\$&');
-    const filesController = new FilesController(gridStoreAdapter, null, {
+    const filesController = new FilesController(gridFSAdapter, null, {
      preserveFileName: false,
    });

    filesController.createFile(config, fileName);

-    expect(gridStoreAdapter.createFile).toHaveBeenCalledTimes(1);
-    expect(gridStoreAdapter.createFile.calls.mostRecent().args[0]).toMatch(
+    expect(gridFSAdapter.createFile).toHaveBeenCalledTimes(1);
+    expect(gridFSAdapter.createFile.calls.mostRecent().args[0]).toMatch(
      `^.{32}_${regexEscapedFileName}$`
    );

@@ -109,42 +108,42 @@ describe('FilesController', () => {

  it('should not add a unique hash to the file name when the preserveFileName option is true', done => {
    const config = Config.get(Parse.applicationId);
-    const gridStoreAdapter = new GridFSBucketAdapter('mongodb://localhost:27017/parse');
-    spyOn(gridStoreAdapter, 'createFile');
-    gridStoreAdapter.createFile.and.returnValue(Promise.resolve());
+    const gridFSAdapter = new GridFSBucketAdapter('mongodb://localhost:27017/parse');
+    spyOn(gridFSAdapter, 'createFile');
+    gridFSAdapter.createFile.and.returnValue(Promise.resolve());
    const fileName = 'randomFileName.pdf';
-    const filesController = new FilesController(gridStoreAdapter, null, {
+    const filesController = new FilesController(gridFSAdapter, null, {
      preserveFileName: true,
    });

    filesController.createFile(config, fileName);

-    expect(gridStoreAdapter.createFile).toHaveBeenCalledTimes(1);
-    expect(gridStoreAdapter.createFile.calls.mostRecent().args[0]).toEqual(fileName);
+    expect(gridFSAdapter.createFile).toHaveBeenCalledTimes(1);
+    expect(gridFSAdapter.createFile.calls.mostRecent().args[0]).toEqual(fileName);

    done();
  });

  it('should handle adapter without getMetadata', async () => {
-    const gridStoreAdapter = new GridFSBucketAdapter(databaseURI);
-    gridStoreAdapter.getMetadata = null;
-    const filesController = new FilesController(gridStoreAdapter);
+    const gridFSAdapter = new GridFSBucketAdapter(databaseURI);
+    gridFSAdapter.getMetadata = null;
+    const filesController = new FilesController(gridFSAdapter);

    const result = await filesController.getMetadata();
    expect(result).toEqual({});
  });

  it('should reject slashes in file names', done => {
-    const gridStoreAdapter = new GridFSBucketAdapter('mongodb://localhost:27017/parse');
+    const gridFSAdapter = new GridFSBucketAdapter('mongodb://localhost:27017/parse');
    const fileName = 'foo/randomFileName.pdf';
-    expect(gridStoreAdapter.validateFilename(fileName)).not.toBe(null);
+    expect(gridFSAdapter.validateFilename(fileName)).not.toBe(null);
    done();
  });

  it('should also reject slashes in file names', done => {
-    const gridStoreAdapter = new GridStoreAdapter('mongodb://localhost:27017/parse');
+    const gridFSAdapter = new GridFSBucketAdapter('mongodb://localhost:27017/parse');
    const fileName = 'foo/randomFileName.pdf';
-    expect(gridStoreAdapter.validateFilename(fileName)).not.toBe(null);
+    expect(gridFSAdapter.validateFilename(fileName)).not.toBe(null);
    done();
  });
 });
@@ -1,4 +1,3 @@
-const GridStoreAdapter = require('../lib/Adapters/Files/GridStoreAdapter').GridStoreAdapter;
 const GridFSBucketAdapter = require('../lib/Adapters/Files/GridFSBucketAdapter')
  .GridFSBucketAdapter;
 const { randomString } = require('../lib/cryptoUtils');
@@ -14,25 +13,13 @@ async function expectMissingFile(gfsAdapter, name) {
  }
 }

-describe_only_db('mongo')('GridFSBucket and GridStore interop', () => {
+describe_only_db('mongo')('GridFSBucket', () => {
  beforeEach(async () => {
-    const gsAdapter = new GridStoreAdapter(databaseURI);
+    const gsAdapter = new GridFSBucketAdapter(databaseURI);
    const db = await gsAdapter._connect();
    await db.dropDatabase();
  });

-  it('a file created in GridStore should be available in GridFS', async () => {
-    const gsAdapter = new GridStoreAdapter(databaseURI);
-    const gfsAdapter = new GridFSBucketAdapter(databaseURI);
-    await expectMissingFile(gfsAdapter, 'myFileName');
-    const originalString = 'abcdefghi';
-    await gsAdapter.createFile('myFileName', originalString);
-    const gsResult = await gsAdapter.getFileData('myFileName');
-    expect(gsResult.toString('utf8')).toBe(originalString);
-    const gfsResult = await gfsAdapter.getFileData('myFileName');
-    expect(gfsResult.toString('utf8')).toBe(originalString);
-  });
-
  it('should save an encrypted file that can only be decrypted by a GridFS adapter with the encryptionKey', async () => {
    const unencryptedAdapter = new GridFSBucketAdapter(databaseURI);
    const encryptedAdapter = new GridFSBucketAdapter(
@@ -451,7 +438,7 @@ describe_only_db('mongo')('GridFSBucket and GridStore interop', () => {
      await db.admin().serverStatus();
      expect(false).toBe(true);
    } catch (e) {
-      expect(e.message).toEqual('topology was destroyed');
+      expect(e.message).toEqual('MongoClient must be connected to perform this operation');
    }
  });
 });
@@ -1,111 +0,0 @@
-const MongoClient = require('mongodb').MongoClient;
-const GridStore = require('mongodb').GridStore;
-
-const GridStoreAdapter = require('../lib/Adapters/Files/GridStoreAdapter').GridStoreAdapter;
-const Config = require('../lib/Config');
-const FilesController = require('../lib/Controllers/FilesController').default;
-
-// Small additional tests to improve overall coverage
-describe_only_db('mongo')('GridStoreAdapter', () => {
-  it('should properly instanciate the GridStore when deleting a file', async done => {
-    const databaseURI = 'mongodb://localhost:27017/parse';
-    const config = Config.get(Parse.applicationId);
-    const gridStoreAdapter = new GridStoreAdapter(databaseURI);
-    const db = await gridStoreAdapter._connect();
-    await db.dropDatabase();
-    const filesController = new FilesController(gridStoreAdapter, Parse.applicationId, {});
-
-    // save original unlink before redefinition
-    const originalUnlink = GridStore.prototype.unlink;
-
-    let gridStoreMode;
-
-    // new unlink method that will capture the mode in which GridStore was opened
-    GridStore.prototype.unlink = function () {
-      // restore original unlink during first call
-      GridStore.prototype.unlink = originalUnlink;
-
-      gridStoreMode = this.mode;
-
-      return originalUnlink.call(this);
-    };
-
-    filesController
-      .createFile(config, 'myFilename.txt', 'my file content', 'text/plain')
-      .then(myFile => {
-        return MongoClient.connect(databaseURI)
-          .then(client => {
-            const database = client.db(client.s.options.dbName);
-            // Verify the existance of the fs.files document
-            return database
-              .collection('fs.files')
-              .count()
-              .then(count => {
-                expect(count).toEqual(1);
-                return { database, client };
-              });
-          })
-          .then(({ database, client }) => {
-            // Verify the existance of the fs.files document
-            return database
-              .collection('fs.chunks')
-              .count()
-              .then(count => {
-                expect(count).toEqual(1);
-                return client.close();
-              });
-          })
-          .then(() => {
-            return filesController.deleteFile(config, myFile.name);
-          });
-      })
-      .then(() => {
-        return MongoClient.connect(databaseURI)
-          .then(client => {
-            const database = client.db(client.s.options.dbName);
-            // Verify the existance of the fs.files document
-            return database
-              .collection('fs.files')
-              .count()
-              .then(count => {
-                expect(count).toEqual(0);
-                return { database, client };
-              });
-          })
-          .then(({ database, client }) => {
-            // Verify the existance of the fs.files document
-            return database
-              .collection('fs.chunks')
-              .count()
-              .then(count => {
-                expect(count).toEqual(0);
-                return client.close();
-              });
-          });
-      })
-      .then(() => {
-        // Verify that gridStore was opened in read only mode
-        expect(gridStoreMode).toEqual('r');
-
-        done();
-      })
-      .catch(fail);
-  });
-
-  it('handleShutdown, close connection', async () => {
-    const databaseURI = 'mongodb://localhost:27017/parse';
-    const gridStoreAdapter = new GridStoreAdapter(databaseURI);
-
-    const db = await gridStoreAdapter._connect();
-    const status = await db.admin().serverStatus();
-    expect(status.connections.current > 0).toEqual(true);
-
-    await gridStoreAdapter.handleShutdown();
-    try {
-      await db.admin().serverStatus();
-      expect(false).toBe(true);
-    } catch (e) {
-      expect(e.message).toEqual('topology was destroyed');
-    }
-  });
-});
@@ -6,11 +6,14 @@ const rest = require('../lib/rest');
 const auth = require('../lib/Auth');
 const uuid = require('uuid');

-describe_only_db('mongo')('Idempotency', () => {
+describe('Idempotency', () => {
  // Parameters
  /** Enable TTL expiration simulated by removing entry instead of waiting for MongoDB TTL monitor which
   runs only every 60s, so it can take up to 119s until entry removal - ain't nobody got time for that */
  const SIMULATE_TTL = true;
+  const ttl = 2;
+  const maxTimeOut = 4000;
+
  // Helpers
  async function deleteRequestEntry(reqId) {
    const config = Config.get(Parse.applicationId);
@@ -38,9 +41,10 @@ describe_only_db('mongo')('Idempotency', () => {
    }
    await setup({
      paths: ['functions/.*', 'jobs/.*', 'classes/.*', 'users', 'installations'],
-      ttl: 30,
+      ttl: ttl,
    });
  });
+
  // Tests
  it('should enforce idempotency for cloud code function', async () => {
    let counter = 0;
@@ -56,7 +60,7 @@ describe_only_db('mongo')('Idempotency', () => {
        'X-Parse-Request-Id': 'abc-123',
      },
    };
-    expect(Config.get(Parse.applicationId).idempotencyOptions.ttl).toBe(30);
+    expect(Config.get(Parse.applicationId).idempotencyOptions.ttl).toBe(ttl);
    await request(params);
    await request(params).then(fail, e => {
      expect(e.status).toEqual(400);
@@ -83,12 +87,38 @@ describe_only_db('mongo')('Idempotency', () => {
    if (SIMULATE_TTL) {
      await deleteRequestEntry('abc-123');
    } else {
-      await new Promise(resolve => setTimeout(resolve, 130000));
+      await new Promise(resolve => setTimeout(resolve, maxTimeOut));
    }
    await expectAsync(request(params)).toBeResolved();
    expect(counter).toBe(2);
  });

+  it_only_db('postgres')(
+    'should delete request entry when postgress ttl function is called',
+    async () => {
+      const client = Config.get(Parse.applicationId).database.adapter._client;
+      let counter = 0;
+      Parse.Cloud.define('myFunction', () => {
+        counter++;
+      });
+      const params = {
+        method: 'POST',
+        url: 'http://localhost:8378/1/functions/myFunction',
+        headers: {
+          'X-Parse-Application-Id': Parse.applicationId,
+          'X-Parse-Master-Key': Parse.masterKey,
+          'X-Parse-Request-Id': 'abc-123',
+        },
+      };
+      await expectAsync(request(params)).toBeResolved();
+      await expectAsync(request(params)).toBeRejected();
+      await new Promise(resolve => setTimeout(resolve, maxTimeOut));
+      await client.one('SELECT idempotency_delete_expired_records()');
+      await expectAsync(request(params)).toBeResolved();
+      expect(counter).toBe(2);
+    }
+  );
+
  it('should enforce idempotency for cloud code jobs', async () => {
    let counter = 0;
    Parse.Cloud.job('myJob', () => {
@@ -1,7 +1,7 @@
 'use strict';

 const MongoStorageAdapter = require('../lib/Adapters/Storage/Mongo/MongoStorageAdapter').default;
-const { MongoClient } = require('mongodb');
+const { MongoClient, Collection } = require('mongodb');
 const databaseURI = 'mongodb://localhost:27017/parseServerMongoAdapterTestDatabase';
 const request = require('../lib/request');
 const Config = require('../lib/Config');
@@ -101,7 +101,7 @@ describe_only_db('mongo')('MongoStorageAdapter', () => {
          done.fail('Find succeeded despite taking too long!');
        },
        err => {
-          expect(err.name).toEqual('MongoError');
+          expect(err.name).toEqual('MongoServerError');
          expect(err.code).toEqual(50);
          expect(err.message).toMatch('operation exceeded time limit');
          done();
@@ -283,7 +283,7 @@ describe_only_db('mongo')('MongoStorageAdapter', () => {
      await adapter.database.admin().serverStatus();
      expect(false).toBe(true);
    } catch (e) {
-      expect(e.message).toEqual('topology was destroyed');
+      expect(e.message).toEqual('MongoClient must be connected to perform this operation');
    }
  });

@@ -392,8 +392,7 @@ describe_only_db('mongo')('MongoStorageAdapter', () => {
        const myObject = new Parse.Object('MyObject');
        await myObject.save();

-        const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-        spyOn(databaseAdapter.database.serverConfig, 'command').and.callThrough();
+        spyOn(Collection.prototype, 'findOneAndUpdate').and.callThrough();

        await request({
          method: 'POST',
@@ -412,9 +411,9 @@ describe_only_db('mongo')('MongoStorageAdapter', () => {
        });

        let found = false;
-        databaseAdapter.database.serverConfig.command.calls.all().forEach(call => {
+        Collection.prototype.findOneAndUpdate.calls.all().forEach(call => {
          found = true;
-          expect(call.args[2].session.transaction.state).not.toBe('NO_TRANSACTION');
+          expect(call.args[2].session.transaction.state).toBe('TRANSACTION_COMMITTED');
        });
        expect(found).toBe(true);
      });
@@ -423,8 +422,7 @@ describe_only_db('mongo')('MongoStorageAdapter', () => {
        const myObject = new Parse.Object('MyObject');
        await myObject.save();

-        const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-        spyOn(databaseAdapter.database.serverConfig, 'command').and.callThrough();
+        spyOn(Collection.prototype, 'findOneAndUpdate').and.callThrough();

        await request({
          method: 'POST',
@@ -443,9 +441,9 @@ describe_only_db('mongo')('MongoStorageAdapter', () => {
        });

        let found = false;
-        databaseAdapter.database.serverConfig.command.calls.all().forEach(call => {
+        Collection.prototype.findOneAndUpdate.calls.all().forEach(call => {
          found = true;
-          expect(call.args[2].session).toBe(undefined);
+          expect(call.args[2].session).toBeFalsy();
        });
        expect(found).toBe(true);
      });
@@ -454,8 +452,7 @@ describe_only_db('mongo')('MongoStorageAdapter', () => {
        const myObject = new Parse.Object('MyObject');
        await myObject.save();

-        const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-        spyOn(databaseAdapter.database.serverConfig, 'command').and.callThrough();
+        spyOn(Collection.prototype, 'findOneAndUpdate').and.callThrough();

        await request({
          method: 'POST',
@@ -473,9 +470,9 @@ describe_only_db('mongo')('MongoStorageAdapter', () => {
        });

        let found = false;
-        databaseAdapter.database.serverConfig.command.calls.all().forEach(call => {
+        Collection.prototype.findOneAndUpdate.calls.all().forEach(call => {
          found = true;
-          expect(call.args[2].session).toBe(undefined);
+          expect(call.args[2].session).toBeFalsy();
        });
        expect(found).toBe(true);
      });
@@ -484,8 +481,7 @@ describe_only_db('mongo')('MongoStorageAdapter', () => {
        const myObject = new Parse.Object('MyObject');
        await myObject.save();

-        const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-        spyOn(databaseAdapter.database.serverConfig, 'command').and.callThrough();
+        spyOn(Collection.prototype, 'findOneAndUpdate').and.callThrough();

        await request({
          method: 'PUT',
@@ -495,30 +491,28 @@ describe_only_db('mongo')('MongoStorageAdapter', () => {
        });

        let found = false;
-        databaseAdapter.database.serverConfig.command.calls.all().forEach(call => {
+        Collection.prototype.findOneAndUpdate.calls.all().forEach(call => {
          found = true;
-          expect(call.args[2].session).toBe(undefined);
+          expect(call.args[2].session).toBeFalsy();
        });
        expect(found).toBe(true);
      });

      it('should not use transactions when using SDK insert', async () => {
-        const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-        spyOn(databaseAdapter.database.serverConfig, 'insert').and.callThrough();
+        spyOn(Collection.prototype, 'insertOne').and.callThrough();

        const myObject = new Parse.Object('MyObject');
        await myObject.save();

-        const calls = databaseAdapter.database.serverConfig.insert.calls.all();
+        const calls = Collection.prototype.insertOne.calls.all();
        expect(calls.length).toBeGreaterThan(0);
        calls.forEach(call => {
-          expect(call.args[2].session.transaction.state).toBe('NO_TRANSACTION');
+          expect(call.args[1].session).toBeFalsy();
        });
      });

      it('should not use transactions when using SDK update', async () => {
-        const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-        spyOn(databaseAdapter.database.serverConfig, 'update').and.callThrough();
+        spyOn(Collection.prototype, 'findOneAndUpdate').and.callThrough();

        const myObject = new Parse.Object('MyObject');
        await myObject.save();
@@ -526,26 +520,25 @@ describe_only_db('mongo')('MongoStorageAdapter', () => {
        myObject.set('myAttribute', 'myValue');
        await myObject.save();

-        const calls = databaseAdapter.database.serverConfig.update.calls.all();
+        const calls = Collection.prototype.findOneAndUpdate.calls.all();
        expect(calls.length).toBeGreaterThan(0);
        calls.forEach(call => {
-          expect(call.args[2].session.transaction.state).toBe('NO_TRANSACTION');
+          expect(call.args[2].session).toBeFalsy();
        });
      });

      it('should not use transactions when using SDK delete', async () => {
-        const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-        spyOn(databaseAdapter.database.serverConfig, 'remove').and.callThrough();
+        spyOn(Collection.prototype, 'deleteMany').and.callThrough();

        const myObject = new Parse.Object('MyObject');
        await myObject.save();

        await myObject.destroy();

-        const calls = databaseAdapter.database.serverConfig.remove.calls.all();
+        const calls = Collection.prototype.deleteMany.calls.all();
        expect(calls.length).toBeGreaterThan(0);
        calls.forEach(call => {
-          expect(call.args[2].session.transaction.state).toBe('NO_TRANSACTION');
+          expect(call.args[1].session).toBeFalsy();
        });
      });
    });
@@ -4,6 +4,7 @@
 const transform = require('../lib/Adapters/Storage/Mongo/MongoTransform');
 const dd = require('deep-diff');
 const mongodb = require('mongodb');
+const Utils = require('../lib/Utils');

 describe('parseObjectToMongoObjectForCreate', () => {
  it('a basic number', done => {
@@ -592,7 +593,7 @@ describe('relativeTimeToDate', () => {
  describe('In the future', () => {
    it('should parse valid natural time', () => {
      const text = 'in 1 year 2 weeks 12 days 10 hours 24 minutes 30 seconds';
-      const { result, status, info } = transform.relativeTimeToDate(text, now);
+      const { result, status, info } = Utils.relativeTimeToDate(text, now);
      expect(result.toISOString()).toBe('2018-10-22T23:52:46.617Z');
      expect(status).toBe('success');
      expect(info).toBe('future');
@@ -602,7 +603,7 @@ describe('relativeTimeToDate', () => {
  describe('In the past', () => {
    it('should parse valid natural time', () => {
      const text = '2 days 12 hours 1 minute 12 seconds ago';
-      const { result, status, info } = transform.relativeTimeToDate(text, now);
+      const { result, status, info } = Utils.relativeTimeToDate(text, now);
      expect(result.toISOString()).toBe('2017-09-24T01:27:04.617Z');
      expect(status).toBe('success');
      expect(info).toBe('past');
@@ -612,7 +613,7 @@ describe('relativeTimeToDate', () => {
  describe('From now', () => {
    it('should equal current time', () => {
      const text = 'now';
-      const { result, status, info } = transform.relativeTimeToDate(text, now);
+      const { result, status, info } = Utils.relativeTimeToDate(text, now);
      expect(result.toISOString()).toBe('2017-09-26T13:28:16.617Z');
      expect(status).toBe('success');
      expect(info).toBe('present');
@@ -621,54 +622,54 @@ describe('relativeTimeToDate', () => {

  describe('Error cases', () => {
    it('should error if string is completely gibberish', () => {
-      expect(transform.relativeTimeToDate('gibberishasdnklasdnjklasndkl123j123')).toEqual({
+      expect(Utils.relativeTimeToDate('gibberishasdnklasdnjklasndkl123j123')).toEqual({
        status: 'error',
        info: "Time should either start with 'in' or end with 'ago'",
      });
    });

    it('should error if string contains neither `ago` nor `in`', () => {
-      expect(transform.relativeTimeToDate('12 hours 1 minute')).toEqual({
+      expect(Utils.relativeTimeToDate('12 hours 1 minute')).toEqual({
        status: 'error',
        info: "Time should either start with 'in' or end with 'ago'",
      });
    });

    it('should error if there are missing units or numbers', () => {
-      expect(transform.relativeTimeToDate('in 12 hours 1')).toEqual({
+      expect(Utils.relativeTimeToDate('in 12 hours 1')).toEqual({
        status: 'error',
        info: 'Invalid time string. Dangling unit or number.',
      });

-      expect(transform.relativeTimeToDate('12 hours minute ago')).toEqual({
+      expect(Utils.relativeTimeToDate('12 hours minute ago')).toEqual({
        status: 'error',
        info: 'Invalid time string. Dangling unit or number.',
      });
    });

    it('should error on floating point numbers', () => {
-      expect(transform.relativeTimeToDate('in 12.3 hours')).toEqual({
+      expect(Utils.relativeTimeToDate('in 12.3 hours')).toEqual({
        status: 'error',
        info: "'12.3' is not an integer.",
      });
    });

    it('should error if numbers are invalid', () => {
-      expect(transform.relativeTimeToDate('12 hours 123a minute ago')).toEqual({
+      expect(Utils.relativeTimeToDate('12 hours 123a minute ago')).toEqual({
        status: 'error',
        info: "'123a' is not an integer.",
      });
    });

    it('should error on invalid interval units', () => {
-      expect(transform.relativeTimeToDate('4 score 7 years ago')).toEqual({
+      expect(Utils.relativeTimeToDate('4 score 7 years ago')).toEqual({
        status: 'error',
        info: "Invalid interval: 'score'",
      });
    });

    it("should error when string contains 'ago' and 'in'", () => {
-      expect(transform.relativeTimeToDate('in 1 day 2 minutes ago')).toEqual({
+      expect(Utils.relativeTimeToDate('in 1 day 2 minutes ago')).toEqual({
        status: 'error',
        info: "Time cannot have both 'in' and 'ago'",
      });
@@ -1,7 +1,7 @@
 const http = require('http');
 const express = require('express');
 const req = require('../lib/request');
-const fetch = require('node-fetch');
+const fetch = (...args) => import('node-fetch').then(({ default: fetch }) => fetch(...args));
 const FormData = require('form-data');
 const ws = require('ws');
 require('./helper');
@@ -9,13 +9,16 @@ const { updateCLP } = require('./support/dev');

 const pluralize = require('pluralize');
 const { getMainDefinition } = require('apollo-utilities');
-const { ApolloLink, split } = require('apollo-link');
-const { createHttpLink } = require('apollo-link-http');
-const { InMemoryCache } = require('apollo-cache-inmemory');
 const { createUploadLink } = require('apollo-upload-client');
 const { SubscriptionClient } = require('subscriptions-transport-ws');
-const { WebSocketLink } = require('apollo-link-ws');
-const ApolloClient = require('apollo-client').default;
+const { WebSocketLink } = require('@apollo/client/link/ws');
+const {
+  ApolloClient,
+  InMemoryCache,
+  ApolloLink,
+  split,
+  createHttpLink,
+} = require('@apollo/client/core');
 const gql = require('graphql-tag');
 const { toGlobalId } = require('graphql-relay');
 const {
@@ -29,7 +32,7 @@ const {
 } = require('graphql');
 const { ParseServer } = require('../');
 const { ParseGraphQLServer } = require('../lib/GraphQL/ParseGraphQLServer');
-const ReadPreference = require('mongodb').ReadPreference;
+const { ReadPreference, Collection } = require('mongodb');
 const { v4: uuidv4 } = require('uuid');

 function handleError(e) {
@@ -2597,11 +2600,23 @@ describe('ParseGraphQLServer', () => {
              // "SecondaryObject:bBRgmzIRRM" < "SecondaryObject:nTMcuVbATY" true
              // base64("SecondaryObject:bBRgmzIRRM"") < base64(""SecondaryObject:nTMcuVbATY"") false
              // "U2Vjb25kYXJ5T2JqZWN0OmJCUmdteklSUk0=" < "U2Vjb25kYXJ5T2JqZWN0Om5UTWN1VmJBVFk=" false
+              const originalIds = [
+                getSecondaryObjectsResult.data.secondaryObject2.objectId,
+                getSecondaryObjectsResult.data.secondaryObject4.objectId,
+              ];
              expect(
                findSecondaryObjectsResult.data.secondaryObjects.edges[0].node.objectId
-              ).toBeLessThan(
-                findSecondaryObjectsResult.data.secondaryObjects.edges[1].node.objectId
-              );
+              ).not.toBe(findSecondaryObjectsResult.data.secondaryObjects.edges[1].node.objectId);
+              expect(
+                originalIds.includes(
+                  findSecondaryObjectsResult.data.secondaryObjects.edges[0].node.objectId
+                )
+              ).toBeTrue();
+              expect(
+                originalIds.includes(
+                  findSecondaryObjectsResult.data.secondaryObjects.edges[1].node.objectId
+                )
+              ).toBeTrue();

              const createPrimaryObjectResult = await apolloClient.mutate({
                mutation: gql`
@@ -4458,8 +4473,7 @@ describe('ParseGraphQLServer', () => {

                await parseGraphQLServer.parseGraphQLSchema.schemaCache.clear();

-                const databaseAdapter = parseServer.config.databaseController.adapter;
-                spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+                spyOn(Collection.prototype, 'find').and.callThrough();

                await apolloClient.query({
                  query: gql`
@@ -4483,13 +4497,13 @@ describe('ParseGraphQLServer', () => {

                let foundGraphQLClassReadPreference = false;
                let foundUserClassReadPreference = false;
-                databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-                  if (call.args[0].ns.collection.indexOf('GraphQLClass') >= 0) {
+                Collection.prototype.find.calls.all().forEach(call => {
+                  if (call.object.s.namespace.collection.indexOf('GraphQLClass') >= 0) {
                    foundGraphQLClassReadPreference = true;
-                    expect(call.args[0].options.readPreference.mode).toBe(ReadPreference.PRIMARY);
-                  } else if (call.args[0].ns.collection.indexOf('_User') >= 0) {
+                    expect(call.object.s.readPreference.mode).toBe(ReadPreference.PRIMARY);
+                  } else if (call.object.s.namespace.collection.indexOf('_User') >= 0) {
                    foundUserClassReadPreference = true;
-                    expect(call.args[0].options.readPreference.mode).toBe(ReadPreference.PRIMARY);
+                    expect(call.object.s.readPreference.mode).toBe(ReadPreference.PRIMARY);
                  }
                });

@@ -4505,8 +4519,7 @@ describe('ParseGraphQLServer', () => {

              await parseGraphQLServer.parseGraphQLSchema.schemaCache.clear();

-              const databaseAdapter = parseServer.config.databaseController.adapter;
-              spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+              spyOn(Collection.prototype, 'find').and.callThrough();

              await apolloClient.query({
                query: gql`
@@ -4530,13 +4543,13 @@ describe('ParseGraphQLServer', () => {

              let foundGraphQLClassReadPreference = false;
              let foundUserClassReadPreference = false;
-              databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-                if (call.args[0].ns.collection.indexOf('GraphQLClass') >= 0) {
+              Collection.prototype.find.calls.all().forEach(call => {
+                if (call.object.s.namespace.collection.indexOf('GraphQLClass') >= 0) {
                  foundGraphQLClassReadPreference = true;
-                  expect(call.args[0].options.readPreference.mode).toBe(ReadPreference.SECONDARY);
-                } else if (call.args[0].ns.collection.indexOf('_User') >= 0) {
+                  expect(call.args[1].readPreference).toBe(ReadPreference.SECONDARY);
+                } else if (call.object.s.namespace.collection.indexOf('_User') >= 0) {
                  foundUserClassReadPreference = true;
-                  expect(call.args[0].options.readPreference.mode).toBe(ReadPreference.SECONDARY);
+                  expect(call.args[1].readPreference).toBe(ReadPreference.SECONDARY);
                }
              });

@@ -4549,8 +4562,7 @@ describe('ParseGraphQLServer', () => {

              await parseGraphQLServer.parseGraphQLSchema.schemaCache.clear();

-              const databaseAdapter = parseServer.config.databaseController.adapter;
-              spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+              spyOn(Collection.prototype, 'find').and.callThrough();

              await apolloClient.query({
                query: gql`
@@ -4577,13 +4589,13 @@ describe('ParseGraphQLServer', () => {

              let foundGraphQLClassReadPreference = false;
              let foundUserClassReadPreference = false;
-              databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-                if (call.args[0].ns.collection.indexOf('GraphQLClass') >= 0) {
+              Collection.prototype.find.calls.all().forEach(call => {
+                if (call.object.s.namespace.collection.indexOf('GraphQLClass') >= 0) {
                  foundGraphQLClassReadPreference = true;
-                  expect(call.args[0].options.readPreference.mode).toBe(ReadPreference.SECONDARY);
-                } else if (call.args[0].ns.collection.indexOf('_User') >= 0) {
+                  expect(call.args[1].readPreference).toBe(ReadPreference.SECONDARY);
+                } else if (call.object.s.namespace.collection.indexOf('_User') >= 0) {
                  foundUserClassReadPreference = true;
-                  expect(call.args[0].options.readPreference.mode).toBe(ReadPreference.NEAREST);
+                  expect(call.args[1].readPreference).toBe(ReadPreference.NEAREST);
                }
              });

@@ -5441,8 +5453,7 @@ describe('ParseGraphQLServer', () => {

              await parseGraphQLServer.parseGraphQLSchema.schemaCache.clear();

-              const databaseAdapter = parseServer.config.databaseController.adapter;
-              spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+              spyOn(Collection.prototype, 'find').and.callThrough();

              await apolloClient.query({
                query: gql`
@@ -5467,13 +5478,13 @@ describe('ParseGraphQLServer', () => {

              let foundGraphQLClassReadPreference = false;
              let foundUserClassReadPreference = false;
-              databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-                if (call.args[0].ns.collection.indexOf('GraphQLClass') >= 0) {
+              Collection.prototype.find.calls.all().forEach(call => {
+                if (call.object.s.namespace.collection.indexOf('GraphQLClass') >= 0) {
                  foundGraphQLClassReadPreference = true;
-                  expect(call.args[0].options.readPreference.mode).toBe(ReadPreference.PRIMARY);
-                } else if (call.args[0].ns.collection.indexOf('_User') >= 0) {
+                  expect(call.object.s.readPreference.mode).toBe(ReadPreference.PRIMARY);
+                } else if (call.object.s.namespace.collection.indexOf('_User') >= 0) {
                  foundUserClassReadPreference = true;
-                  expect(call.args[0].options.readPreference.mode).toBe(ReadPreference.PRIMARY);
+                  expect(call.object.s.readPreference.mode).toBe(ReadPreference.PRIMARY);
                }
              });

@@ -5486,8 +5497,7 @@ describe('ParseGraphQLServer', () => {

              await parseGraphQLServer.parseGraphQLSchema.schemaCache.clear();

-              const databaseAdapter = parseServer.config.databaseController.adapter;
-              spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+              spyOn(Collection.prototype, 'find').and.callThrough();

              await apolloClient.query({
                query: gql`
@@ -5512,13 +5522,13 @@ describe('ParseGraphQLServer', () => {

              let foundGraphQLClassReadPreference = false;
              let foundUserClassReadPreference = false;
-              databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-                if (call.args[0].ns.collection.indexOf('GraphQLClass') >= 0) {
+              Collection.prototype.find.calls.all().forEach(call => {
+                if (call.object.s.namespace.collection.indexOf('GraphQLClass') >= 0) {
                  foundGraphQLClassReadPreference = true;
-                  expect(call.args[0].options.readPreference.mode).toBe(ReadPreference.SECONDARY);
-                } else if (call.args[0].ns.collection.indexOf('_User') >= 0) {
+                  expect(call.args[1].readPreference).toBe(ReadPreference.SECONDARY);
+                } else if (call.object.s.namespace.collection.indexOf('_User') >= 0) {
                  foundUserClassReadPreference = true;
-                  expect(call.args[0].options.readPreference.mode).toBe(ReadPreference.SECONDARY);
+                  expect(call.args[1].readPreference).toBe(ReadPreference.SECONDARY);
                }
              });

@@ -5531,8 +5541,7 @@ describe('ParseGraphQLServer', () => {

              await parseGraphQLServer.parseGraphQLSchema.schemaCache.clear();

-              const databaseAdapter = parseServer.config.databaseController.adapter;
-              spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+              spyOn(Collection.prototype, 'find').and.callThrough();

              await apolloClient.query({
                query: gql`
@@ -5559,13 +5568,13 @@ describe('ParseGraphQLServer', () => {

              let foundGraphQLClassReadPreference = false;
              let foundUserClassReadPreference = false;
-              databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-                if (call.args[0].ns.collection.indexOf('GraphQLClass') >= 0) {
+              Collection.prototype.find.calls.all().forEach(call => {
+                if (call.object.s.namespace.collection.indexOf('GraphQLClass') >= 0) {
                  foundGraphQLClassReadPreference = true;
-                  expect(call.args[0].options.readPreference.mode).toBe(ReadPreference.SECONDARY);
-                } else if (call.args[0].ns.collection.indexOf('_User') >= 0) {
+                  expect(call.args[1].readPreference).toBe(ReadPreference.SECONDARY);
+                } else if (call.object.s.namespace.collection.indexOf('_User') >= 0) {
                  foundUserClassReadPreference = true;
-                  expect(call.args[0].options.readPreference.mode).toBe(ReadPreference.NEAREST);
+                  expect(call.args[1].readPreference).toBe(ReadPreference.NEAREST);
                }
              });

@@ -5579,8 +5588,7 @@ describe('ParseGraphQLServer', () => {

                await parseGraphQLServer.parseGraphQLSchema.schemaCache.clear();

-                const databaseAdapter = parseServer.config.databaseController.adapter;
-                spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+                spyOn(Collection.prototype, 'find').and.callThrough();

                await apolloClient.query({
                  query: gql`
@@ -5617,13 +5625,13 @@ describe('ParseGraphQLServer', () => {

                let foundGraphQLClassReadPreference = false;
                let foundUserClassReadPreference = false;
-                databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-                  if (call.args[0].ns.collection.indexOf('GraphQLClass') >= 0) {
+                Collection.prototype.find.calls.all().forEach(call => {
+                  if (call.object.s.namespace.collection.indexOf('GraphQLClass') >= 0) {
                    foundGraphQLClassReadPreference = true;
-                    expect(call.args[0].options.readPreference.mode).toBe(ReadPreference.SECONDARY);
-                  } else if (call.args[0].ns.collection.indexOf('_User') >= 0) {
+                    expect(call.args[1].readPreference).toBe(ReadPreference.SECONDARY);
+                  } else if (call.object.s.namespace.collection.indexOf('_User') >= 0) {
                    foundUserClassReadPreference = true;
-                    expect(call.args[0].options.readPreference.mode).toBe(ReadPreference.NEAREST);
+                    expect(call.args[1].readPreference).toBe(ReadPreference.NEAREST);
                  }
                });

@@ -319,6 +319,41 @@ describe('ParseLiveQuery', function () {
    await object.save();
  });

+  it('can log on afterLiveQueryEvent throw', async () => {
+    await reconfigureServer({
+      liveQuery: {
+        classNames: ['TestObject'],
+      },
+      startLiveQueryServer: true,
+      verbose: false,
+      silent: true,
+    });
+
+    const object = new TestObject();
+    await object.save();
+
+    const logger = require('../lib/logger').logger;
+    spyOn(logger, 'error').and.callFake(() => {});
+
+    let session = undefined;
+    Parse.Cloud.afterLiveQueryEvent('TestObject', ({ sessionToken }) => {
+      session = sessionToken;
+      /* eslint-disable no-undef */
+      foo.bar();
+      /* eslint-enable no-undef */
+    });
+
+    const query = new Parse.Query(TestObject);
+    query.equalTo('objectId', object.id);
+    const subscription = await query.subscribe();
+    object.set({ foo: 'bar' });
+    await object.save();
+    await new Promise(resolve => subscription.on('error', resolve));
+    expect(logger.error).toHaveBeenCalledWith(
+      `Failed running afterLiveQueryEvent on class TestObject for event update with session ${session} with:\n Error: {"message":"foo is not defined","code":141}`
+    );
+  });
+
  it('can handle afterEvent sendEvent to false', async done => {
    await reconfigureServer({
      liveQuery: {
@@ -566,6 +601,33 @@ describe('ParseLiveQuery', function () {
    await query.subscribe();
  });

+  it('can log on beforeConnect throw', async () => {
+    await reconfigureServer({
+      liveQuery: {
+        classNames: ['TestObject'],
+      },
+      startLiveQueryServer: true,
+      verbose: false,
+      silent: true,
+    });
+
+    const logger = require('../lib/logger').logger;
+    spyOn(logger, 'error').and.callFake(() => {});
+    let token = undefined;
+    Parse.Cloud.beforeConnect(({ sessionToken }) => {
+      token = sessionToken;
+      /* eslint-disable no-undef */
+      foo.bar();
+      /* eslint-enable no-undef */
+    });
+    new Parse.Query(TestObject).subscribe();
+    await new Promise(resolve => Parse.LiveQuery.on('error', resolve));
+    Parse.LiveQuery.removeAllListeners('error');
+    expect(logger.error).toHaveBeenCalledWith(
+      `Failed running beforeConnect for session ${token} with:\n Error: {"message":"foo is not defined","code":141}`
+    );
+  });
+
  it('can handle beforeSubscribe error', async done => {
    await reconfigureServer({
      liveQuery: {
@@ -594,6 +656,34 @@ describe('ParseLiveQuery', function () {
    });
  });

+  it('can log on beforeSubscribe error', async () => {
+    await reconfigureServer({
+      liveQuery: {
+        classNames: ['TestObject'],
+      },
+      startLiveQueryServer: true,
+      verbose: false,
+      silent: true,
+    });
+
+    const logger = require('../lib/logger').logger;
+    spyOn(logger, 'error').and.callFake(() => {});
+
+    Parse.Cloud.beforeSubscribe(TestObject, () => {
+      /* eslint-disable no-undef */
+      foo.bar();
+      /* eslint-enable no-undef */
+    });
+
+    const query = new Parse.Query(TestObject);
+    const subscription = await query.subscribe();
+    await new Promise(resolve => subscription.on('error', resolve));
+
+    expect(logger.error).toHaveBeenCalledWith(
+      `Failed running beforeSubscribe on TestObject for session undefined with:\n Error: {"message":"foo is not defined","code":141}`
+    );
+  });
+
  it('can handle mutate beforeSubscribe query', async done => {
    await reconfigureServer({
      liveQuery: {
@@ -4766,7 +4766,7 @@ describe('Parse.Query testing', () => {
      .catch(done.fail);
  });

-  it_only_db('mongo')('should handle relative times correctly', function (done) {
+  it('should handle relative times correctly', async () => {
    const now = Date.now();
    const obj1 = new Parse.Object('MyCustomObject', {
      name: 'obj1',
@@ -4777,94 +4777,75 @@ describe('Parse.Query testing', () => {
      ttl: new Date(now - 2 * 24 * 60 * 60 * 1000), // 2 days ago
    });

-    Parse.Object.saveAll([obj1, obj2])
-      .then(() => {
-        const q = new Parse.Query('MyCustomObject');
-        q.greaterThan('ttl', { $relativeTime: 'in 1 day' });
-        return q.find({ useMasterKey: true });
-      })
-      .then(results => {
-        expect(results.length).toBe(1);
-      })
-      .then(() => {
-        const q = new Parse.Query('MyCustomObject');
-        q.greaterThan('ttl', { $relativeTime: '1 day ago' });
-        return q.find({ useMasterKey: true });
-      })
-      .then(results => {
-        expect(results.length).toBe(1);
-      })
-      .then(() => {
-        const q = new Parse.Query('MyCustomObject');
-        q.lessThan('ttl', { $relativeTime: '5 days ago' });
-        return q.find({ useMasterKey: true });
-      })
-      .then(results => {
-        expect(results.length).toBe(0);
-      })
-      .then(() => {
-        const q = new Parse.Query('MyCustomObject');
-        q.greaterThan('ttl', { $relativeTime: '3 days ago' });
-        return q.find({ useMasterKey: true });
-      })
-      .then(results => {
-        expect(results.length).toBe(2);
-      })
-      .then(() => {
-        const q = new Parse.Query('MyCustomObject');
-        q.greaterThan('ttl', { $relativeTime: 'now' });
-        return q.find({ useMasterKey: true });
-      })
-      .then(results => {
-        expect(results.length).toBe(1);
-      })
-      .then(() => {
-        const q = new Parse.Query('MyCustomObject');
-        q.greaterThan('ttl', { $relativeTime: 'now' });
-        q.lessThan('ttl', { $relativeTime: 'in 1 day' });
-        return q.find({ useMasterKey: true });
-      })
-      .then(results => {
-        expect(results.length).toBe(0);
-      })
-      .then(() => {
-        const q = new Parse.Query('MyCustomObject');
-        q.greaterThan('ttl', { $relativeTime: '1 year 3 weeks ago' });
-        return q.find({ useMasterKey: true });
-      })
-      .then(results => {
-        expect(results.length).toBe(2);
-      })
-      .then(done, done.fail);
+    await Parse.Object.saveAll([obj1, obj2]);
+    const q1 = new Parse.Query('MyCustomObject');
+    q1.greaterThan('ttl', { $relativeTime: 'in 1 day' });
+    const results1 = await q1.find({ useMasterKey: true });
+    expect(results1.length).toBe(1);
+
+    const q2 = new Parse.Query('MyCustomObject');
+    q2.greaterThan('ttl', { $relativeTime: '1 day ago' });
+    const results2 = await q2.find({ useMasterKey: true });
+    expect(results2.length).toBe(1);
+
+    const q3 = new Parse.Query('MyCustomObject');
+    q3.lessThan('ttl', { $relativeTime: '5 days ago' });
+    const results3 = await q3.find({ useMasterKey: true });
+    expect(results3.length).toBe(0);
+
+    const q4 = new Parse.Query('MyCustomObject');
+    q4.greaterThan('ttl', { $relativeTime: '3 days ago' });
+    const results4 = await q4.find({ useMasterKey: true });
+    expect(results4.length).toBe(2);
+
+    const q5 = new Parse.Query('MyCustomObject');
+    q5.greaterThan('ttl', { $relativeTime: 'now' });
+    const results5 = await q5.find({ useMasterKey: true });
+    expect(results5.length).toBe(1);
+
+    const q6 = new Parse.Query('MyCustomObject');
+    q6.greaterThan('ttl', { $relativeTime: 'now' });
+    q6.lessThan('ttl', { $relativeTime: 'in 1 day' });
+    const results6 = await q6.find({ useMasterKey: true });
+    expect(results6.length).toBe(0);
+
+    const q7 = new Parse.Query('MyCustomObject');
+    q7.greaterThan('ttl', { $relativeTime: '1 year 3 weeks ago' });
+    const results7 = await q7.find({ useMasterKey: true });
+    expect(results7.length).toBe(2);
  });

-  it_only_db('mongo')('should error on invalid relative time', function (done) {
+  it('should error on invalid relative time', async () => {
    const obj1 = new Parse.Object('MyCustomObject', {
      name: 'obj1',
      ttl: new Date(Date.now() + 2 * 24 * 60 * 60 * 1000), // 2 days from now
    });
-
+    await obj1.save({ useMasterKey: true });
    const q = new Parse.Query('MyCustomObject');
    q.greaterThan('ttl', { $relativeTime: '-12 bananas ago' });
-    obj1
-      .save({ useMasterKey: true })
-      .then(() => q.find({ useMasterKey: true }))
-      .then(done.fail, () => done());
+    try {
+      await q.find({ useMasterKey: true });
+      fail('Should have thrown error');
+    } catch (error) {
+      expect(error.code).toBe(Parse.Error.INVALID_JSON);
+    }
  });

-  it_only_db('mongo')('should error when using $relativeTime on non-Date field', function (done) {
+  it('should error when using $relativeTime on non-Date field', async () => {
    const obj1 = new Parse.Object('MyCustomObject', {
      name: 'obj1',
      nonDateField: 'abcd',
      ttl: new Date(Date.now() + 2 * 24 * 60 * 60 * 1000), // 2 days from now
    });
-
+    await obj1.save({ useMasterKey: true });
    const q = new Parse.Query('MyCustomObject');
    q.greaterThan('nonDateField', { $relativeTime: '1 day ago' });
-    obj1
-      .save({ useMasterKey: true })
-      .then(() => q.find({ useMasterKey: true }))
-      .then(done.fail, () => done());
+    try {
+      await q.find({ useMasterKey: true });
+      fail('Should have thrown error');
+    } catch (error) {
+      expect(error.code).toBe(Parse.Error.INVALID_JSON);
+    }
  });

  it('should match complex structure with dot notation when using matchesKeyInQuery', function (done) {
@@ -15,35 +15,18 @@ describe('ParseServerRESTController', () => {
    );
  });

-  it('should handle a get request', done => {
-    RESTController.request('GET', '/classes/MyObject').then(
-      res => {
-        expect(res.results.length).toBe(0);
-        done();
-      },
-      err => {
-        console.log(err);
-        jfail(err);
-        done();
-      }
-    );
+  it('should handle a get request', async () => {
+    const res = await RESTController.request('GET', '/classes/MyObject');
+    expect(res.results.length).toBe(0);
  });

-  it('should handle a get request with full serverURL mount path', done => {
-    RESTController.request('GET', '/1/classes/MyObject').then(
-      res => {
-        expect(res.results.length).toBe(0);
-        done();
-      },
-      err => {
-        jfail(err);
-        done();
-      }
-    );
+  it('should handle a get request with full serverURL mount path', async () => {
+    const res = await RESTController.request('GET', '/1/classes/MyObject');
+    expect(res.results.length).toBe(0);
  });

-  it('should handle a POST batch without transaction', done => {
-    RESTController.request('POST', 'batch', {
+  it('should handle a POST batch without transaction', async () => {
+    const res = await RESTController.request('POST', 'batch', {
      requests: [
        {
          method: 'GET',
@@ -59,20 +42,12 @@ describe('ParseServerRESTController', () => {
          path: '/classes/MyObject',
        },
      ],
-    }).then(
-      res => {
-        expect(res.length).toBe(3);
-        done();
-      },
-      err => {
-        jfail(err);
-        done();
-      }
-    );
+    });
+    expect(res.length).toBe(3);
  });

-  it('should handle a POST batch with transaction=false', done => {
-    RESTController.request('POST', 'batch', {
+  it('should handle a POST batch with transaction=false', async () => {
+    const res = await RESTController.request('POST', 'batch', {
      requests: [
        {
          method: 'GET',
@@ -89,16 +64,8 @@ describe('ParseServerRESTController', () => {
        },
      ],
      transaction: false,
-    }).then(
-      res => {
-        expect(res.length).toBe(3);
-        done();
-      },
-      err => {
-        jfail(err);
-        done();
-      }
-    );
+    });
+    expect(res.length).toBe(3);
  });

  it('should handle response status', async () => {
@@ -186,54 +153,40 @@ describe('ParseServerRESTController', () => {
        }
      });

-      it('should handle a batch request with transaction = true', async done => {
-        await reconfigureServer();
+      it('should handle a batch request with transaction = true', async () => {
        const myObject = new Parse.Object('MyObject'); // This is important because transaction only works on pre-existing collections
-        myObject
-          .save()
-          .then(() => {
-            return myObject.destroy();
-          })
-          .then(() => {
-            spyOn(databaseAdapter, 'createObject').and.callThrough();
-
-            return RESTController.request('POST', 'batch', {
-              requests: [
-                {
-                  method: 'POST',
-                  path: '/1/classes/MyObject',
-                  body: { key: 'value1' },
-                },
-                {
-                  method: 'POST',
-                  path: '/1/classes/MyObject',
-                  body: { key: 'value2' },
-                },
-              ],
-              transaction: true,
-            }).then(response => {
-              expect(response.length).toEqual(2);
-              expect(response[0].success.objectId).toBeDefined();
-              expect(response[0].success.createdAt).toBeDefined();
-              expect(response[1].success.objectId).toBeDefined();
-              expect(response[1].success.createdAt).toBeDefined();
-              const query = new Parse.Query('MyObject');
-              return query.find().then(results => {
-                expect(databaseAdapter.createObject.calls.count() % 2).toBe(0);
-                for (let i = 0; i + 1 < databaseAdapter.createObject.calls.length; i = i + 2) {
-                  expect(databaseAdapter.createObject.calls.argsFor(i)[3]).toBe(
-                    databaseAdapter.createObject.calls.argsFor(i + 1)[3]
-                  );
-                }
-                expect(results.map(result => result.get('key')).sort()).toEqual([
-                  'value1',
-                  'value2',
-                ]);
-                done();
-              });
-            });
-          })
-          .catch(done.fail);
+        await myObject.save();
+        await myObject.destroy();
+        spyOn(databaseAdapter, 'createObject').and.callThrough();
+        const response = await RESTController.request('POST', 'batch', {
+          requests: [
+            {
+              method: 'POST',
+              path: '/1/classes/MyObject',
+              body: { key: 'value1' },
+            },
+            {
+              method: 'POST',
+              path: '/1/classes/MyObject',
+              body: { key: 'value2' },
+            },
+          ],
+          transaction: true,
+        });
+        expect(response.length).toEqual(2);
+        expect(response[0].success.objectId).toBeDefined();
+        expect(response[0].success.createdAt).toBeDefined();
+        expect(response[1].success.objectId).toBeDefined();
+        expect(response[1].success.createdAt).toBeDefined();
+        const query = new Parse.Query('MyObject');
+        const results = await query.find();
+        expect(databaseAdapter.createObject.calls.count() % 2).toBe(0);
+        for (let i = 0; i + 1 < databaseAdapter.createObject.calls.length; i = i + 2) {
+          expect(databaseAdapter.createObject.calls.argsFor(i)[3]).toBe(
+            databaseAdapter.createObject.calls.argsFor(i + 1)[3]
+          );
+        }
+        expect(results.map(result => result.get('key')).sort()).toEqual(['value1', 'value2']);
      });

      it('should not save anything when one operation fails in a transaction', async () => {
@@ -560,21 +513,11 @@ describe('ParseServerRESTController', () => {
    });
  }

-  it('should handle a POST request', done => {
-    RESTController.request('POST', '/classes/MyObject', { key: 'value' })
-      .then(() => {
-        return RESTController.request('GET', '/classes/MyObject');
-      })
-      .then(res => {
-        expect(res.results.length).toBe(1);
-        expect(res.results[0].key).toEqual('value');
-        done();
-      })
-      .catch(err => {
-        console.log(err);
-        jfail(err);
-        done();
-      });
+  it('should handle a POST request', async () => {
+    await RESTController.request('POST', '/classes/MyObject', { key: 'value' });
+    const res = await RESTController.request('GET', '/classes/MyObject');
+    expect(res.results.length).toBe(1);
+    expect(res.results[0].key).toEqual('value');
  });

  it('should handle a POST request with context', async () => {
@@ -593,125 +536,76 @@ describe('ParseServerRESTController', () => {
    );
  });

-  it('ensures sessionTokens are properly handled', done => {
-    let userId;
-    Parse.User.signUp('user', 'pass')
-      .then(user => {
-        userId = user.id;
-        const sessionToken = user.getSessionToken();
-        return RESTController.request('GET', '/users/me', undefined, {
-          sessionToken,
-        });
-      })
-      .then(res => {
-        // Result is in JSON format
-        expect(res.objectId).toEqual(userId);
-        done();
-      })
-      .catch(err => {
-        console.log(err);
-        jfail(err);
-        done();
+  it('ensures sessionTokens are properly handled', async () => {
+    const user = await Parse.User.signUp('user', 'pass');
+    const sessionToken = user.getSessionToken();
+    const res = await RESTController.request('GET', '/users/me', undefined, {
+      sessionToken,
+    });
+    // Result is in JSON format
+    expect(res.objectId).toEqual(user.id);
+  });
+
+  it('ensures masterKey is properly handled', async () => {
+    const user = await Parse.User.signUp('user', 'pass');
+    const userId = user.id;
+    await Parse.User.logOut();
+    const res = await RESTController.request('GET', '/classes/_User', undefined, {
+      useMasterKey: true,
+    });
+    expect(res.results.length).toBe(1);
+    expect(res.results[0].objectId).toEqual(userId);
+  });
+
+  it('ensures no user is created when passing an empty username', async () => {
+    try {
+      await RESTController.request('POST', '/classes/_User', {
+        username: '',
+        password: 'world',
      });
+      fail('Success callback should not be called when passing an empty username.');
+    } catch (err) {
+      expect(err.code).toBe(Parse.Error.USERNAME_MISSING);
+      expect(err.message).toBe('bad or missing username');
+    }
  });

-  it('ensures masterKey is properly handled', done => {
-    let userId;
-    Parse.User.signUp('user', 'pass')
-      .then(user => {
-        userId = user.id;
-        return Parse.User.logOut().then(() => {
-          return RESTController.request('GET', '/classes/_User', undefined, {
-            useMasterKey: true,
-          });
-        });
-      })
-      .then(
-        res => {
-          expect(res.results.length).toBe(1);
-          expect(res.results[0].objectId).toEqual(userId);
-          done();
-        },
-        err => {
-          jfail(err);
-          done();
-        }
-      );
+  it('ensures no user is created when passing an empty password', async () => {
+    try {
+      await RESTController.request('POST', '/classes/_User', {
+        username: 'hello',
+        password: '',
+      });
+      fail('Success callback should not be called when passing an empty password.');
+    } catch (err) {
+      expect(err.code).toBe(Parse.Error.PASSWORD_MISSING);
+      expect(err.message).toBe('password is required');
+    }
  });

-  it('ensures no user is created when passing an empty username', done => {
-    RESTController.request('POST', '/classes/_User', {
-      username: '',
-      password: 'world',
-    }).then(
-      () => {
-        jfail(new Error('Success callback should not be called when passing an empty username.'));
-        done();
-      },
-      err => {
-        expect(err.code).toBe(Parse.Error.USERNAME_MISSING);
-        expect(err.message).toBe('bad or missing username');
-        done();
-      }
-    );
-  });
-
-  it('ensures no user is created when passing an empty password', done => {
-    RESTController.request('POST', '/classes/_User', {
-      username: 'hello',
-      password: '',
-    }).then(
-      () => {
-        jfail(new Error('Success callback should not be called when passing an empty password.'));
-        done();
-      },
-      err => {
-        expect(err.code).toBe(Parse.Error.PASSWORD_MISSING);
-        expect(err.message).toBe('password is required');
-        done();
-      }
-    );
-  });
-
-  it('ensures no session token is created on creating users', done => {
-    RESTController.request('POST', '/classes/_User', {
+  it('ensures no session token is created on creating users', async () => {
+    const user = await RESTController.request('POST', '/classes/_User', {
      username: 'hello',
      password: 'world',
-    })
-      .then(user => {
-        expect(user.sessionToken).toBeUndefined();
-        const query = new Parse.Query('_Session');
-        return query.find({ useMasterKey: true });
-      })
-      .then(sessions => {
-        expect(sessions.length).toBe(0);
-        done();
-      }, done.fail);
+    });
+    expect(user.sessionToken).toBeUndefined();
+    const query = new Parse.Query('_Session');
+    const sessions = await query.find({ useMasterKey: true });
+    expect(sessions.length).toBe(0);
  });

-  it('ensures a session token is created when passing installationId != cloud', done => {
-    RESTController.request(
+  it('ensures a session token is created when passing installationId != cloud', async () => {
+    const user = await RESTController.request(
      'POST',
      '/classes/_User',
      { username: 'hello', password: 'world' },
      { installationId: 'my-installation' }
-    )
-      .then(user => {
-        expect(user.sessionToken).not.toBeUndefined();
-        const query = new Parse.Query('_Session');
-        return query.find({ useMasterKey: true });
-      })
-      .then(
-        sessions => {
-          expect(sessions.length).toBe(1);
-          expect(sessions[0].get('installationId')).toBe('my-installation');
-          done();
-        },
-        err => {
-          jfail(err);
-          done();
-        }
-      );
+    );
+    expect(user.sessionToken).not.toBeUndefined();
+    const query = new Parse.Query('_Session');
+    const sessions = await query.find({ useMasterKey: true });
+    expect(sessions.length).toBe(1);
+    expect(sessions[0].get('installationId')).toBe('my-installation');
  });

  it('ensures logIn is saved with installationId', async () => {
@@ -4,8 +4,7 @@ const PostgresStorageAdapter = require('../lib/Adapters/Storage/Postgres/Postgre
 const postgresURI =
  process.env.PARSE_SERVER_TEST_DATABASE_URI ||
  'postgres://localhost:5432/parse_server_postgres_adapter_test_database';
-const ParseServer = require('../lib/index');
-const express = require('express');
+
 //public schema
 const databaseOptions1 = {
  initOptions: {
@@ -24,72 +23,56 @@ const GameScore = Parse.Object.extend({
  className: 'GameScore',
 });

-function createParseServer(options) {
-  return new Promise((resolve, reject) => {
-    const parseServer = new ParseServer.default(
-      Object.assign({}, defaultConfiguration, options, {
-        serverURL: 'http://localhost:12668/parse',
-        serverStartComplete: error => {
-          if (error) {
-            reject(error);
-          } else {
-            expect(Parse.applicationId).toEqual('test');
-            const app = express();
-            app.use('/parse', parseServer.app);
-
-            const server = app.listen(12668);
-            Parse.serverURL = 'http://localhost:12668/parse';
-            resolve(server);
-          }
-        },
-      })
-    );
-  });
-}
-
 describe_only_db('postgres')('Postgres database init options', () => {
-  let server;
-
-  afterAll(done => {
-    if (server) {
-      Parse.serverURL = 'http://localhost:8378/1';
-      server.close(done);
-    }
-  });
-
-  it('should create server with public schema databaseOptions', done => {
+  it('should create server with public schema databaseOptions', async () => {
    const adapter = new PostgresStorageAdapter({
      uri: postgresURI,
      collectionPrefix: 'test_',
      databaseOptions: databaseOptions1,
    });
-
-    createParseServer({ databaseAdapter: adapter })
-      .then(newServer => {
-        server = newServer;
-        const score = new GameScore({
-          score: 1337,
-          playerName: 'Sean Plott',
-          cheatMode: false,
-        });
-        return score.save();
-      })
-      .then(async () => {
-        await reconfigureServer();
-        done();
-      }, done.fail);
+    await reconfigureServer({
+      databaseAdapter: adapter,
+    });
+    const score = new GameScore({
+      score: 1337,
+      playerName: 'Sean Plott',
+      cheatMode: false,
+    });
+    await score.save();
  });

-  it('should fail to create server if schema databaseOptions does not exist', done => {
+  it('should create server using postgresql uri with public schema databaseOptions', async () => {
+    const postgresURI2 = new URL(postgresURI);
+    postgresURI2.protocol = 'postgresql:';
+    const adapter = new PostgresStorageAdapter({
+      uri: postgresURI2.toString(),
+      collectionPrefix: 'test_',
+      databaseOptions: databaseOptions1,
+    });
+    await reconfigureServer({
+      databaseAdapter: adapter,
+    });
+    const score = new GameScore({
+      score: 1337,
+      playerName: 'Sean Plott',
+      cheatMode: false,
+    });
+    await score.save();
+  });
+
+  it('should fail to create server if schema databaseOptions does not exist', async () => {
    const adapter = new PostgresStorageAdapter({
      uri: postgresURI,
      collectionPrefix: 'test_',
      databaseOptions: databaseOptions2,
    });
-
-    createParseServer({ databaseAdapter: adapter }).then(done.fail, async () => {
-      await reconfigureServer();
-      done();
-    });
+    try {
+      await reconfigureServer({
+        databaseAdapter: adapter,
+      });
+      fail('Should have thrown error');
+    } catch (error) {
+      expect(error).toBeDefined();
+    }
  });
 });
@@ -149,6 +149,135 @@ describe_only_db('postgres')('PostgresStorageAdapter', () => {
    await expectAsync(adapter.getClass('UnknownClass')).toBeRejectedWith(undefined);
  });

+  it('$relativeTime should error on $eq', async () => {
+    const tableName = '_User';
+    const schema = {
+      fields: {
+        objectId: { type: 'String' },
+        username: { type: 'String' },
+        email: { type: 'String' },
+        emailVerified: { type: 'Boolean' },
+        createdAt: { type: 'Date' },
+        updatedAt: { type: 'Date' },
+        authData: { type: 'Object' },
+      },
+    };
+    const client = adapter._client;
+    await adapter.createTable(tableName, schema);
+    await client.none('INSERT INTO $1:name ($2:name, $3:name) VALUES ($4, $5)', [
+      tableName,
+      'objectId',
+      'username',
+      'Bugs',
+      'Bunny',
+    ]);
+    const database = Config.get(Parse.applicationId).database;
+    await database.loadSchema({ clearCache: true });
+    try {
+      await database.find(
+        tableName,
+        {
+          createdAt: {
+            $eq: {
+              $relativeTime: '12 days ago',
+            },
+          },
+        },
+        {}
+      );
+      fail('Should have thrown error');
+    } catch (error) {
+      expect(error.code).toBe(Parse.Error.INVALID_JSON);
+    }
+    await dropTable(client, tableName);
+  });
+
+  it('$relativeTime should error on $ne', async () => {
+    const tableName = '_User';
+    const schema = {
+      fields: {
+        objectId: { type: 'String' },
+        username: { type: 'String' },
+        email: { type: 'String' },
+        emailVerified: { type: 'Boolean' },
+        createdAt: { type: 'Date' },
+        updatedAt: { type: 'Date' },
+        authData: { type: 'Object' },
+      },
+    };
+    const client = adapter._client;
+    await adapter.createTable(tableName, schema);
+    await client.none('INSERT INTO $1:name ($2:name, $3:name) VALUES ($4, $5)', [
+      tableName,
+      'objectId',
+      'username',
+      'Bugs',
+      'Bunny',
+    ]);
+    const database = Config.get(Parse.applicationId).database;
+    await database.loadSchema({ clearCache: true });
+    try {
+      await database.find(
+        tableName,
+        {
+          createdAt: {
+            $ne: {
+              $relativeTime: '12 days ago',
+            },
+          },
+        },
+        {}
+      );
+      fail('Should have thrown error');
+    } catch (error) {
+      expect(error.code).toBe(Parse.Error.INVALID_JSON);
+    }
+    await dropTable(client, tableName);
+  });
+
+  it('$relativeTime should error on $exists', async () => {
+    const tableName = '_User';
+    const schema = {
+      fields: {
+        objectId: { type: 'String' },
+        username: { type: 'String' },
+        email: { type: 'String' },
+        emailVerified: { type: 'Boolean' },
+        createdAt: { type: 'Date' },
+        updatedAt: { type: 'Date' },
+        authData: { type: 'Object' },
+      },
+    };
+    const client = adapter._client;
+    await adapter.createTable(tableName, schema);
+    await client.none('INSERT INTO $1:name ($2:name, $3:name) VALUES ($4, $5)', [
+      tableName,
+      'objectId',
+      'username',
+      'Bugs',
+      'Bunny',
+    ]);
+    const database = Config.get(Parse.applicationId).database;
+    await database.loadSchema({ clearCache: true });
+    try {
+      await database.find(
+        tableName,
+        {
+          createdAt: {
+            $exists: {
+              $relativeTime: '12 days ago',
+            },
+          },
+        },
+        {}
+      );
+      fail('Should have thrown error');
+    } catch (error) {
+      expect(error.code).toBe(Parse.Error.INVALID_JSON);
+    }
+    await dropTable(client, tableName);
+  });
+
  it('should use index for caseInsensitive query using Postgres', async () => {
    const tableName = '_User';
    const schema = {
@@ -426,9 +555,21 @@ describe_only_db('postgres')('PostgresStorageAdapter', () => {
      },
      classLevelPermissions: undefined,
    });
-    await new Promise(resolve => setTimeout(resolve, 500));
+    await new Promise(resolve => setTimeout(resolve, 2000));
    expect(adapter._onchange).toHaveBeenCalled();
  });
+
+  it('Idempotency class should have function', async () => {
+    await reconfigureServer();
+    const adapter = Config.get('test').database.adapter;
+    const client = adapter._client;
+    const qs =
+      "SELECT format('%I.%I(%s)', ns.nspname, p.proname, oidvectortypes(p.proargtypes)) FROM pg_proc p INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid) WHERE p.proname = 'idempotency_delete_expired_records'";
+    const foundFunction = await client.one(qs);
+    expect(foundFunction.format).toBe('public.idempotency_delete_expired_records()');
+    await adapter.deleteIdempotencyFunction();
+    await client.none(qs);
+  });
 });

 describe_only_db('postgres')('PostgresStorageAdapter shutdown', () => {
@@ -438,4 +579,13 @@ describe_only_db('postgres')('PostgresStorageAdapter shutdown', () => {
    adapter.handleShutdown();
    expect(adapter._client.$pool.ending).toEqual(true);
  });
+
+  it('handleShutdown, close connection of postgresql uri', () => {
+    const databaseURI2 = new URL(databaseURI);
+    databaseURI2.protocol = 'postgresql:';
+    const adapter = new PostgresStorageAdapter({ uri: databaseURI2.toString() });
+    expect(adapter._client.$pool.ending).toEqual(false);
+    adapter.handleShutdown();
+    expect(adapter._client.$pool.ending).toEqual(true);
+  });
 });
@@ -562,11 +562,7 @@ describe('PushController', () => {
    });
    const pushStatusId = await sendPush(payload, {}, config, auth);
    // it is enqueued so it can take time
-    await new Promise(resolve => {
-      setTimeout(() => {
-        resolve();
-      }, 1000);
-    });
+    await sleep(1000);
    Parse.serverURL = 'http://localhost:8378/1'; // GOOD url
    const result = await Parse.Push.getPushStatus(pushStatusId);
    expect(result).toBeDefined();
@@ -767,7 +763,7 @@ describe('PushController', () => {
    });
  });

-  it('should not schedule push when not configured', done => {
+  it('should not schedule push when not configured', async () => {
    const config = Config.get(Parse.applicationId);
    const auth = {
      isMaster: true,
@@ -800,33 +796,20 @@ describe('PushController', () => {
      installations.push(installation);
    }

-    reconfigureServer({
+    await reconfigureServer({
      push: { adapter: pushAdapter },
-    })
-      .then(() => {
-        return Parse.Object.saveAll(installations)
-          .then(() => {
-            return pushController.sendPush(payload, {}, config, auth);
-          })
-          .then(() => new Promise(resolve => setTimeout(resolve, 300)));
-      })
-      .then(() => {
-        const query = new Parse.Query('_PushStatus');
-        return query.find({ useMasterKey: true }).then(results => {
-          expect(results.length).toBe(1);
-          const pushStatus = results[0];
-          expect(pushStatus.get('status')).not.toBe('scheduled');
-          done();
-        });
-      })
-      .catch(err => {
-        console.error(err);
-        fail('should not fail');
-        done();
-      });
+    });
+    await Parse.Object.saveAll(installations);
+    await pushController.sendPush(payload, {}, config, auth);
+    await sleep(1000);
+    const query = new Parse.Query('_PushStatus');
+    const results = await query.find({ useMasterKey: true });
+    expect(results.length).toBe(1);
+    const pushStatus = results[0];
+    expect(pushStatus.get('status')).not.toBe('scheduled');
  });

-  it('should schedule push when configured', done => {
+  it('should schedule push when configured', async () => {
    const auth = {
      isMaster: true,
    };
@@ -866,28 +849,19 @@ describe('PushController', () => {
      installation.set('deviceType', 'ios');
      installations.push(installation);
    }
-    reconfigureServer({
+    await reconfigureServer({
      push: { adapter: pushAdapter },
      scheduledPush: true,
-    })
-      .then(() => {
-        const config = Config.get(Parse.applicationId);
-        return Parse.Object.saveAll(installations)
-          .then(() => {
-            return pushController.sendPush(payload, {}, config, auth);
-          })
-          .then(() => new Promise(resolve => setTimeout(resolve, 300)));
-      })
-      .then(() => {
-        const query = new Parse.Query('_PushStatus');
-        return query.find({ useMasterKey: true }).then(results => {
-          expect(results.length).toBe(1);
-          const pushStatus = results[0];
-          expect(pushStatus.get('status')).toBe('scheduled');
-        });
-      })
-      .then(done)
-      .catch(done.err);
+    });
+    const config = Config.get(Parse.applicationId);
+    await Parse.Object.saveAll(installations);
+    await pushController.sendPush(payload, {}, config, auth);
+    await sleep(1000);
+    const query = new Parse.Query('_PushStatus');
+    const results = await query.find({ useMasterKey: true });
+    expect(results.length).toBe(1);
+    const pushStatus = results[0];
+    expect(pushStatus.get('status')).toBe('scheduled');
  });

  it('should not enqueue push when device token is not set', async () => {
@@ -1,9 +1,8 @@
 'use strict';

 const Parse = require('parse/node');
-const ReadPreference = require('mongodb').ReadPreference;
+const { ReadPreference, Collection } = require('mongodb');
 const request = require('../lib/request');
-const Config = require('../lib/Config');

 function waitForReplication() {
  return new Promise(function (resolve) {
@@ -13,8 +12,6 @@ function waitForReplication() {

 describe_only_db('mongo')('Read preference option', () => {
  it('should find in primary by default', done => {
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-
    const obj0 = new Parse.Object('MyObject');
    obj0.set('boolKey', false);
    const obj1 = new Parse.Object('MyObject');
@@ -22,7 +19,7 @@ describe_only_db('mongo')('Read preference option', () => {

    Parse.Object.saveAll([obj0, obj1])
      .then(() => {
-        spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+        spyOn(Collection.prototype, 'find').and.callThrough();

        const query = new Parse.Query('MyObject');
        query.equalTo('boolKey', false);
@@ -31,10 +28,10 @@ describe_only_db('mongo')('Read preference option', () => {
          expect(results.length).toBe(1);
          expect(results[0].get('boolKey')).toBe(false);
          let myObjectReadPreference = null;
-          databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-            if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
+          Collection.prototype.find.calls.all().forEach(call => {
+            if (call.object.s.namespace.collection.indexOf('MyObject') >= 0) {
              myObjectReadPreference = true;
-              expect(call.args[0].options.readPreference.mode).toBe(ReadPreference.PRIMARY);
+              expect(call.object.s.readPreference.mode).toBe(ReadPreference.PRIMARY);
            }
          });

@@ -58,15 +55,13 @@ describe_only_db('mongo')('Read preference option', () => {
      databaseAdapter: new MongoStorageAdapter(adapterOptions),
    });

-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-
    const obj0 = new Parse.Object('MyObject');
    obj0.set('boolKey', false);
    const obj1 = new Parse.Object('MyObject');
    obj1.set('boolKey', true);

    await Parse.Object.saveAll([obj0, obj1]);
-    spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+    spyOn(Collection.prototype, 'find').and.callThrough();

    const query = new Parse.Query('MyObject');
    query.equalTo('boolKey', false);
@@ -76,10 +71,10 @@ describe_only_db('mongo')('Read preference option', () => {
    expect(results[0].get('boolKey')).toBe(false);

    let myObjectReadPreference = null;
-    databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-      if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
+    Collection.prototype.find.calls.all().forEach(call => {
+      if (call.object.s.namespace.collection.indexOf('MyObject') >= 0) {
        myObjectReadPreference = true;
-        expect(call.args[0].options.readPreference.mode).toBe(ReadPreference.NEAREST);
+        expect(call.args[1].readPreference).toBe(ReadPreference.NEAREST);
      }
    });

@@ -87,15 +82,13 @@ describe_only_db('mongo')('Read preference option', () => {
  });

  it('should change read preference in the beforeFind trigger', async () => {
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-
    const obj0 = new Parse.Object('MyObject');
    obj0.set('boolKey', false);
    const obj1 = new Parse.Object('MyObject');
    obj1.set('boolKey', true);

    await Parse.Object.saveAll([obj0, obj1]);
-    spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+    spyOn(Collection.prototype, 'find').and.callThrough();

    Parse.Cloud.beforeFind('MyObject', req => {
      req.readPreference = 'SECONDARY';
@@ -110,9 +103,9 @@ describe_only_db('mongo')('Read preference option', () => {
    expect(results[0].get('boolKey')).toBe(false);

    let myObjectReadPreference = null;
-    databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-      if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
-        myObjectReadPreference = call.args[0].options.readPreference.mode;
+    Collection.prototype.find.calls.all().forEach(call => {
+      if (call.object.s.namespace.collection.indexOf('MyObject') >= 0) {
+        myObjectReadPreference = call.args[1].readPreference;
      }
    });

@@ -120,15 +113,13 @@ describe_only_db('mongo')('Read preference option', () => {
  });

  it('should check read preference as case insensitive', async () => {
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-
    const obj0 = new Parse.Object('MyObject');
    obj0.set('boolKey', false);
    const obj1 = new Parse.Object('MyObject');
    obj1.set('boolKey', true);

    await Parse.Object.saveAll([obj0, obj1]);
-    spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+    spyOn(Collection.prototype, 'find').and.callThrough();

    Parse.Cloud.beforeFind('MyObject', req => {
      req.readPreference = 'sEcOnDarY';
@@ -144,9 +135,9 @@ describe_only_db('mongo')('Read preference option', () => {
    expect(results[0].get('boolKey')).toBe(false);

    let myObjectReadPreference = null;
-    databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-      if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
-        myObjectReadPreference = call.args[0].options.readPreference.mode;
+    Collection.prototype.find.calls.all().forEach(call => {
+      if (call.object.s.namespace.collection.indexOf('MyObject') >= 0) {
+        myObjectReadPreference = call.args[1].readPreference;
      }
    });

@@ -154,15 +145,13 @@ describe_only_db('mongo')('Read preference option', () => {
  });

  it('should change read preference in the beforeFind trigger even changing query', async () => {
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-
    const obj0 = new Parse.Object('MyObject');
    obj0.set('boolKey', false);
    const obj1 = new Parse.Object('MyObject');
    obj1.set('boolKey', true);

    await Parse.Object.saveAll([obj0, obj1]);
-    spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+    spyOn(Collection.prototype, 'find').and.callThrough();

    Parse.Cloud.beforeFind('MyObject', req => {
      req.query.equalTo('boolKey', true);
@@ -178,9 +167,9 @@ describe_only_db('mongo')('Read preference option', () => {
    expect(results[0].get('boolKey')).toBe(true);

    let myObjectReadPreference = null;
-    databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-      if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
-        myObjectReadPreference = call.args[0].options.readPreference.mode;
+    Collection.prototype.find.calls.all().forEach(call => {
+      if (call.object.s.namespace.collection.indexOf('MyObject') >= 0) {
+        myObjectReadPreference = call.args[1].readPreference;
      }
    });

@@ -188,15 +177,13 @@ describe_only_db('mongo')('Read preference option', () => {
  });

  it('should change read preference in the beforeFind trigger even returning query', async () => {
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-
    const obj0 = new Parse.Object('MyObject');
    obj0.set('boolKey', false);
    const obj1 = new Parse.Object('MyObject');
    obj1.set('boolKey', true);

    await Parse.Object.saveAll([obj0, obj1]);
-    spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+    spyOn(Collection.prototype, 'find').and.callThrough();

    Parse.Cloud.beforeFind('MyObject', req => {
      req.readPreference = 'SECONDARY';
@@ -216,9 +203,9 @@ describe_only_db('mongo')('Read preference option', () => {
    expect(results[0].get('boolKey')).toBe(true);

    let myObjectReadPreference = null;
-    databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-      if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
-        myObjectReadPreference = call.args[0].options.readPreference.mode;
+    Collection.prototype.find.calls.all().forEach(call => {
+      if (call.object.s.namespace.collection.indexOf('MyObject') >= 0) {
+        myObjectReadPreference = call.args[1].readPreference;
      }
    });

@@ -226,15 +213,13 @@ describe_only_db('mongo')('Read preference option', () => {
  });

  it('should change read preference in the beforeFind trigger even returning promise', async () => {
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-
    const obj0 = new Parse.Object('MyObject');
    obj0.set('boolKey', false);
    const obj1 = new Parse.Object('MyObject');
    obj1.set('boolKey', true);

    await Parse.Object.saveAll([obj0, obj1]);
-    spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+    spyOn(Collection.prototype, 'find').and.callThrough();

    Parse.Cloud.beforeFind('MyObject', req => {
      req.readPreference = 'SECONDARY';
@@ -253,9 +238,9 @@ describe_only_db('mongo')('Read preference option', () => {
    expect(results[0].get('boolKey')).toBe(true);

    let myObjectReadPreference = null;
-    databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-      if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
-        myObjectReadPreference = call.args[0].options.readPreference.mode;
+    Collection.prototype.find.calls.all().forEach(call => {
+      if (call.object.s.namespace.collection.indexOf('MyObject') >= 0) {
+        myObjectReadPreference = call.args[1].readPreference;
      }
    });

@@ -263,15 +248,13 @@ describe_only_db('mongo')('Read preference option', () => {
  });

  it('should change read preference to PRIMARY_PREFERRED', async () => {
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-
    const obj0 = new Parse.Object('MyObject');
    obj0.set('boolKey', false);
    const obj1 = new Parse.Object('MyObject');
    obj1.set('boolKey', true);

    await Parse.Object.saveAll([obj0, obj1]);
-    spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+    spyOn(Collection.prototype, 'find').and.callThrough();

    Parse.Cloud.beforeFind('MyObject', req => {
      req.readPreference = 'PRIMARY_PREFERRED';
@@ -286,9 +269,9 @@ describe_only_db('mongo')('Read preference option', () => {
    expect(results[0].get('boolKey')).toBe(false);

    let myObjectReadPreference = null;
-    databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-      if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
-        myObjectReadPreference = call.args[0].options.readPreference.mode;
+    Collection.prototype.find.calls.all().forEach(call => {
+      if (call.object.s.namespace.collection.indexOf('MyObject') >= 0) {
+        myObjectReadPreference = call.args[1].readPreference;
      }
    });

@@ -296,15 +279,13 @@ describe_only_db('mongo')('Read preference option', () => {
  });

  it('should change read preference to SECONDARY_PREFERRED', async () => {
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-
    const obj0 = new Parse.Object('MyObject');
    obj0.set('boolKey', false);
    const obj1 = new Parse.Object('MyObject');
    obj1.set('boolKey', true);

    await Parse.Object.saveAll([obj0, obj1]);
-    spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+    spyOn(Collection.prototype, 'find').and.callThrough();

    Parse.Cloud.beforeFind('MyObject', req => {
      req.readPreference = 'SECONDARY_PREFERRED';
@@ -319,9 +300,9 @@ describe_only_db('mongo')('Read preference option', () => {
    expect(results[0].get('boolKey')).toBe(false);

    let myObjectReadPreference = null;
-    databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-      if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
-        myObjectReadPreference = call.args[0].options.readPreference.mode;
+    Collection.prototype.find.calls.all().forEach(call => {
+      if (call.object.s.namespace.collection.indexOf('MyObject') >= 0) {
+        myObjectReadPreference = call.args[1].readPreference;
      }
    });

@@ -329,15 +310,13 @@ describe_only_db('mongo')('Read preference option', () => {
  });

  it('should change read preference to NEAREST', async () => {
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-
    const obj0 = new Parse.Object('MyObject');
    obj0.set('boolKey', false);
    const obj1 = new Parse.Object('MyObject');
    obj1.set('boolKey', true);

    await Parse.Object.saveAll([obj0, obj1]);
-    spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+    spyOn(Collection.prototype, 'find').and.callThrough();

    Parse.Cloud.beforeFind('MyObject', req => {
      req.readPreference = 'NEAREST';
@@ -352,9 +331,9 @@ describe_only_db('mongo')('Read preference option', () => {
    expect(results[0].get('boolKey')).toBe(false);

    let myObjectReadPreference = null;
-    databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-      if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
-        myObjectReadPreference = call.args[0].options.readPreference.mode;
+    Collection.prototype.find.calls.all().forEach(call => {
+      if (call.object.s.namespace.collection.indexOf('MyObject') >= 0) {
+        myObjectReadPreference = call.args[1].readPreference;
      }
    });

@@ -362,15 +341,13 @@ describe_only_db('mongo')('Read preference option', () => {
  });

  it('should change read preference for GET', async () => {
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-
    const obj0 = new Parse.Object('MyObject');
    obj0.set('boolKey', false);
    const obj1 = new Parse.Object('MyObject');
    obj1.set('boolKey', true);

    await Parse.Object.saveAll([obj0, obj1]);
-    spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+    spyOn(Collection.prototype, 'find').and.callThrough();

    Parse.Cloud.beforeFind('MyObject', req => {
      req.readPreference = 'SECONDARY';
@@ -383,9 +360,9 @@ describe_only_db('mongo')('Read preference option', () => {
    expect(result.get('boolKey')).toBe(false);

    let myObjectReadPreference = null;
-    databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-      if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
-        myObjectReadPreference = call.args[0].options.readPreference.mode;
+    Collection.prototype.find.calls.all().forEach(call => {
+      if (call.object.s.namespace.collection.indexOf('MyObject') >= 0) {
+        myObjectReadPreference = call.args[1].readPreference;
      }
    });

@@ -393,15 +370,13 @@ describe_only_db('mongo')('Read preference option', () => {
  });

  it('should change read preference for GET using API', async () => {
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-
    const obj0 = new Parse.Object('MyObject');
    obj0.set('boolKey', false);
    const obj1 = new Parse.Object('MyObject');
    obj1.set('boolKey', true);

    await Parse.Object.saveAll([obj0, obj1]);
-    spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+    spyOn(Collection.prototype, 'find').and.callThrough();

    Parse.Cloud.beforeFind('MyObject', req => {
      req.readPreference = 'SECONDARY';
@@ -421,9 +396,9 @@ describe_only_db('mongo')('Read preference option', () => {
    expect(body.boolKey).toBe(false);

    let myObjectReadPreference = null;
-    databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-      if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
-        myObjectReadPreference = call.args[0].options.readPreference.mode;
+    Collection.prototype.find.calls.all().forEach(call => {
+      if (call.object.s.namespace.collection.indexOf('MyObject') >= 0) {
+        myObjectReadPreference = call.args[1].readPreference;
      }
    });

@@ -431,15 +406,13 @@ describe_only_db('mongo')('Read preference option', () => {
  });

  it('should change read preference for GET directly from API', async () => {
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-
    const obj0 = new Parse.Object('MyObject');
    obj0.set('boolKey', false);
    const obj1 = new Parse.Object('MyObject');
    obj1.set('boolKey', true);

    await Parse.Object.saveAll([obj0, obj1]);
-    spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+    spyOn(Collection.prototype, 'find').and.callThrough();
    await waitForReplication();

    const response = await request({
@@ -454,9 +427,9 @@ describe_only_db('mongo')('Read preference option', () => {
    expect(response.data.boolKey).toBe(false);

    let myObjectReadPreference = null;
-    databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-      if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
-        myObjectReadPreference = call.args[0].options.readPreference.mode;
+    Collection.prototype.find.calls.all().forEach(call => {
+      if (call.object.s.namespace.collection.indexOf('MyObject') >= 0) {
+        myObjectReadPreference = call.args[1].readPreference;
      }
    });

@@ -464,15 +437,13 @@ describe_only_db('mongo')('Read preference option', () => {
  });

  it('should change read preference for GET using API through the beforeFind overriding API option', async () => {
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-
    const obj0 = new Parse.Object('MyObject');
    obj0.set('boolKey', false);
    const obj1 = new Parse.Object('MyObject');
    obj1.set('boolKey', true);

    await Parse.Object.saveAll([obj0, obj1]);
-    spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+    spyOn(Collection.prototype, 'find').and.callThrough();

    Parse.Cloud.beforeFind('MyObject', req => {
      req.readPreference = 'SECONDARY_PREFERRED';
@@ -491,9 +462,9 @@ describe_only_db('mongo')('Read preference option', () => {
    expect(response.data.boolKey).toBe(false);

    let myObjectReadPreference = null;
-    databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-      if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
-        myObjectReadPreference = call.args[0].options.readPreference.mode;
+    Collection.prototype.find.calls.all().forEach(call => {
+      if (call.object.s.namespace.collection.indexOf('MyObject') >= 0) {
+        myObjectReadPreference = call.args[1].readPreference;
      }
    });

@@ -501,15 +472,13 @@ describe_only_db('mongo')('Read preference option', () => {
  });

  it('should change read preference for FIND using API through beforeFind trigger', async () => {
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-
    const obj0 = new Parse.Object('MyObject');
    obj0.set('boolKey', false);
    const obj1 = new Parse.Object('MyObject');
    obj1.set('boolKey', true);

    await Parse.Object.saveAll([obj0, obj1]);
-    spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+    spyOn(Collection.prototype, 'find').and.callThrough();

    Parse.Cloud.beforeFind('MyObject', req => {
      req.readPreference = 'SECONDARY';
@@ -528,9 +497,9 @@ describe_only_db('mongo')('Read preference option', () => {
    expect(response.data.results.length).toEqual(2);

    let myObjectReadPreference = null;
-    databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-      if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
-        myObjectReadPreference = call.args[0].options.readPreference.mode;
+    Collection.prototype.find.calls.all().forEach(call => {
+      if (call.object.s.namespace.collection.indexOf('MyObject') >= 0) {
+        myObjectReadPreference = call.args[1].readPreference;
      }
    });

@@ -538,15 +507,13 @@ describe_only_db('mongo')('Read preference option', () => {
  });

  it('should change read preference for FIND directly from API', async () => {
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-
    const obj0 = new Parse.Object('MyObject');
    obj0.set('boolKey', false);
    const obj1 = new Parse.Object('MyObject');
    obj1.set('boolKey', true);

    await Parse.Object.saveAll([obj0, obj1]);
-    spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+    spyOn(Collection.prototype, 'find').and.callThrough();
    await waitForReplication();

    const response = await request({
@@ -561,9 +528,9 @@ describe_only_db('mongo')('Read preference option', () => {
    expect(response.data.results.length).toEqual(2);

    let myObjectReadPreference = null;
-    databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-      if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
-        myObjectReadPreference = call.args[0].options.readPreference.mode;
+    Collection.prototype.find.calls.all().forEach(call => {
+      if (call.object.s.namespace.collection.indexOf('MyObject') >= 0) {
+        myObjectReadPreference = call.args[1].readPreference;
      }
    });

@@ -571,15 +538,13 @@ describe_only_db('mongo')('Read preference option', () => {
  });

  it('should change read preference for FIND using API through the beforeFind overriding API option', async () => {
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-
    const obj0 = new Parse.Object('MyObject');
    obj0.set('boolKey', false);
    const obj1 = new Parse.Object('MyObject');
    obj1.set('boolKey', true);

    await Parse.Object.saveAll([obj0, obj1]);
-    spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+    spyOn(Collection.prototype, 'find').and.callThrough();

    Parse.Cloud.beforeFind('MyObject', req => {
      req.readPreference = 'SECONDARY_PREFERRED';
@@ -598,9 +563,9 @@ describe_only_db('mongo')('Read preference option', () => {
    expect(response.data.results.length).toEqual(2);

    let myObjectReadPreference = null;
-    databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-      if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
-        myObjectReadPreference = call.args[0].options.readPreference.mode;
+    Collection.prototype.find.calls.all().forEach(call => {
+      if (call.object.s.namespace.collection.indexOf('MyObject') >= 0) {
+        myObjectReadPreference = call.args[1].readPreference;
      }
    });

@@ -608,15 +573,13 @@ describe_only_db('mongo')('Read preference option', () => {
  });

  xit('should change read preference for count', done => {
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-
    const obj0 = new Parse.Object('MyObject');
    obj0.set('boolKey', false);
    const obj1 = new Parse.Object('MyObject');
    obj1.set('boolKey', true);

    Parse.Object.saveAll([obj0, obj1]).then(() => {
-      spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+      spyOn(Collection.prototype, 'find').and.callThrough();

      Parse.Cloud.beforeFind('MyObject', req => {
        req.readPreference = 'SECONDARY';
@@ -631,9 +594,9 @@ describe_only_db('mongo')('Read preference option', () => {
          expect(result).toBe(1);

          let myObjectReadPreference = null;
-          databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-            if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
-              myObjectReadPreference = call.args[0].options.readPreference.mode;
+          Collection.prototype.find.calls.all().forEach(call => {
+            if (call.object.s.namespace.collection.indexOf('MyObject') >= 0) {
+              myObjectReadPreference = call.args[1].readPreference;
            }
          });

@@ -659,17 +622,16 @@ describe_only_db('mongo')('Read preference option', () => {
    await waitForReplication();

    // Spy on DB adapter
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-    spyOn(databaseAdapter.database.serverConfig, 'startSession').and.callThrough();
+    spyOn(Collection.prototype, 'aggregate').and.callThrough();
    // Query
    const query = new Parse.Query('MyObject');
    const results = await query.aggregate([{ match: { boolKey: false } }]);
    // Validate
    expect(results.length).toBe(1);
    let readPreference = null;
-    databaseAdapter.database.serverConfig.startSession.calls.all().forEach(call => {
-      if (call.args[0].owner.ns.indexOf('MyObject') > -1) {
-        readPreference = call.args[0].owner.operation.readPreference.mode;
+    Collection.prototype.aggregate.calls.all().forEach(call => {
+      if (call.object.s.namespace.collection.indexOf('MyObject') > -1) {
+        readPreference = call.args[1].readPreference;
      }
    });
    expect(readPreference).toEqual(ReadPreference.SECONDARY);
@@ -685,8 +647,7 @@ describe_only_db('mongo')('Read preference option', () => {
    await waitForReplication();

    // Spy on DB adapter
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-    spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+    spyOn(Collection.prototype, 'find').and.callThrough();
    // Query
    const query = new Parse.Query('MyObject');
    query.equalTo('boolKey', false);
@@ -695,9 +656,9 @@ describe_only_db('mongo')('Read preference option', () => {
    // Validate
    expect(results.length).toBe(1);
    let myObjectReadPreference = null;
-    databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-      if (call.args[0].ns.collection.indexOf('MyObject') >= 0) {
-        myObjectReadPreference = call.args[0].options.readPreference.mode;
+    Collection.prototype.find.calls.all().forEach(call => {
+      if (call.object.s.namespace.collection.indexOf('MyObject') >= 0) {
+        myObjectReadPreference = call.args[1].readPreference;
      }
    });
    expect(myObjectReadPreference).toEqual(ReadPreference.SECONDARY);
@@ -713,8 +674,7 @@ describe_only_db('mongo')('Read preference option', () => {
    await waitForReplication();

    // Spy on DB adapter
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-    spyOn(databaseAdapter.database.serverConfig, 'startSession').and.callThrough();
+    spyOn(Collection.prototype, 'aggregate').and.callThrough();
    // Query
    const query = new Parse.Query('MyObject');
    query.readPreference('SECONDARY');
@@ -722,17 +682,15 @@ describe_only_db('mongo')('Read preference option', () => {
    // Validate
    expect(results.length).toBe(1);
    let readPreference = null;
-    databaseAdapter.database.serverConfig.startSession.calls.all().forEach(call => {
-      if (call.args[0].owner.ns.indexOf('MyObject') > -1) {
-        readPreference = call.args[0].owner.operation.readPreference.mode;
+    Collection.prototype.aggregate.calls.all().forEach(call => {
+      if (call.object.s.namespace.collection.indexOf('MyObject') > -1) {
+        readPreference = call.args[1].readPreference;
      }
    });
    expect(readPreference).toEqual(ReadPreference.SECONDARY);
  });

  it('should find includes in same replica of readPreference by default', async () => {
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-
    const obj0 = new Parse.Object('MyObject0');
    obj0.set('boolKey', false);
    const obj1 = new Parse.Object('MyObject1');
@@ -743,7 +701,7 @@ describe_only_db('mongo')('Read preference option', () => {
    obj2.set('myObject1', obj1);

    await Parse.Object.saveAll([obj0, obj1, obj2]);
-    spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+    spyOn(Collection.prototype, 'find').and.callThrough();

    Parse.Cloud.beforeFind('MyObject2', req => {
      req.readPreference = 'SECONDARY';
@@ -765,15 +723,15 @@ describe_only_db('mongo')('Read preference option', () => {
    let myObjectReadPreference0 = null;
    let myObjectReadPreference1 = null;
    let myObjectReadPreference2 = null;
-    databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-      if (call.args[0].ns.collection.indexOf('MyObject0') >= 0) {
-        myObjectReadPreference0 = call.args[0].options.readPreference.mode;
+    Collection.prototype.find.calls.all().forEach(call => {
+      if (call.object.s.namespace.collection.indexOf('MyObject0') >= 0) {
+        myObjectReadPreference0 = call.args[1].readPreference;
      }
-      if (call.args[0].ns.collection.indexOf('MyObject1') >= 0) {
-        myObjectReadPreference1 = call.args[0].options.readPreference.mode;
+      if (call.object.s.namespace.collection.indexOf('MyObject1') >= 0) {
+        myObjectReadPreference1 = call.args[1].readPreference;
      }
-      if (call.args[0].ns.collection.indexOf('MyObject2') >= 0) {
-        myObjectReadPreference2 = call.args[0].options.readPreference.mode;
+      if (call.object.s.namespace.collection.indexOf('MyObject2') >= 0) {
+        myObjectReadPreference2 = call.args[1].readPreference;
      }
    });

@@ -783,8 +741,6 @@ describe_only_db('mongo')('Read preference option', () => {
  });

  it('should change includes read preference', async () => {
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-
    const obj0 = new Parse.Object('MyObject0');
    obj0.set('boolKey', false);
    const obj1 = new Parse.Object('MyObject1');
@@ -795,7 +751,7 @@ describe_only_db('mongo')('Read preference option', () => {
    obj2.set('myObject1', obj1);

    await Parse.Object.saveAll([obj0, obj1, obj2]);
-    spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+    spyOn(Collection.prototype, 'find').and.callThrough();

    Parse.Cloud.beforeFind('MyObject2', req => {
      req.readPreference = 'SECONDARY_PREFERRED';
@@ -818,15 +774,15 @@ describe_only_db('mongo')('Read preference option', () => {
    let myObjectReadPreference0 = null;
    let myObjectReadPreference1 = null;
    let myObjectReadPreference2 = null;
-    databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-      if (call.args[0].ns.collection.indexOf('MyObject0') >= 0) {
-        myObjectReadPreference0 = call.args[0].options.readPreference.mode;
+    Collection.prototype.find.calls.all().forEach(call => {
+      if (call.object.s.namespace.collection.indexOf('MyObject0') >= 0) {
+        myObjectReadPreference0 = call.args[1].readPreference;
      }
-      if (call.args[0].ns.collection.indexOf('MyObject1') >= 0) {
-        myObjectReadPreference1 = call.args[0].options.readPreference.mode;
+      if (call.object.s.namespace.collection.indexOf('MyObject1') >= 0) {
+        myObjectReadPreference1 = call.args[1].readPreference;
      }
-      if (call.args[0].ns.collection.indexOf('MyObject2') >= 0) {
-        myObjectReadPreference2 = call.args[0].options.readPreference.mode;
+      if (call.object.s.namespace.collection.indexOf('MyObject2') >= 0) {
+        myObjectReadPreference2 = call.args[1].readPreference;
      }
    });

@@ -836,8 +792,6 @@ describe_only_db('mongo')('Read preference option', () => {
  });

  it('should change includes read preference when finding through API', async () => {
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-
    const obj0 = new Parse.Object('MyObject0');
    obj0.set('boolKey', false);
    const obj1 = new Parse.Object('MyObject1');
@@ -848,7 +802,7 @@ describe_only_db('mongo')('Read preference option', () => {
    obj2.set('myObject1', obj1);

    await Parse.Object.saveAll([obj0, obj1, obj2]);
-    spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+    spyOn(Collection.prototype, 'find').and.callThrough();
    await waitForReplication();

    const response = await request({
@@ -873,15 +827,15 @@ describe_only_db('mongo')('Read preference option', () => {
    let myObjectReadPreference0 = null;
    let myObjectReadPreference1 = null;
    let myObjectReadPreference2 = null;
-    databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-      if (call.args[0].ns.collection.indexOf('MyObject0') >= 0) {
-        myObjectReadPreference0 = call.args[0].options.readPreference.mode;
+    Collection.prototype.find.calls.all().forEach(call => {
+      if (call.object.s.namespace.collection.indexOf('MyObject0') >= 0) {
+        myObjectReadPreference0 = call.args[1].readPreference;
      }
-      if (call.args[0].ns.collection.indexOf('MyObject1') >= 0) {
-        myObjectReadPreference1 = call.args[0].options.readPreference.mode;
+      if (call.object.s.namespace.collection.indexOf('MyObject1') >= 0) {
+        myObjectReadPreference1 = call.args[1].readPreference;
      }
-      if (call.args[0].ns.collection.indexOf('MyObject2') >= 0) {
-        myObjectReadPreference2 = call.args[0].options.readPreference.mode;
+      if (call.object.s.namespace.collection.indexOf('MyObject2') >= 0) {
+        myObjectReadPreference2 = call.args[1].readPreference;
      }
    });

@@ -891,8 +845,6 @@ describe_only_db('mongo')('Read preference option', () => {
  });

  it('should change includes read preference when getting through API', async () => {
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-
    const obj0 = new Parse.Object('MyObject0');
    obj0.set('boolKey', false);
    const obj1 = new Parse.Object('MyObject1');
@@ -903,7 +855,7 @@ describe_only_db('mongo')('Read preference option', () => {
    obj2.set('myObject1', obj1);

    await Parse.Object.saveAll([obj0, obj1, obj2]);
-    spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+    spyOn(Collection.prototype, 'find').and.callThrough();
    await waitForReplication();

    const response = await request({
@@ -929,15 +881,15 @@ describe_only_db('mongo')('Read preference option', () => {
    let myObjectReadPreference0 = null;
    let myObjectReadPreference1 = null;
    let myObjectReadPreference2 = null;
-    databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-      if (call.args[0].ns.collection.indexOf('MyObject0') >= 0) {
-        myObjectReadPreference0 = call.args[0].options.readPreference.mode;
+    Collection.prototype.find.calls.all().forEach(call => {
+      if (call.object.s.namespace.collection.indexOf('MyObject0') >= 0) {
+        myObjectReadPreference0 = call.args[1].readPreference;
      }
-      if (call.args[0].ns.collection.indexOf('MyObject1') >= 0) {
-        myObjectReadPreference1 = call.args[0].options.readPreference.mode;
+      if (call.object.s.namespace.collection.indexOf('MyObject1') >= 0) {
+        myObjectReadPreference1 = call.args[1].readPreference;
      }
-      if (call.args[0].ns.collection.indexOf('MyObject2') >= 0) {
-        myObjectReadPreference2 = call.args[0].options.readPreference.mode;
+      if (call.object.s.namespace.collection.indexOf('MyObject2') >= 0) {
+        myObjectReadPreference2 = call.args[1].readPreference;
      }
    });

@@ -947,8 +899,6 @@ describe_only_db('mongo')('Read preference option', () => {
  });

  it('should find subqueries in same replica of readPreference by default', async () => {
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-
    const obj0 = new Parse.Object('MyObject0');
    obj0.set('boolKey', false);
    const obj1 = new Parse.Object('MyObject1');
@@ -959,7 +909,7 @@ describe_only_db('mongo')('Read preference option', () => {
    obj2.set('myObject1', obj1);

    await Parse.Object.saveAll([obj0, obj1, obj2]);
-    spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+    spyOn(Collection.prototype, 'find').and.callThrough();

    Parse.Cloud.beforeFind('MyObject2', req => {
      req.readPreference = 'SECONDARY';
@@ -982,15 +932,15 @@ describe_only_db('mongo')('Read preference option', () => {
    let myObjectReadPreference0 = null;
    let myObjectReadPreference1 = null;
    let myObjectReadPreference2 = null;
-    databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-      if (call.args[0].ns.collection.indexOf('MyObject0') >= 0) {
-        myObjectReadPreference0 = call.args[0].options.readPreference.mode;
+    Collection.prototype.find.calls.all().forEach(call => {
+      if (call.object.s.namespace.collection.indexOf('MyObject0') >= 0) {
+        myObjectReadPreference0 = call.args[1].readPreference;
      }
-      if (call.args[0].ns.collection.indexOf('MyObject1') >= 0) {
-        myObjectReadPreference1 = call.args[0].options.readPreference.mode;
+      if (call.object.s.namespace.collection.indexOf('MyObject1') >= 0) {
+        myObjectReadPreference1 = call.args[1].readPreference;
      }
-      if (call.args[0].ns.collection.indexOf('MyObject2') >= 0) {
-        myObjectReadPreference2 = call.args[0].options.readPreference.mode;
+      if (call.object.s.namespace.collection.indexOf('MyObject2') >= 0) {
+        myObjectReadPreference2 = call.args[1].readPreference;
      }
    });

@@ -1000,8 +950,6 @@ describe_only_db('mongo')('Read preference option', () => {
  });

  it('should change subqueries read preference when using matchesQuery', async () => {
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-
    const obj0 = new Parse.Object('MyObject0');
    obj0.set('boolKey', false);
    const obj1 = new Parse.Object('MyObject1');
@@ -1012,7 +960,7 @@ describe_only_db('mongo')('Read preference option', () => {
    obj2.set('myObject1', obj1);

    await Parse.Object.saveAll([obj0, obj1, obj2]);
-    spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+    spyOn(Collection.prototype, 'find').and.callThrough();

    Parse.Cloud.beforeFind('MyObject2', req => {
      req.readPreference = 'SECONDARY_PREFERRED';
@@ -1036,15 +984,15 @@ describe_only_db('mongo')('Read preference option', () => {
    let myObjectReadPreference0 = null;
    let myObjectReadPreference1 = null;
    let myObjectReadPreference2 = null;
-    databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-      if (call.args[0].ns.collection.indexOf('MyObject0') >= 0) {
-        myObjectReadPreference0 = call.args[0].options.readPreference.mode;
+    Collection.prototype.find.calls.all().forEach(call => {
+      if (call.object.s.namespace.collection.indexOf('MyObject0') >= 0) {
+        myObjectReadPreference0 = call.args[1].readPreference;
      }
-      if (call.args[0].ns.collection.indexOf('MyObject1') >= 0) {
-        myObjectReadPreference1 = call.args[0].options.readPreference.mode;
+      if (call.object.s.namespace.collection.indexOf('MyObject1') >= 0) {
+        myObjectReadPreference1 = call.args[1].readPreference;
      }
-      if (call.args[0].ns.collection.indexOf('MyObject2') >= 0) {
-        myObjectReadPreference2 = call.args[0].options.readPreference.mode;
+      if (call.object.s.namespace.collection.indexOf('MyObject2') >= 0) {
+        myObjectReadPreference2 = call.args[1].readPreference;
      }
    });

@@ -1054,8 +1002,6 @@ describe_only_db('mongo')('Read preference option', () => {
  });

  it('should change subqueries read preference when using doesNotMatchQuery', async () => {
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-
    const obj0 = new Parse.Object('MyObject0');
    obj0.set('boolKey', false);
    const obj1 = new Parse.Object('MyObject1');
@@ -1066,7 +1012,7 @@ describe_only_db('mongo')('Read preference option', () => {
    obj2.set('myObject1', obj1);

    await Parse.Object.saveAll([obj0, obj1, obj2]);
-    spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+    spyOn(Collection.prototype, 'find').and.callThrough();

    Parse.Cloud.beforeFind('MyObject2', req => {
      req.readPreference = 'SECONDARY_PREFERRED';
@@ -1090,15 +1036,15 @@ describe_only_db('mongo')('Read preference option', () => {
    let myObjectReadPreference0 = null;
    let myObjectReadPreference1 = null;
    let myObjectReadPreference2 = null;
-    databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-      if (call.args[0].ns.collection.indexOf('MyObject0') >= 0) {
-        myObjectReadPreference0 = call.args[0].options.readPreference.mode;
+    Collection.prototype.find.calls.all().forEach(call => {
+      if (call.object.s.namespace.collection.indexOf('MyObject0') >= 0) {
+        myObjectReadPreference0 = call.args[1].readPreference;
      }
-      if (call.args[0].ns.collection.indexOf('MyObject1') >= 0) {
-        myObjectReadPreference1 = call.args[0].options.readPreference.mode;
+      if (call.object.s.namespace.collection.indexOf('MyObject1') >= 0) {
+        myObjectReadPreference1 = call.args[1].readPreference;
      }
-      if (call.args[0].ns.collection.indexOf('MyObject2') >= 0) {
-        myObjectReadPreference2 = call.args[0].options.readPreference.mode;
+      if (call.object.s.namespace.collection.indexOf('MyObject2') >= 0) {
+        myObjectReadPreference2 = call.args[1].readPreference;
      }
    });

@@ -1108,8 +1054,6 @@ describe_only_db('mongo')('Read preference option', () => {
  });

  it('should change subqueries read preference when using matchesKeyInQuery and doesNotMatchKeyInQuery', async () => {
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-
    const obj0 = new Parse.Object('MyObject0');
    obj0.set('boolKey', false);
    const obj1 = new Parse.Object('MyObject1');
@@ -1120,7 +1064,7 @@ describe_only_db('mongo')('Read preference option', () => {
    obj2.set('myObject1', obj1);

    await Parse.Object.saveAll([obj0, obj1, obj2]);
-    spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+    spyOn(Collection.prototype, 'find').and.callThrough();

    Parse.Cloud.beforeFind('MyObject2', req => {
      req.readPreference = 'SECONDARY_PREFERRED';
@@ -1145,15 +1089,15 @@ describe_only_db('mongo')('Read preference option', () => {
    let myObjectReadPreference0 = null;
    let myObjectReadPreference1 = null;
    let myObjectReadPreference2 = null;
-    databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-      if (call.args[0].ns.collection.indexOf('MyObject0') >= 0) {
-        myObjectReadPreference0 = call.args[0].options.readPreference.mode;
+    Collection.prototype.find.calls.all().forEach(call => {
+      if (call.object.s.namespace.collection.indexOf('MyObject0') >= 0) {
+        myObjectReadPreference0 = call.args[1].readPreference;
      }
-      if (call.args[0].ns.collection.indexOf('MyObject1') >= 0) {
-        myObjectReadPreference1 = call.args[0].options.readPreference.mode;
+      if (call.object.s.namespace.collection.indexOf('MyObject1') >= 0) {
+        myObjectReadPreference1 = call.args[1].readPreference;
      }
-      if (call.args[0].ns.collection.indexOf('MyObject2') >= 0) {
-        myObjectReadPreference2 = call.args[0].options.readPreference.mode;
+      if (call.object.s.namespace.collection.indexOf('MyObject2') >= 0) {
+        myObjectReadPreference2 = call.args[1].readPreference;
      }
    });

@@ -1163,8 +1107,6 @@ describe_only_db('mongo')('Read preference option', () => {
  });

  it('should change subqueries read preference when using matchesKeyInQuery and doesNotMatchKeyInQuery to find through API', async () => {
-    const databaseAdapter = Config.get(Parse.applicationId).database.adapter;
-
    const obj0 = new Parse.Object('MyObject0');
    obj0.set('boolKey', false);
    const obj1 = new Parse.Object('MyObject1');
@@ -1175,7 +1117,7 @@ describe_only_db('mongo')('Read preference option', () => {
    obj2.set('myObject1', obj1);

    await Parse.Object.saveAll([obj0, obj1, obj2]);
-    spyOn(databaseAdapter.database.serverConfig, 'cursor').and.callThrough();
+    spyOn(Collection.prototype, 'find').and.callThrough();
    await waitForReplication();

    const whereString = JSON.stringify({
@@ -1215,15 +1157,15 @@ describe_only_db('mongo')('Read preference option', () => {
    let myObjectReadPreference0 = null;
    let myObjectReadPreference1 = null;
    let myObjectReadPreference2 = null;
-    databaseAdapter.database.serverConfig.cursor.calls.all().forEach(call => {
-      if (call.args[0].ns.collection.indexOf('MyObject0') >= 0) {
-        myObjectReadPreference0 = call.args[0].options.readPreference.mode;
+    Collection.prototype.find.calls.all().forEach(call => {
+      if (call.object.s.namespace.collection.indexOf('MyObject0') >= 0) {
+        myObjectReadPreference0 = call.args[1].readPreference;
      }
-      if (call.args[0].ns.collection.indexOf('MyObject1') >= 0) {
-        myObjectReadPreference1 = call.args[0].options.readPreference.mode;
+      if (call.object.s.namespace.collection.indexOf('MyObject1') >= 0) {
+        myObjectReadPreference1 = call.args[1].readPreference;
      }
-      if (call.args[0].ns.collection.indexOf('MyObject2') >= 0) {
-        myObjectReadPreference2 = call.args[0].options.readPreference.mode;
+      if (call.object.s.namespace.collection.indexOf('MyObject2') >= 0) {
+        myObjectReadPreference2 = call.args[1].readPreference;
      }
    });

@@ -89,10 +89,54 @@ describe('batch', () => {
    expect(internalURL).toEqual('/classes/Object');
  });

-  it('should handle a batch request without transaction', async done => {
+  it('should return the proper url with no url provided', () => {
+    const originalURL = '/parse/batch';
+    const internalURL = batch.makeBatchRoutingPathFunction(
+      originalURL,
+      undefined,
+      publicServerURL
+    )('/parse/classes/Object');
+
+    expect(internalURL).toEqual('/classes/Object');
+  });
+
+  it('should return the proper url with no public url provided', () => {
+    const originalURL = '/parse/batch';
+    const internalURL = batch.makeBatchRoutingPathFunction(
+      originalURL,
+      serverURLNaked,
+      undefined
+    )('/parse/classes/Object');
+
+    expect(internalURL).toEqual('/classes/Object');
+  });
+
+  it('should return the proper url with bad url provided', () => {
+    const originalURL = '/parse/batch';
+    const internalURL = batch.makeBatchRoutingPathFunction(
+      originalURL,
+      'badurl.com',
+      publicServerURL
+    )('/parse/classes/Object');
+
+    expect(internalURL).toEqual('/classes/Object');
+  });
+
+  it('should return the proper url with bad public url provided', () => {
+    const originalURL = '/parse/batch';
+    const internalURL = batch.makeBatchRoutingPathFunction(
+      originalURL,
+      serverURLNaked,
+      'badurl.com'
+    )('/parse/classes/Object');
+
+    expect(internalURL).toEqual('/classes/Object');
+  });
+
+  it('should handle a batch request without transaction', async () => {
    spyOn(databaseAdapter, 'createObject').and.callThrough();

-    request({
+    const response = await request({
      method: 'POST',
      headers: headers,
      url: 'http://localhost:8378/1/batch',
@@ -110,28 +154,25 @@ describe('batch', () => {
          },
        ],
      }),
-    }).then(response => {
-      expect(response.data.length).toEqual(2);
-      expect(response.data[0].success.objectId).toBeDefined();
-      expect(response.data[0].success.createdAt).toBeDefined();
-      expect(response.data[1].success.objectId).toBeDefined();
-      expect(response.data[1].success.createdAt).toBeDefined();
-      const query = new Parse.Query('MyObject');
-      query.find().then(results => {
-        expect(databaseAdapter.createObject.calls.count()).toBe(2);
-        expect(databaseAdapter.createObject.calls.argsFor(0)[3]).toEqual(null);
-        expect(databaseAdapter.createObject.calls.argsFor(1)[3]).toEqual(null);
-        expect(results.map(result => result.get('key')).sort()).toEqual(['value1', 'value2']);
-        done();
-      });
    });
+
+    expect(response.data.length).toEqual(2);
+    expect(response.data[0].success.objectId).toBeDefined();
+    expect(response.data[0].success.createdAt).toBeDefined();
+    expect(response.data[1].success.objectId).toBeDefined();
+    expect(response.data[1].success.createdAt).toBeDefined();
+    const query = new Parse.Query('MyObject');
+    const results = await query.find();
+    expect(databaseAdapter.createObject.calls.count()).toBe(2);
+    expect(databaseAdapter.createObject.calls.argsFor(0)[3]).toEqual(null);
+    expect(databaseAdapter.createObject.calls.argsFor(1)[3]).toEqual(null);
+    expect(results.map(result => result.get('key')).sort()).toEqual(['value1', 'value2']);
  });

-  it('should handle a batch request with transaction = false', async done => {
-    await reconfigureServer();
+  it('should handle a batch request with transaction = false', async () => {
    spyOn(databaseAdapter, 'createObject').and.callThrough();

-    request({
+    const response = await request({
      method: 'POST',
      headers: headers,
      url: 'http://localhost:8378/1/batch',
@@ -150,21 +191,18 @@ describe('batch', () => {
        ],
        transaction: false,
      }),
-    }).then(response => {
-      expect(response.data.length).toEqual(2);
-      expect(response.data[0].success.objectId).toBeDefined();
-      expect(response.data[0].success.createdAt).toBeDefined();
-      expect(response.data[1].success.objectId).toBeDefined();
-      expect(response.data[1].success.createdAt).toBeDefined();
-      const query = new Parse.Query('MyObject');
-      query.find().then(results => {
-        expect(databaseAdapter.createObject.calls.count()).toBe(2);
-        expect(databaseAdapter.createObject.calls.argsFor(0)[3]).toEqual(null);
-        expect(databaseAdapter.createObject.calls.argsFor(1)[3]).toEqual(null);
-        expect(results.map(result => result.get('key')).sort()).toEqual(['value1', 'value2']);
-        done();
-      });
    });
+    expect(response.data.length).toEqual(2);
+    expect(response.data[0].success.objectId).toBeDefined();
+    expect(response.data[0].success.createdAt).toBeDefined();
+    expect(response.data[1].success.objectId).toBeDefined();
+    expect(response.data[1].success.createdAt).toBeDefined();
+    const query = new Parse.Query('MyObject');
+    const results = await query.find();
+    expect(databaseAdapter.createObject.calls.count()).toBe(2);
+    expect(databaseAdapter.createObject.calls.argsFor(0)[3]).toEqual(null);
+    expect(databaseAdapter.createObject.calls.argsFor(1)[3]).toEqual(null);
+    expect(results.map(result => result.get('key')).sort()).toEqual(['value1', 'value2']);
  });

  if (
@@ -191,58 +229,45 @@ describe('batch', () => {
        }
      });

-      it('should handle a batch request with transaction = true', async done => {
-        await reconfigureServer();
+      it('should handle a batch request with transaction = true', async () => {
        const myObject = new Parse.Object('MyObject'); // This is important because transaction only works on pre-existing collections
-        myObject
-          .save()
-          .then(() => {
-            return myObject.destroy();
-          })
-          .then(() => {
-            spyOn(databaseAdapter, 'createObject').and.callThrough();
-
-            request({
-              method: 'POST',
-              headers: headers,
-              url: 'http://localhost:8378/1/batch',
-              body: JSON.stringify({
-                requests: [
-                  {
-                    method: 'POST',
-                    path: '/1/classes/MyObject',
-                    body: { key: 'value1' },
-                  },
-                  {
-                    method: 'POST',
-                    path: '/1/classes/MyObject',
-                    body: { key: 'value2' },
-                  },
-                ],
-                transaction: true,
-              }),
-            }).then(response => {
-              expect(response.data.length).toEqual(2);
-              expect(response.data[0].success.objectId).toBeDefined();
-              expect(response.data[0].success.createdAt).toBeDefined();
-              expect(response.data[1].success.objectId).toBeDefined();
-              expect(response.data[1].success.createdAt).toBeDefined();
-              const query = new Parse.Query('MyObject');
-              query.find().then(results => {
-                expect(databaseAdapter.createObject.calls.count() % 2).toBe(0);
-                for (let i = 0; i + 1 < databaseAdapter.createObject.calls.length; i = i + 2) {
-                  expect(databaseAdapter.createObject.calls.argsFor(i)[3]).toBe(
-                    databaseAdapter.createObject.calls.argsFor(i + 1)[3]
-                  );
-                }
-                expect(results.map(result => result.get('key')).sort()).toEqual([
-                  'value1',
-                  'value2',
-                ]);
-                done();
-              });
-            });
-          });
+        await myObject.save();
+        await myObject.destroy();
+        spyOn(databaseAdapter, 'createObject').and.callThrough();
+        const response = await request({
+          method: 'POST',
+          headers: headers,
+          url: 'http://localhost:8378/1/batch',
+          body: JSON.stringify({
+            requests: [
+              {
+                method: 'POST',
+                path: '/1/classes/MyObject',
+                body: { key: 'value1' },
+              },
+              {
+                method: 'POST',
+                path: '/1/classes/MyObject',
+                body: { key: 'value2' },
+              },
+            ],
+            transaction: true,
+          }),
+        });
+        expect(response.data.length).toEqual(2);
+        expect(response.data[0].success.objectId).toBeDefined();
+        expect(response.data[0].success.createdAt).toBeDefined();
+        expect(response.data[1].success.objectId).toBeDefined();
+        expect(response.data[1].success.createdAt).toBeDefined();
+        const query = new Parse.Query('MyObject');
+        const results = await query.find();
+        expect(databaseAdapter.createObject.calls.count() % 2).toBe(0);
+        for (let i = 0; i + 1 < databaseAdapter.createObject.calls.length; i = i + 2) {
+          expect(databaseAdapter.createObject.calls.argsFor(i)[3]).toBe(
+            databaseAdapter.createObject.calls.argsFor(i + 1)[3]
+          );
+        }
+        expect(results.map(result => result.get('key')).sort()).toEqual(['value1', 'value2']);
      });

      it('should not save anything when one operation fails in a transaction', async () => {
@@ -350,6 +375,7 @@ describe('batch', () => {
              transaction: true,
            }),
          });
+          fail();
        } catch (error) {
          expect(error).toBeDefined();
          const query = new Parse.Query('MyObject');
@@ -1866,6 +1866,34 @@ describe('schemas', () => {
    });
  });

+  describe('Nested documents', () => {
+    beforeAll(async () => {
+      const testSchema = new Parse.Schema('test_7371');
+      testSchema.setCLP({
+        create: { ['*']: true },
+        update: { ['*']: true },
+        addField: {},
+      });
+      testSchema.addObject('a');
+      await testSchema.save();
+    });
+
+    it('addField permission not required for adding a nested property', async () => {
+      const obj = new Parse.Object('test_7371');
+      obj.set('a', {});
+      await obj.save();
+      obj.set('a.b', 2);
+      await obj.save();
+    });
+    it('addField permission not required for modifying a nested property', async () => {
+      const obj = new Parse.Object('test_7371');
+      obj.set('a', { b: 1 });
+      await obj.save();
+      obj.set('a.b', 2);
+      await obj.save();
+    });
+  });
+
  it('should aceept class-level permission with userid of any length', async done => {
    await global.reconfigureServer({
      customIdSize: 11,
@@ -280,4 +280,18 @@ describe('Vulnerabilities', () => {
      expect(text.error).toBe('Prohibited keyword in request data: {"value":"aValue[123]*"}.');
    });
  });
+
+  describe('Ignore non-matches', () => {
+    it('ignores write request that contains only fraction of denied keyword', async () => {
+      await reconfigureServer({
+        requestKeywordDenylist: [{ key: 'abc' }],
+      });
+      // Initially saving an object executes the keyword detection in RestWrite.js
+      const obj = new TestObject({ a: { b: { c: 0 } } });
+      await expectAsync(obj.save()).toBeResolved();
+      // Modifying a nested key executes the keyword detection in DatabaseController.js
+      obj.increment('a.b.c');
+      await expectAsync(obj.save()).toBeResolved();
+    });
+  });
 });
@@ -14,20 +14,23 @@ const authData = {
 const { Parse } = require('parse/node');
 const crypto = require('crypto');
 const https = require('https');
-const url = require('url');

 const cache = {}; // (publicKey -> cert) cache

 function verifyPublicKeyUrl(publicKeyUrl) {
-  const parsedUrl = url.parse(publicKeyUrl);
-  if (parsedUrl.protocol !== 'https:') {
+  try {
+    const parsedUrl = new URL(publicKeyUrl);
+    if (parsedUrl.protocol !== 'https:') {
+      return false;
+    }
+    const hostnameParts = parsedUrl.hostname.split('.');
+    const length = hostnameParts.length;
+    const domainParts = hostnameParts.slice(length - 2, length);
+    const domain = domainParts.join('.');
+    return domain === 'apple.com';
+  } catch (error) {
    return false;
  }
-  const hostnameParts = parsedUrl.hostname.split('.');
-  const length = hostnameParts.length;
-  const domainParts = hostnameParts.slice(length - 2, length);
-  const domain = domainParts.join('.');
-  return domain === 'apple.com';
 }

 function convertX509CertToPEM(X509Cert) {
@@ -54,7 +54,6 @@
 */

 const Parse = require('parse/node').Parse;
-const url = require('url');
 const querystring = require('querystring');
 const httpsRequest = require('./httpsRequest');

@@ -112,7 +111,7 @@ function requestTokenInfo(options, access_token) {
  if (!options || !options.tokenIntrospectionEndpointUrl) {
    throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, MISSING_URL);
  }
-  const parsedUrl = url.parse(options.tokenIntrospectionEndpointUrl);
+  const parsedUrl = new URL(options.tokenIntrospectionEndpointUrl);
  const postData = querystring.stringify({
    token: access_token,
  });
@@ -1,6 +1,6 @@
 /**
 GridFSBucketAdapter
- Stores files in Mongo using GridStore
+ Stores files in Mongo using GridFS
 Requires the database adapter to be based on mongoclient

 @flow weak
@@ -1,181 +1,4 @@
-/**
- GridStoreAdapter
- Stores files in Mongo using GridStore
- Requires the database adapter to be based on mongoclient
- (GridStore is deprecated, Please use GridFSBucket instead)
-
- @flow weak
- */
-
-// @flow-disable-next
-import { MongoClient, GridStore, Db } from 'mongodb';
-import { FilesAdapter, validateFilename } from './FilesAdapter';
-import defaults from '../../defaults';
-
-export class GridStoreAdapter extends FilesAdapter {
-  _databaseURI: string;
-  _connectionPromise: Promise<Db>;
-  _mongoOptions: Object;
-
-  constructor(mongoDatabaseURI = defaults.DefaultMongoURI, mongoOptions = {}) {
-    super();
-    this._databaseURI = mongoDatabaseURI;
-
-    const defaultMongoOptions = {
-      useNewUrlParser: true,
-      useUnifiedTopology: true,
-    };
-    this._mongoOptions = Object.assign(defaultMongoOptions, mongoOptions);
-  }
-
-  _connect() {
-    if (!this._connectionPromise) {
-      this._connectionPromise = MongoClient.connect(this._databaseURI, this._mongoOptions).then(
-        client => {
-          this._client = client;
-          return client.db(client.s.options.dbName);
-        }
-      );
-    }
-    return this._connectionPromise;
-  }
-
-  // For a given config object, filename, and data, store a file
-  // Returns a promise
-  createFile(filename: string, data) {
-    return this._connect()
-      .then(database => {
-        const gridStore = new GridStore(database, filename, 'w');
-        return gridStore.open();
-      })
-      .then(gridStore => {
-        return gridStore.write(data);
-      })
-      .then(gridStore => {
-        return gridStore.close();
-      });
-  }
-
-  deleteFile(filename: string) {
-    return this._connect()
-      .then(database => {
-        const gridStore = new GridStore(database, filename, 'r');
-        return gridStore.open();
-      })
-      .then(gridStore => {
-        return gridStore.unlink();
-      })
-      .then(gridStore => {
-        return gridStore.close();
-      });
-  }
-
-  getFileData(filename: string) {
-    return this._connect()
-      .then(database => {
-        return GridStore.exist(database, filename).then(() => {
-          const gridStore = new GridStore(database, filename, 'r');
-          return gridStore.open();
-        });
-      })
-      .then(gridStore => {
-        return gridStore.read();
-      });
-  }
-
-  getFileLocation(config, filename) {
-    return config.mount + '/files/' + config.applicationId + '/' + encodeURIComponent(filename);
-  }
-
-  async handleFileStream(filename: string, req, res, contentType) {
-    const stream = await this._connect().then(database => {
-      return GridStore.exist(database, filename).then(() => {
-        const gridStore = new GridStore(database, filename, 'r');
-        return gridStore.open();
-      });
-    });
-    handleRangeRequest(stream, req, res, contentType);
-  }
-
-  handleShutdown() {
-    if (!this._client) {
-      return Promise.resolve();
-    }
-    return this._client.close(false);
-  }
-
-  validateFilename(filename) {
-    return validateFilename(filename);
-  }
-}
-
-// handleRangeRequest is licensed under Creative Commons Attribution 4.0 International License (https://creativecommons.org/licenses/by/4.0/).
-// Author: LEROIB at weightingformypizza (https://weightingformypizza.wordpress.com/2015/06/24/stream-html5-media-content-like-video-audio-from-mongodb-using-express-and-gridstore/).
-function handleRangeRequest(stream, req, res, contentType) {
-  const buffer_size = 1024 * 1024; //1024Kb
-  // Range request, partial stream the file
-  const parts = req
-    .get('Range')
-    .replace(/bytes=/, '')
-    .split('-');
-  let [start, end] = parts;
-  const notEnded = !end && end !== 0;
-  const notStarted = !start && start !== 0;
-  // No end provided, we want all bytes
-  if (notEnded) {
-    end = stream.length - 1;
-  }
-  // No start provided, we're reading backwards
-  if (notStarted) {
-    start = stream.length - end;
-    end = start + end - 1;
-  }
-
-  // Data exceeds the buffer_size, cap
-  if (end - start >= buffer_size) {
-    end = start + buffer_size - 1;
-  }
-
-  const contentLength = end - start + 1;
-
-  res.writeHead(206, {
-    'Content-Range': 'bytes ' + start + '-' + end + '/' + stream.length,
-    'Accept-Ranges': 'bytes',
-    'Content-Length': contentLength,
-    'Content-Type': contentType,
-  });
-
-  stream.seek(start, function () {
-    // Get gridFile stream
-    const gridFileStream = stream.stream(true);
-    let bufferAvail = 0;
-    let remainingBytesToWrite = contentLength;
-    let totalBytesWritten = 0;
-    // Write to response
-    gridFileStream.on('data', function (data) {
-      bufferAvail += data.length;
-      if (bufferAvail > 0) {
-        // slice returns the same buffer if overflowing
-        // safe to call in any case
-        const buffer = data.slice(0, remainingBytesToWrite);
-        // Write the buffer
-        res.write(buffer);
-        // Increment total
-        totalBytesWritten += buffer.length;
-        // Decrement remaining
-        remainingBytesToWrite -= data.length;
-        // Decrement the available buffer
-        bufferAvail -= buffer.length;
-      }
-      // In case of small slices, all values will be good at that point
-      // we've written enough, end...
-      if (totalBytesWritten >= contentLength) {
-        stream.close();
-        res.end();
-        this.destroy();
-      }
-    });
-  });
-}
-
-export default GridStoreAdapter;
+// Note: GridStore was replaced by GridFSBucketAdapter by default in 2018 by @flovilmart
+throw new Error(
+  'GridStoreAdapter: GridStore is no longer supported by parse server and mongodb, use GridFSBucketAdapter instead.'
+);
@@ -177,7 +177,7 @@ class MongoSchemaCollection {
  insertSchema(schema: any) {
    return this._collection
      .insertOne(schema)
-      .then(result => mongoSchemaToParseSchema(result.ops[0]))
+      .then(() => mongoSchemaToParseSchema(schema))
      .catch(error => {
        if (error.code === 11000) {
          //Mongo's duplicate key error
@@ -479,6 +479,7 @@ export class MongoStorageAdapter implements StorageAdapter {
    const mongoObject = parseObjectToMongoObjectForCreate(className, object, schema);
    return this._adaptiveCollection(className)
      .then(collection => collection.insertOne(mongoObject, transactionalSession))
+      .then(() => ({ ops: [mongoObject] }))
      .catch(error => {
        if (error.code === 11000) {
          // Duplicate value
@@ -517,8 +518,8 @@ export class MongoStorageAdapter implements StorageAdapter {
      })
      .catch(err => this.handleError(err))
      .then(
-        ({ result }) => {
-          if (result.n === 0) {
+        ({ deletedCount }) => {
+          if (deletedCount === 0) {
            throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'Object not found.');
          }
          return Promise.resolve();
@@ -2,6 +2,7 @@ import log from '../../../logger';
 import _ from 'lodash';
 var mongodb = require('mongodb');
 var Parse = require('parse/node').Parse;
+const Utils = require('../../../Utils');

 const transformKey = (className, fieldName, schema) => {
  // Check if the schema is known since it's a built-in field.
@@ -634,133 +635,6 @@ function transformTopLevelAtom(atom, field) {
  }
 }

-function relativeTimeToDate(text, now = new Date()) {
-  text = text.toLowerCase();
-
-  let parts = text.split(' ');
-
-  // Filter out whitespace
-  parts = parts.filter(part => part !== '');
-
-  const future = parts[0] === 'in';
-  const past = parts[parts.length - 1] === 'ago';
-
-  if (!future && !past && text !== 'now') {
-    return {
-      status: 'error',
-      info: "Time should either start with 'in' or end with 'ago'",
-    };
-  }
-
-  if (future && past) {
-    return {
-      status: 'error',
-      info: "Time cannot have both 'in' and 'ago'",
-    };
-  }
-
-  // strip the 'ago' or 'in'
-  if (future) {
-    parts = parts.slice(1);
-  } else {
-    // past
-    parts = parts.slice(0, parts.length - 1);
-  }
-
-  if (parts.length % 2 !== 0 && text !== 'now') {
-    return {
-      status: 'error',
-      info: 'Invalid time string. Dangling unit or number.',
-    };
-  }
-
-  const pairs = [];
-  while (parts.length) {
-    pairs.push([parts.shift(), parts.shift()]);
-  }
-
-  let seconds = 0;
-  for (const [num, interval] of pairs) {
-    const val = Number(num);
-    if (!Number.isInteger(val)) {
-      return {
-        status: 'error',
-        info: `'${num}' is not an integer.`,
-      };
-    }
-
-    switch (interval) {
-      case 'yr':
-      case 'yrs':
-      case 'year':
-      case 'years':
-        seconds += val * 31536000; // 365 * 24 * 60 * 60
-        break;
-
-      case 'wk':
-      case 'wks':
-      case 'week':
-      case 'weeks':
-        seconds += val * 604800; // 7 * 24 * 60 * 60
-        break;
-
-      case 'd':
-      case 'day':
-      case 'days':
-        seconds += val * 86400; // 24 * 60 * 60
-        break;
-
-      case 'hr':
-      case 'hrs':
-      case 'hour':
-      case 'hours':
-        seconds += val * 3600; // 60 * 60
-        break;
-
-      case 'min':
-      case 'mins':
-      case 'minute':
-      case 'minutes':
-        seconds += val * 60;
-        break;
-
-      case 'sec':
-      case 'secs':
-      case 'second':
-      case 'seconds':
-        seconds += val;
-        break;
-
-      default:
-        return {
-          status: 'error',
-          info: `Invalid interval: '${interval}'`,
-        };
-    }
-  }
-
-  const milliseconds = seconds * 1000;
-  if (future) {
-    return {
-      status: 'success',
-      info: 'future',
-      result: new Date(now.valueOf() + milliseconds),
-    };
-  } else if (past) {
-    return {
-      status: 'success',
-      info: 'past',
-      result: new Date(now.valueOf() - milliseconds),
-    };
-  } else {
-    return {
-      status: 'success',
-      info: 'present',
-      result: new Date(now.valueOf()),
-    };
-  }
-}
-
 // Transforms a query constraint from REST API format to Mongo format.
 // A constraint is something with fields like $lt.
 // If it is not a valid constraint but it could be a valid something
@@ -813,7 +687,7 @@ function transformConstraint(constraint, field, count = false) {
              );
          }

-          const parserResult = relativeTimeToDate(val.$relativeTime);
+          const parserResult = Utils.relativeTimeToDate(val.$relativeTime);
          if (parserResult.status === 'success') {
            answer[key] = parserResult.result;
            break;
@@ -1556,7 +1430,6 @@ module.exports = {
  transformUpdate,
  transformWhere,
  mongoObjectToParseObject,
-  relativeTimeToDate,
  transformConstraint,
  transformPointerString,
 };
@@ -1,18 +1,16 @@
-const url = require('url');
 const fs = require('fs');
 function getDatabaseOptionsFromURI(uri) {
  const databaseOptions = {};

-  const parsedURI = url.parse(uri);
-  const queryParams = parseQueryParams(parsedURI.query);
-  const authParts = parsedURI.auth ? parsedURI.auth.split(':') : [];
+  const parsedURI = new URL(uri);
+  const queryParams = parseQueryParams(parsedURI.searchParams.toString());

  databaseOptions.host = parsedURI.hostname || 'localhost';
  databaseOptions.port = parsedURI.port ? parseInt(parsedURI.port) : 5432;
  databaseOptions.database = parsedURI.pathname ? parsedURI.pathname.substr(1) : undefined;

-  databaseOptions.user = authParts.length > 0 ? authParts[0] : '';
-  databaseOptions.password = authParts.length > 1 ? authParts[1] : '';
+  databaseOptions.user = parsedURI.username;
+  databaseOptions.password = parsedURI.password;

  if (queryParams.ssl && queryParams.ssl.toLowerCase() === 'true') {
    databaseOptions.ssl = true;
@@ -7,12 +7,14 @@ import _ from 'lodash';
 // @flow-disable-next
 import { v4 as uuidv4 } from 'uuid';
 import sql from './sql';
+import { StorageAdapter } from '../StorageAdapter';
+import type { SchemaType, QueryType, QueryOptions } from '../StorageAdapter';
+const Utils = require('../../../Utils');

 const PostgresRelationDoesNotExistError = '42P01';
 const PostgresDuplicateRelationError = '42P07';
 const PostgresDuplicateColumnError = '42701';
 const PostgresMissingColumnError = '42703';
-const PostgresDuplicateObjectError = '42710';
 const PostgresUniqueIndexViolationError = '23505';
 const logger = require('../../../logger');

@@ -22,9 +24,6 @@ const debug = function (...args: any) {
  log.debug.apply(log, args);
 };

-import { StorageAdapter } from '../StorageAdapter';
-import type { SchemaType, QueryType, QueryOptions } from '../StorageAdapter';
-
 const parseTypeToPostgresType = type => {
  switch (type.type) {
    case 'String':
@@ -374,6 +373,11 @@ const buildWhereClause = ({ schema, query, index, caseInsensitive }): WhereClaus
              patterns.push(
                `(${constraintFieldName} <> $${index} OR ${constraintFieldName} IS NULL)`
              );
+            } else if (typeof fieldValue.$ne === 'object' && fieldValue.$ne.$relativeTime) {
+              throw new Parse.Error(
+                Parse.Error.INVALID_JSON,
+                '$relativeTime can only be used with the $lt, $lte, $gt, and $gte operators'
+              );
            } else {
              patterns.push(`($${index}:name <> $${index + 1} OR $${index}:name IS NULL)`);
            }
@@ -399,6 +403,11 @@ const buildWhereClause = ({ schema, query, index, caseInsensitive }): WhereClaus
        if (fieldName.indexOf('.') >= 0) {
          values.push(fieldValue.$eq);
          patterns.push(`${transformDotField(fieldName)} = $${index++}`);
+        } else if (typeof fieldValue.$eq === 'object' && fieldValue.$eq.$relativeTime) {
+          throw new Parse.Error(
+            Parse.Error.INVALID_JSON,
+            '$relativeTime can only be used with the $lt, $lte, $gt, and $gte operators'
+          );
        } else {
          values.push(fieldName, fieldValue.$eq);
          patterns.push(`$${index}:name = $${index + 1}`);
@@ -513,7 +522,12 @@ const buildWhereClause = ({ schema, query, index, caseInsensitive }): WhereClaus
    }

    if (typeof fieldValue.$exists !== 'undefined') {
-      if (fieldValue.$exists) {
+      if (typeof fieldValue.$exists === 'object' && fieldValue.$exists.$relativeTime) {
+        throw new Parse.Error(
+          Parse.Error.INVALID_JSON,
+          '$relativeTime can only be used with the $lt, $lte, $gt, and $gte operators'
+        );
+      } else if (fieldValue.$exists) {
        patterns.push(`$${index}:name IS NOT NULL`);
      } else {
        patterns.push(`$${index}:name IS NULL`);
@@ -757,7 +771,7 @@ const buildWhereClause = ({ schema, query, index, caseInsensitive }): WhereClaus
    Object.keys(ParseToPosgresComparator).forEach(cmp => {
      if (fieldValue[cmp] || fieldValue[cmp] === 0) {
        const pgComparator = ParseToPosgresComparator[cmp];
-        const postgresValue = toPostgresValue(fieldValue[cmp]);
+        let postgresValue = toPostgresValue(fieldValue[cmp]);
        let constraintFieldName;
        if (fieldName.indexOf('.') >= 0) {
          let castType;
@@ -775,6 +789,24 @@ const buildWhereClause = ({ schema, query, index, caseInsensitive }): WhereClaus
            ? `CAST ((${transformDotField(fieldName)}) AS ${castType})`
            : transformDotField(fieldName);
        } else {
+          if (typeof postgresValue === 'object' && postgresValue.$relativeTime) {
+            if (schema.fields[fieldName].type !== 'Date') {
+              throw new Parse.Error(
+                Parse.Error.INVALID_JSON,
+                '$relativeTime can only be used with Date field'
+              );
+            }
+            const parserResult = Utils.relativeTimeToDate(postgresValue.$relativeTime);
+            if (parserResult.status === 'success') {
+              postgresValue = toPostgresValue(parserResult.result);
+            } else {
+              console.error('Error while parsing relative date', parserResult);
+              throw new Parse.Error(
+                Parse.Error.INVALID_JSON,
+                `bad $relativeTime (${postgresValue.$relativeTime}) value. ${parserResult.info}`
+              );
+            }
+          }
          constraintFieldName = `$${index++}:name`;
          values.push(fieldName);
        }
@@ -873,15 +905,7 @@ export class PostgresStorageAdapter implements StorageAdapter {
        'CREATE TABLE IF NOT EXISTS "_SCHEMA" ( "className" varChar(120), "schema" jsonb, "isParseClass" bool, PRIMARY KEY ("className") )'
      )
      .catch(error => {
-        if (
-          error.code === PostgresDuplicateRelationError ||
-          error.code === PostgresUniqueIndexViolationError ||
-          error.code === PostgresDuplicateObjectError
-        ) {
-          // Table already exists, must have been created by a different request. Ignore error.
-        } else {
-          throw error;
-        }
+        throw error;
      });
  }

@@ -2416,6 +2440,11 @@ export class PostgresStorageAdapter implements StorageAdapter {
      ? fieldNames.map((fieldName, index) => `lower($${index + 3}:name) varchar_pattern_ops`)
      : fieldNames.map((fieldName, index) => `$${index + 3}:name`);
    const qs = `CREATE INDEX IF NOT EXISTS $1:name ON $2:name (${constraintPatterns.join()})`;
+    const setIdempotencyFunction =
+      options.setIdempotencyFunction !== undefined ? options.setIdempotencyFunction : false;
+    if (setIdempotencyFunction) {
+      await this.ensureIdempotencyFunctionExists(options);
+    }
    await conn.none(qs, [indexNameOptions.name, className, ...fieldNames]).catch(error => {
      if (
        error.code === PostgresDuplicateRelationError &&
@@ -2436,6 +2465,24 @@ export class PostgresStorageAdapter implements StorageAdapter {
      }
    });
  }
+
+  async deleteIdempotencyFunction(options?: Object = {}): Promise<any> {
+    const conn = options.conn !== undefined ? options.conn : this._client;
+    const qs = 'DROP FUNCTION IF EXISTS idempotency_delete_expired_records()';
+    return conn.none(qs).catch(error => {
+      throw error;
+    });
+  }
+
+  async ensureIdempotencyFunctionExists(options?: Object = {}): Promise<any> {
+    const conn = options.conn !== undefined ? options.conn : this._client;
+    const ttlOptions = options.ttl !== undefined ? `${options.ttl} seconds` : '60 seconds';
+    const qs =
+      'CREATE OR REPLACE FUNCTION idempotency_delete_expired_records() RETURNS void LANGUAGE plpgsql AS $$ BEGIN DELETE FROM "_Idempotency" WHERE expire < NOW() - INTERVAL $1; END; $$;';
+    return conn.none(qs, [ttlOptions]).catch(error => {
+      throw error;
+    });
+  }
 }

 function convertPolygonToSQL(polygon) {
@@ -11,9 +11,11 @@ import intersect from 'intersect';
 // @flow-disable-next
 import deepcopy from 'deepcopy';
 import logger from '../logger';
+import Utils from '../Utils';
 import * as SchemaController from './SchemaController';
 import { StorageAdapter } from '../Adapters/Storage/StorageAdapter';
 import MongoStorageAdapter from '../Adapters/Storage/Mongo/MongoStorageAdapter';
+import PostgresStorageAdapter from '../Adapters/Storage/Postgres/PostgresStorageAdapter';
 import SchemaCache from '../Adapters/Cache/SchemaCache';
 import type { LoadSchemaOptions } from './types';
 import type { ParseServerOptions } from '../Options';
@@ -364,12 +366,14 @@ class DatabaseController {
  schemaPromise: ?Promise<SchemaController.SchemaController>;
  _transactionalSession: ?any;
  options: ParseServerOptions;
+  idempotencyOptions: any;

  constructor(adapter: StorageAdapter, options: ParseServerOptions) {
    this.adapter = adapter;
-    // We don't want a mutable this.schema, because then you could have
-    // one request that uses different schemas for different parts of
-    // it. Instead, use loadSchema to get a schema.
+    this.options = options || {};
+    this.idempotencyOptions = this.options.idempotencyOptions || {};
+    // Prevent mutable this.schema, otherwise one request could use
+    // multiple schemas, so instead use loadSchema to get a schema.
    this.schemaPromise = null;
    this._transactionalSession = null;
    this.options = options;
@@ -862,7 +866,7 @@ class DatabaseController {
      if (object[field] && object[field].__op && object[field].__op === 'Delete') {
        return false;
      }
-      return schemaFields.indexOf(field) < 0;
+      return schemaFields.indexOf(getRootFieldName(field)) < 0;
    });
    if (newKeys.length > 0) {
      // adds a marker that new field is being adding during update
@@ -940,9 +944,9 @@ class DatabaseController {
      });
    }
    if (query['$and']) {
-      const ors = query['$and'];
+      const ands = query['$and'];
      return Promise.all(
-        ors.map((aQuery, index) => {
+        ands.map((aQuery, index) => {
          return this.reduceInRelation(className, aQuery, schema).then(aQuery => {
            query['$and'][index] = aQuery;
          });
@@ -1681,9 +1685,7 @@ class DatabaseController {
    };
    await this.loadSchema().then(schema => schema.enforceClassExists('_User'));
    await this.loadSchema().then(schema => schema.enforceClassExists('_Role'));
-    if (this.adapter instanceof MongoStorageAdapter) {
-      await this.loadSchema().then(schema => schema.enforceClassExists('_Idempotency'));
-    }
+    await this.loadSchema().then(schema => schema.enforceClassExists('_Idempotency'));

    await this.adapter.ensureUniqueness('_User', requiredUserFields, ['username']).catch(error => {
      logger.warn('Unable to ensure uniqueness for usernames: ', error);
@@ -1719,18 +1721,28 @@ class DatabaseController {
      logger.warn('Unable to ensure uniqueness for role name: ', error);
      throw error;
    });
-    if (this.adapter instanceof MongoStorageAdapter) {
-      await this.adapter
-        .ensureUniqueness('_Idempotency', requiredIdempotencyFields, ['reqId'])
-        .catch(error => {
-          logger.warn('Unable to ensure uniqueness for idempotency request ID: ', error);
-          throw error;
-        });

-      await this.adapter
-        .ensureIndex('_Idempotency', requiredIdempotencyFields, ['expire'], 'ttl', false, {
+    await this.adapter
+      .ensureUniqueness('_Idempotency', requiredIdempotencyFields, ['reqId'])
+      .catch(error => {
+        logger.warn('Unable to ensure uniqueness for idempotency request ID: ', error);
+        throw error;
+      });
+
+    const isMongoAdapter = this.adapter instanceof MongoStorageAdapter;
+    const isPostgresAdapter = this.adapter instanceof PostgresStorageAdapter;
+    if (isMongoAdapter || isPostgresAdapter) {
+      let options = {};
+      if (isMongoAdapter) {
+        options = {
          ttl: 0,
-        })
+        };
+      } else if (isPostgresAdapter) {
+        options = this.idempotencyOptions;
+        options.setIdempotencyFunction = true;
+      }
+      await this.adapter
+        .ensureIndex('_Idempotency', requiredIdempotencyFields, ['expire'], 'ttl', false, options)
        .catch(error => {
          logger.warn('Unable to create TTL index for idempotency expire date: ', error);
          throw error;
@@ -1752,8 +1764,8 @@ class DatabaseController {
    if (this.options && this.options.requestKeywordDenylist) {
      // Scan request data for denied keywords
      for (const keyword of this.options.requestKeywordDenylist) {
-        const isMatch = (a, b) => (typeof a === 'string' && new RegExp(a).test(b)) || a === b;
-        if (isMatch(firstKey, keyword.key)) {
+        const match = Utils.objectContainsKeyValue({ firstKey: undefined }, keyword.key, undefined);
+        if (match) {
          throw new Parse.Error(
            Parse.Error.INVALID_KEY_NAME,
            `Prohibited keyword in request data: ${JSON.stringify(keyword)}.`
@@ -1,7 +1,6 @@
 import { Parse } from 'parse/node';
 import AdaptableController from './AdaptableController';
 import { LoggerAdapter } from '../Adapters/Logger/LoggerAdapter';
-import url from 'url';

 const MILLISECONDS_IN_A_DAY = 24 * 60 * 60 * 1000;
 const LOG_STRING_TRUNCATE_LENGTH = 1000;
@@ -38,15 +37,16 @@ export class LoggerController extends AdaptableController {
    });
  }

-  maskSensitiveUrl(urlString) {
-    const urlObj = url.parse(urlString, true);
-    const query = urlObj.query;
+  maskSensitiveUrl(path) {
+    const urlString = 'http://localhost' + path; // prepend dummy string to make a real URL
+    const urlObj = new URL(urlString);
+    const query = urlObj.searchParams;
    let sanitizedQuery = '?';

-    for (const key in query) {
+    for (const [key, value] of query) {
      if (key !== 'password') {
        // normal value
-        sanitizedQuery += key + '=' + query[key] + '&';
+        sanitizedQuery += key + '=' + value + '&';
      } else {
        // password value, redact it
        sanitizedQuery += key + '=' + '********' + '&';
@@ -2,7 +2,6 @@ import authDataManager from '../Adapters/Auth';
 import { ParseServerOptions } from '../Options';
 import { loadAdapter } from '../Adapters/AdapterLoader';
 import defaults from '../defaults';
-import url from 'url';
 // Controllers
 import { LoggerController } from './LoggerController';
 import { FilesController } from './FilesController';
@@ -220,13 +219,14 @@ export function getAuthDataManager(options: ParseServerOptions) {
 export function getDatabaseAdapter(databaseURI, collectionPrefix, databaseOptions) {
  let protocol;
  try {
-    const parsedURI = url.parse(databaseURI);
+    const parsedURI = new URL(databaseURI);
    protocol = parsedURI.protocol ? parsedURI.protocol.toLowerCase() : null;
  } catch (e) {
    /* */
  }
  switch (protocol) {
    case 'postgres:':
+    case 'postgresql:':
      return new PostgresStorageAdapter({
        uri: databaseURI,
        collectionPrefix,
@@ -10,7 +10,7 @@ import { ParsePubSub } from './ParsePubSub';
 import SchemaController from '../Controllers/SchemaController';
 import _ from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
-import { runLiveQueryEventHandlers, getTrigger, runTrigger, toJSONwithObjects } from '../triggers';
+import { runLiveQueryEventHandlers, getTrigger, runTrigger, resolveError, toJSONwithObjects } from '../triggers';
 import { getAuthForSessionToken, Auth } from '../Auth';
 import { getCacheController } from '../Controllers';
 import LRU from 'lru-cache';
@@ -194,14 +194,9 @@ class ParseLiveQueryServer {
              delete deletedParseObject.authData;
            }
            client.pushDelete(requestId, deletedParseObject);
-          } catch (error) {
-            Client.pushError(
-              client.parseWebSocket,
-              error.code || Parse.Error.SCRIPT_FAILED,
-              error.message || error,
-              false,
-              requestId
-            );
+          } catch (e) {
+            const error = resolveError(e);
+            Client.pushError(client.parseWebSocket, error.code, error.message, false, requestId);
            logger.error(
              `Failed running afterLiveQueryEvent on class ${className} for event ${res.event} with session ${res.sessionToken} with:\n Error: ` +
                JSON.stringify(error)
@@ -358,14 +353,9 @@ class ParseLiveQueryServer {
            if (client[functionName]) {
              client[functionName](requestId, currentParseObject, originalParseObject);
            }
-          } catch (error) {
-            Client.pushError(
-              client.parseWebSocket,
-              error.code || Parse.Error.SCRIPT_FAILED,
-              error.message || error,
-              false,
-              requestId
-            );
+          } catch (e) {
+            const error = resolveError(e);
+            Client.pushError(client.parseWebSocket, error.code, error.message, false, requestId);
            logger.error(
              `Failed running afterLiveQueryEvent on class ${className} for event ${res.event} with session ${res.sessionToken} with:\n Error: ` +
                JSON.stringify(error)
@@ -681,13 +671,9 @@ class ParseLiveQueryServer {
      logger.info(`Create new client: ${parseWebsocket.clientId}`);
      client.pushConnect();
      runLiveQueryEventHandlers(req);
-    } catch (error) {
-      Client.pushError(
-        parseWebsocket,
-        error.code || Parse.Error.SCRIPT_FAILED,
-        error.message || error,
-        false
-      );
+    } catch (e) {
+      const error = resolveError(e);
+      Client.pushError(parseWebsocket, error.code, error.message, false);
      logger.error(
        `Failed running beforeConnect for session ${request.sessionToken} with:\n Error: ` +
          JSON.stringify(error)
@@ -827,16 +813,11 @@ class ParseLiveQueryServer {
        installationId: client.installationId,
      });
    } catch (e) {
-      Client.pushError(
-        parseWebsocket,
-        e.code || Parse.Error.SCRIPT_FAILED,
-        e.message || e,
-        false,
-        request.requestId
-      );
+      const error = resolveError(e);
+      Client.pushError(parseWebsocket, error.code, error.message, false, request.requestId);
      logger.error(
        `Failed running beforeSubscribe on ${className} for session ${request.sessionToken} with:\n Error: ` +
-          JSON.stringify(e)
+          JSON.stringify(error)
      );
    }
  }
@@ -1,7 +1,6 @@
 const Config = require('./Config');
 const Auth = require('./Auth');
 const RESTController = require('parse/lib/node/RESTController');
-const URL = require('url');
 const Parse = require('parse/node');

 function getSessionToken(options) {
@@ -38,9 +37,9 @@ function ParseServerRESTController(applicationId, router) {
    if (!config) {
      config = Config.get(applicationId);
    }
-    const serverURL = URL.parse(config.serverURL);
-    if (path.indexOf(serverURL.path) === 0) {
-      path = path.slice(serverURL.path.length, path.length);
+    const serverURL = new URL(config.serverURL);
+    if (path.indexOf(serverURL.pathname) === 0) {
+      path = path.slice(serverURL.pathname.length, path.length);
    }

    if (path[0] !== '/') {
@@ -95,6 +95,7 @@ function RestWrite(config, auth, className, query, data, originalData, clientSDK
  // Shared SchemaController to be reused to reduce the number of loadSchema() calls per request
  // Once set the schemaData should be immutable
  this.validSchemaController = null;
+  this.pendingOps = {};
 }

 // A convenient method to perform all the steps of processing the
@@ -225,18 +226,11 @@ RestWrite.prototype.runBeforeSaveTrigger = function () {
    return Promise.resolve();
  }

-  // Cloud code gets a bit of extra data for its objects
-  var extraData = { className: this.className };
-  if (this.query && this.query.objectId) {
-    extraData.objectId = this.query.objectId;
-  }
+  const { originalObject, updatedObject } = this.buildParseObjects();

-  let originalObject = null;
-  const updatedObject = this.buildUpdatedObject(extraData);
-  if (this.query && this.query.objectId) {
-    // This is an update for existing object.
-    originalObject = triggers.inflate(extraData, this.originalData);
-  }
+  const stateController = Parse.CoreManager.getObjectStateController();
+  const [pending] = stateController.getPendingOps(updatedObject._getStateIdentifier());
+  this.pendingOps = { ...pending };

  return Promise.resolve()
    .then(() => {
@@ -1531,20 +1525,7 @@ RestWrite.prototype.runAfterSaveTrigger = function () {
    return Promise.resolve();
  }

-  var extraData = { className: this.className };
-  if (this.query && this.query.objectId) {
-    extraData.objectId = this.query.objectId;
-  }
-
-  // Build the original object, we only do this for a update write.
-  let originalObject;
-  if (this.query && this.query.objectId) {
-    originalObject = triggers.inflate(extraData, this.originalData);
-  }
-
-  // Build the inflated object, different from beforeSave, originalData is not empty
-  // since developers can change data in the beforeSave.
-  const updatedObject = this.buildUpdatedObject(extraData);
+  const { originalObject, updatedObject } = this.buildParseObjects();
  updatedObject._handleSaveResponse(this.response.response, this.response.status || 200);

  this.config.database.loadSchema().then(schemaController => {
@@ -1569,8 +1550,15 @@ RestWrite.prototype.runAfterSaveTrigger = function () {
      this.context
    )
    .then(result => {
-      if (result && typeof result === 'object') {
+      const jsonReturned = result && !result._toFullJSON;
+      if (jsonReturned) {
+        this.pendingOps = {};
        this.response.response = result;
+      } else {
+        this.response.response = this._updateResponseWithData(
+          (result || updatedObject)._toFullJSON(),
+          this.data
+        );
      }
    })
    .catch(function (err) {
@@ -1604,7 +1592,13 @@ RestWrite.prototype.sanitizedData = function () {
 };

 // Returns an updated copy of the object
-RestWrite.prototype.buildUpdatedObject = function (extraData) {
+RestWrite.prototype.buildParseObjects = function () {
+  const extraData = { className: this.className, objectId: this.query?.objectId };
+  let originalObject;
+  if (this.query && this.query.objectId) {
+    originalObject = triggers.inflate(extraData, this.originalData);
+  }
+
  const className = Parse.Object.fromJSON(extraData);
  const readOnlyAttributes = className.constructor.readOnlyAttributes
    ? className.constructor.readOnlyAttributes()
@@ -1642,7 +1636,7 @@ RestWrite.prototype.buildUpdatedObject = function (extraData) {
    delete sanitized[attribute];
  }
  updatedObject.set(sanitized);
-  return updatedObject;
+  return { updatedObject, originalObject };
 };

 RestWrite.prototype.cleanUserAuthData = function () {
@@ -1662,6 +1656,15 @@ RestWrite.prototype.cleanUserAuthData = function () {
 };

 RestWrite.prototype._updateResponseWithData = function (response, data) {
+  const { updatedObject } = this.buildParseObjects();
+  const stateController = Parse.CoreManager.getObjectStateController();
+  const [pending] = stateController.getPendingOps(updatedObject._getStateIdentifier());
+  for (const key in this.pendingOps) {
+    if (!pending[key]) {
+      data[key] = this.originalData ? this.originalData[key] : { __op: 'Delete' };
+      this.storage.fieldsChangedByTrigger.push(key);
+    }
+  }
  if (_.isEmpty(this.storage.fieldsChangedByTrigger)) {
    return response;
  }
@@ -83,7 +83,8 @@ export class ClassesRouter extends PromiseRouter {
        this.className(req),
        req.params.objectId,
        options,
-        req.info.clientSDK
+        req.info.clientSDK,
+        req.info.context
      )
      .then(response => {
        if (!response.results || response.results.length == 0) {
@@ -201,6 +201,138 @@ class Utils {
    }
  }

+  /**
+   * Computes the relative date based on a string.
+   * @param {String} text The string to interpret the date from.
+   * @param {Date} now The date the string is comparing against.
+   * @returns {Object} The relative date object.
+   **/
+  static relativeTimeToDate(text, now = new Date()) {
+    text = text.toLowerCase();
+    let parts = text.split(' ');
+
+    // Filter out whitespace
+    parts = parts.filter(part => part !== '');
+
+    const future = parts[0] === 'in';
+    const past = parts[parts.length - 1] === 'ago';
+
+    if (!future && !past && text !== 'now') {
+      return {
+        status: 'error',
+        info: "Time should either start with 'in' or end with 'ago'",
+      };
+    }
+
+    if (future && past) {
+      return {
+        status: 'error',
+        info: "Time cannot have both 'in' and 'ago'",
+      };
+    }
+
+    // strip the 'ago' or 'in'
+    if (future) {
+      parts = parts.slice(1);
+    } else {
+      // past
+      parts = parts.slice(0, parts.length - 1);
+    }
+
+    if (parts.length % 2 !== 0 && text !== 'now') {
+      return {
+        status: 'error',
+        info: 'Invalid time string. Dangling unit or number.',
+      };
+    }
+
+    const pairs = [];
+    while (parts.length) {
+      pairs.push([parts.shift(), parts.shift()]);
+    }
+
+    let seconds = 0;
+    for (const [num, interval] of pairs) {
+      const val = Number(num);
+      if (!Number.isInteger(val)) {
+        return {
+          status: 'error',
+          info: `'${num}' is not an integer.`,
+        };
+      }
+
+      switch (interval) {
+        case 'yr':
+        case 'yrs':
+        case 'year':
+        case 'years':
+          seconds += val * 31536000; // 365 * 24 * 60 * 60
+          break;
+
+        case 'wk':
+        case 'wks':
+        case 'week':
+        case 'weeks':
+          seconds += val * 604800; // 7 * 24 * 60 * 60
+          break;
+
+        case 'd':
+        case 'day':
+        case 'days':
+          seconds += val * 86400; // 24 * 60 * 60
+          break;
+
+        case 'hr':
+        case 'hrs':
+        case 'hour':
+        case 'hours':
+          seconds += val * 3600; // 60 * 60
+          break;
+
+        case 'min':
+        case 'mins':
+        case 'minute':
+        case 'minutes':
+          seconds += val * 60;
+          break;
+
+        case 'sec':
+        case 'secs':
+        case 'second':
+        case 'seconds':
+          seconds += val;
+          break;
+
+        default:
+          return {
+            status: 'error',
+            info: `Invalid interval: '${interval}'`,
+          };
+      }
+    }
+
+    const milliseconds = seconds * 1000;
+    if (future) {
+      return {
+        status: 'success',
+        info: 'future',
+        result: new Date(now.valueOf() + milliseconds),
+      };
+    } else if (past) {
+      return {
+        status: 'success',
+        info: 'past',
+        result: new Date(now.valueOf() - milliseconds),
+      };
+    } else {
+      return {
+        status: 'success',
+        info: 'present',
+        result: new Date(now.valueOf()),
+      };
+    }
+  }
+
  /**
   * Deep-scans an object for a matching key/value definition.
   * @param {Object} obj The object to scan.
@@ -209,9 +341,9 @@ class Utils {
   * @returns {Boolean} True if a match was found, false otherwise.
   */
  static objectContainsKeyValue(obj, key, value) {
-    const isMatch = (a, b) => (typeof a === 'string' && new RegExp(a).test(b)) || a === b;
-    const isKeyMatch = k => isMatch(key, k);
-    const isValueMatch = v => isMatch(value, v);
+    const isMatch = (a, b) => (typeof a === 'string' && new RegExp(b).test(a)) || a === b;
+    const isKeyMatch = k => isMatch(k, key);
+    const isValueMatch = v => isMatch(v, value);
    for (const [k, v] of Object.entries(obj)) {
      if (key !== undefined && value === undefined && isKeyMatch(k)) {
        return true;
@@ -1,5 +1,4 @@
 const Parse = require('parse/node').Parse;
-const url = require('url');
 const path = require('path');
 // These methods handle batch requests.
 const batchPath = '/batch';
@@ -11,11 +10,12 @@ function mountOnto(router) {
  });
 }

-function parseURL(URL) {
-  if (typeof URL === 'string') {
-    return url.parse(URL);
+function parseURL(urlString) {
+  try {
+    return new URL(urlString);
+  } catch (error) {
+    return undefined;
  }
-  return undefined;
 }

 function makeBatchRoutingPathFunction(originalUrl, serverURL, publicServerURL) {
@@ -33,9 +33,9 @@ function makeBatchRoutingPathFunction(originalUrl, serverURL, publicServerURL) {
    return path.posix.join('/', requestPath.slice(apiPrefix.length));
  };

-  if (serverURL && publicServerURL && serverURL.path != publicServerURL.path) {
-    const localPath = serverURL.path;
-    const publicPath = publicServerURL.path;
+  if (serverURL && publicServerURL && serverURL.pathname != publicServerURL.pathname) {
+    const localPath = serverURL.pathname;
+    const publicPath = publicServerURL.pathname;

    // Override the api prefix
    apiPrefix = localPath;
@@ -6,6 +6,7 @@ import ClientSDK from './ClientSDK';
 import defaultLogger from './logger';
 import rest from './rest';
 import MongoStorageAdapter from './Adapters/Storage/Mongo/MongoStorageAdapter';
+import PostgresStorageAdapter from './Adapters/Storage/Postgres/PostgresStorageAdapter';

 export const DEFAULT_ALLOWED_HEADERS =
  'X-Parse-Master-Key, X-Parse-REST-API-Key, X-Parse-Javascript-Key, X-Parse-Application-Id, X-Parse-Client-Version, X-Parse-Session-Token, X-Requested-With, X-Parse-Revocable-Session, X-Parse-Request-Id, Content-Type, Pragma, Cache-Control';
@@ -431,7 +432,12 @@ export function promiseEnforceMasterKeyAccess(request) {
 */
 export function promiseEnsureIdempotency(req) {
  // Enable feature only for MongoDB
-  if (!(req.config.database.adapter instanceof MongoStorageAdapter)) {
+  if (
+    !(
+      req.config.database.adapter instanceof MongoStorageAdapter ||
+      req.config.database.adapter instanceof PostgresStorageAdapter
+    )
+  ) {
    return Promise.resolve();
  }
  // Get parameters
@@ -738,7 +738,7 @@ async function builtInTriggerValidator(options, request, auth) {
        }
        if (opt.constant && request.object) {
          if (request.original) {
-            request.object.set(key, request.original.get(key));
+            request.object.revert(key);
          } else if (opt.default != null) {
            request.object.set(key, opt.default);
          }