Merge pull request #68 from BloomBooks/parse-server-7

Upgrade to parse-server 7.0.0-alpha.1 for MongoDB 7 support (BL-12843)

Author: andrew-polk

.eslintrc.json

@@ -1,17 +1,18 @@
 {
-    "env": {
-        "commonjs": true,
-        "es6": true,
-        "node": true
-    },
     "extends": "eslint:recommended",
-    "globals": {
-        "Atomics": "readonly",
-        "SharedArrayBuffer": "readonly"
+    "env": {
+        "node": true,
+        "es6": true
     },
     "parserOptions": {
-        "ecmaVersion": 2018
+        "ecmaVersion": 2021,
+        "sourceType": "module",
+        "requireConfigFile": false
     },
+    "parser": "@babel/eslint-parser",
     "rules": {
+    },
+    "globals" : {
+        "Parse" : true
     }
-}
+}

.vscode/settings.json

@@ -3,5 +3,6 @@
     "bloomlibrary",
     "mailgun",
     "rebrand"
-  ]
+  ],
+  "editor.formatOnSave": true
 }

bloomFirebaseAuthAdapter.js

@@ -1,6 +1,5 @@
-const Parse = require("parse/node").Parse;
-const httpsRequest = require("./httpsRequest");
-const jwt = require("jsonwebtoken");
+import jwt from "jsonwebtoken";
+import { get as httpGet } from "./httpsRequest.js";
 
 // This adapter, modified from the 'apple' one in parse-server, validates a user when
 // presented with a valid, current firebase-auth token from the appropriate domain whose email
@@ -22,7 +21,7 @@ let currentKey;
 const getPublicKeys = async () => {
     let data;
     try {
-        data = await httpsRequest.get(TOKEN_ISSUER);
+        data = await httpGet(TOKEN_ISSUER);
     } catch (e) {
         if (currentKey) {
             return currentKey;
@@ -49,7 +48,7 @@ const tryPublicKeys = (token, publicKeys) => {
             // and encypted with the given private key and returns it decoded.
             // It will fail appropriately if the token is expired.
             const jwtClaims = jwt.verify(token, publicKey, {
-                algorithms: "RS256"
+                algorithms: "RS256",
             });
             if (jwtClaims) {
                 return jwtClaims;
@@ -122,7 +121,7 @@ function validateAppId() {
     return Promise.resolve();
 }
 
-module.exports = {
+export default {
     validateAppId,
-    validateAuthData
+    validateAuthData,
 };

cloud/emails.js

@@ -47,7 +47,7 @@ Parse.Cloud.define("testBookSaved", async () => {
 
 // Send an email to notify about a newly created book.
 // It is sent to an internal address, set by environment variable EMAIL_BOOK_EVENT_RECIPIENT on the server.
-exports.sendEmailAboutNewBookAsync = async (parseBook) => {
+export const sendEmailAboutNewBookAsync = async (parseBook) => {
     var bookId = parseBook.id;
     var query = new Parse.Query("books");
     query.equalTo("objectId", bookId);

cloud/main.js

@@ -1,6 +1,5 @@
-/* eslint-disable no-undef */
-require("./emails.js"); // allows email-specific could functions to be defined
-require("./utility.js"); // utility functions which don't belong in the main file
+import "./emails.js"; // allows email-specific cloud functions to be defined
+import "./utility.js"; // utility functions which don't belong in the main file
 
 // This function will call save on every book. This is useful for
 // applying the functionality in beforeSaveBook to every book,

httpsRequest.js

@@ -1,11 +1,11 @@
-// helper file needed by bloomAuth0Adapater; copied from file required by apple authAdapter
-// in parser-server core code.
-const https = require("https");
+// This helper file is needed by bloomFirebaseAuthAdapter.
+// It was copied (and slightly modified) from a file required by apple authAdapter in parser-server core code.
+import https from "https";
 
 function makeCallback(resolve, reject, noJSON) {
-    return function(res) {
+    return function (res) {
         let data = "";
-        res.on("data", chunk => {
+        res.on("data", (chunk) => {
             data += chunk;
         });
         res.on("end", () => {
@@ -23,21 +23,19 @@ function makeCallback(resolve, reject, noJSON) {
     };
 }
 
-function get(options, noJSON = false) {
+export function get(options, noJSON = false) {
     return new Promise((resolve, reject) => {
         https
             .get(options, makeCallback(resolve, reject, noJSON))
             .on("error", reject);
     });
 }
 
-function request(options, postData) {
+export function request(options, postData) {
     return new Promise((resolve, reject) => {
         const req = https.request(options, makeCallback(resolve, reject));
         req.on("error", reject);
         req.write(postData);
         req.end();
     });
 }
-
-module.exports = { get, request };

index.js

@@ -1,7 +1,8 @@
-const express = require("express");
-const ParseServer = require("parse-server").ParseServer;
-const ParseDashboard = require("parse-dashboard");
-const BloomFirebaseAuthAdapter = require("./bloomFirebaseAuthAdapter");
+import express from "express";
+import { ParseServer } from "parse-server";
+import http from "http";
+import ParseDashboard from "parse-dashboard";
+import BloomFirebaseAuthAdapter from "./bloomFirebaseAuthAdapter.js";
 
 const databaseUri = process.env.DATABASE_URI || process.env.MONGODB_URI;
 
@@ -11,19 +12,20 @@ if (!databaseUri) {
 
 const serverConfig = {
     databaseURI: databaseUri || "mongodb://localhost:27017/dev",
-    cloud: process.env.CLOUD_CODE_MAIN || __dirname + "/cloud/main.js",
+    cloud: function () {
+        import("./cloud/main.js");
+    },
     appId: process.env.APP_ID || "myAppId",
     masterKey: process.env.MASTER_KEY || "123",
     readOnlyMasterKey: process.env.READ_ONLY_MASTER_KEY || "ro",
     serverURL: process.env.SERVER_URL || "http://localhost:1337/parse",
 
     appName: process.env.APP_NAME || "BloomLibrary.org",
 
-    auth: { bloom: BloomFirebaseAuthAdapter },
+    auth: { bloom: { module: BloomFirebaseAuthAdapter, enabled: true } },
 
     allowClientClassCreation: false,
 };
-const api = new ParseServer(serverConfig);
 
 const dashboard = new ParseDashboard({
     apps: [
@@ -56,6 +58,12 @@ const dashboard = new ParseDashboard({
 
 const app = express();
 
+// Serve the Parse API on the /parse URL prefix
+const mountPath = process.env.PARSE_MOUNT || "/parse";
+const server = new ParseServer(serverConfig);
+await server.start();
+app.use(mountPath, server.app);
+
 // The main thing here is the google-site-verification meta tag.
 // This lets us access the site on the Google Search Console.
 app.get("/", function (req, res) {
@@ -67,14 +75,10 @@ app.get("/", function (req, res) {
     );
 });
 
-// Serve the Parse API on the /parse URL prefix
-const mountPath = process.env.PARSE_MOUNT || "/parse";
-app.use(mountPath, api);
-
 app.use("/dashboard", dashboard);
 
 const port = process.env.PORT || 1337;
-const httpServer = require("http").createServer(app);
+const httpServer = http.createServer(app);
 httpServer.listen(port, function () {
     console.log("bloom-parse-server running on port " + port + ".");
 });

package-lock.json

@@ -2,31 +2,34 @@
   "name": "bloom-parse-server",
   "version": "1.4.0",
   "description": "Parse server for bloomlibrary.org",
-  "main": "index.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/BloomBooks/bloom-parse-server"
   },
   "license": "MIT",
-  "dependencies": {
-    "express": "4.18.2",
-    "jsonwebtoken": "^9.0.0",
-    "mailgun-js": "^0.22.0",
-    "parse-dashboard": "5.0.0",
-    "parse-server": "5.4.1",
-    "patch-package": "^6.5.1"
-  },
+  "main": "index.js",
   "scripts": {
     "start": "node index.js",
     "postinstall": "patch-package"
   },
+  "// mailgun-js is deprecated; we should replace it with officially-supported mailgun.js": " ",
+  "dependencies": {
+    "express": "4.18.2",
+    "jsonwebtoken": "9.0.2",
+    "mailgun-js": "0.22.0",
+    "parse-dashboard": "5.3.0",
+    "parse-server": "7.0.0-alpha.1",
+    "patch-package": "8.0.0"
+  },
+  "type": "module",
+  "devDependencies": {
+    "@babel/eslint-parser": "7.21.3",
+    "eslint": "8.38.0",
+    "prettier": "2.8.7"
+  },
   "// On the server, this is set in Configuration > Application settings > WEBSITE_NODE_DEFAULT_VERSION": " ",
   "// (18.12.1 as of Feb 2023)": " ",
   "engines": {
-    "node": ">=16 <19"
-  },
-  "devDependencies": {
-    "eslint": "^6.8.0",
-    "prettier": "^2.8.3"
+    "node": ">=16 <17 || >=18 <19"
   }
 }

package.json

@@ -1,15 +1,15 @@
 diff --git a/node_modules/parse-server/lib/RestQuery.js b/node_modules/parse-server/lib/RestQuery.js
-index 8d1ff6b..135e614 100644
+index 1155c10..ab368d0 100644
 --- a/node_modules/parse-server/lib/RestQuery.js
 +++ b/node_modules/parse-server/lib/RestQuery.js
-@@ -200,8 +200,8 @@ function RestQuery(config, auth, className, restWhere = {}, restOptions = {}, cl
- RestQuery.prototype.execute = function (executeOptions) {
+@@ -242,8 +242,8 @@ _UnsafeRestQuery.prototype.execute = function (executeOptions) {
    return Promise.resolve().then(() => {
      return this.buildRestWhere();
--  }).then(() => {
+   }).then(() => {
 -    return this.denyProtectedFields();
-+//   }).then(() => {
+-  }).then(() => {
 +//     return this.denyProtectedFields();
-   }).then(() => {
++//   }).then(() => {
      return this.handleIncludeAll();
    }).then(() => {
+     return this.handleExcludeKeys();