Merge remote-tracking branch 'upstream/master'

Author: mtrezza

CHANGELOG.md

@@ -8,6 +8,9 @@ __BREAKING CHANGES:__
 ___
 - IMPROVE: Optimize queries on classes with pointer permissions. [#7061](https://github.com/parse-community/parse-server/pull/7061). Thanks to [Pedro Diaz](https://github.com/pdiaz)
 - FIX: request.context for afterFind triggers. [#7078](https://github.com/parse-community/parse-server/pull/7078). Thanks to [dblythy](https://github.com/dblythy)
+- NEW: Added convenience method Parse.Cloud.sendEmail(...) to send email via email adapter in Cloud Code. [#7089](https://github.com/parse-community/parse-server/pull/7089). Thanks to [dblythy](https://github.com/dblythy)
+- FIX: Winston Logger interpolating stdout to console [#7114](https://github.com/parse-community/parse-server/pull/7114). Thanks to [dplewis](https://github.com/dplewis)
+- NEW: LiveQuery support for $and, $nor, $containedBy, $geoWithin, $geoIntersects queries [#7113](https://github.com/parse-community/parse-server/pull/7113). Thanks to [dplewis](https://github.com/dplewis)
 
 ### 4.5.0
 [Full Changelog](https://github.com/parse-community/parse-server/compare/4.4.0...4.5.0)

package-lock.json

@@ -26,38 +26,38 @@
     "@parse/fs-files-adapter": "1.2.0",
     "@parse/push-adapter": "3.4.0",
     "@parse/s3-files-adapter": "1.6.0",
-    "@parse/simple-mailgun-adapter": "1.1.0",
-    "apollo-server-express": "2.19.0",
+    "@parse/simple-mailgun-adapter": "1.2.0",
+    "apollo-server-express": "2.19.1",
     "bcryptjs": "2.4.3",
     "body-parser": "1.19.0",
     "commander": "5.1.0",
     "cors": "2.8.5",
     "deepcopy": "2.1.0",
     "express": "4.17.1",
-    "follow-redirects": "1.13.0",
+    "follow-redirects": "1.13.1",
     "graphql": "15.4.0",
     "graphql-list-fields": "2.0.2",
     "graphql-relay": "0.6.0",
     "graphql-upload": "11.0.0",
     "intersect": "1.0.1",
     "jsonwebtoken": "8.5.1",
-    "jwks-rsa": "1.11.0",
-    "ldapjs": "2.2.2",
+    "jwks-rsa": "1.12.1",
+    "ldapjs": "2.2.3",
     "lodash": "4.17.20",
     "lru-cache": "5.1.1",
-    "mime": "2.4.6",
+    "mime": "2.4.7",
     "mongodb": "3.6.3",
     "parse": "2.19.0",
-    "pg-promise": "10.8.1",
+    "pg-promise": "10.8.6",
     "pluralize": "8.0.0",
     "redis": "3.0.2",
-    "semver": "7.3.2",
+    "semver": "7.3.4",
     "subscriptions-transport-ws": "0.9.18",
     "tv4": "1.3.0",
-    "uuid": "8.3.1",
+    "uuid": "8.3.2",
     "winston": "3.3.3",
     "winston-daily-rotate-file": "4.5.0",
-    "ws": "7.4.0"
+    "ws": "7.4.1"
   },
   "devDependencies": {
     "@babel/cli": "7.10.0",

package.json

@@ -168,9 +168,9 @@ describe('Auth', () => {
         const acl = new Parse.ACL();
         const role = new Parse.Role('roleloadtest' + i, acl);
         role.getUsers().add([user]);
-        roles.push(role.save());
+        roles.push(role);
       }
-      const savedRoles = await Promise.all(roles);
+      const savedRoles = await Parse.Object.saveAll(roles);
       expect(savedRoles.length).toBe(rolesNumber);
       const cloudRoles = await userAuth.getRolesForUser();
       expect(cloudRoles.length).toBe(rolesNumber);
@@ -192,9 +192,9 @@ describe('Auth', () => {
         const acl = new Parse.ACL();
         const role = new Parse.Role('roleloadtest' + i, acl);
         role.getUsers().add([user]);
-        roles.push(role.save());
+        roles.push(role);
       }
-      const savedRoles = await Promise.all(roles);
+      const savedRoles = await Parse.Object.saveAll(roles);
       expect(savedRoles.length).toBe(rolesNumber);
       const cloudRoles = await userAuth.getRolesForUser();
       expect(cloudRoles.length).toBe(rolesNumber);

spec/Auth.spec.js

@@ -3168,3 +3168,29 @@ describe('afterLogin hook', () => {
     await query.find({ context: { a: 'a' } });
   });
 });
+
+describe('sendEmail', () => {
+  it('can send email via Parse.Cloud', async done => {
+    const emailAdapter = {
+      sendMail: mailData => {
+        expect(mailData).toBeDefined();
+        expect(mailData.to).toBe('test');
+        done();
+      },
+    };
+    await reconfigureServer({
+      emailAdapter: emailAdapter,
+    });
+    const mailData = { to: 'test' };
+    await Parse.Cloud.sendEmail(mailData);
+  });
+
+  it('cannot send email without adapter', async () => {
+    const logger = require('../lib/logger').logger;
+    spyOn(logger, 'error').and.callFake(() => {});
+    await Parse.Cloud.sendEmail({});
+    expect(logger.error).toHaveBeenCalledWith(
+      'Failed to send email because no mail adapter is configured for Parse Server.'
+    );
+  });
+});

spec/CloudCode.spec.js

@@ -24,31 +24,14 @@ const headers = {
 };
 
 describe_only_db('mongo')('miscellaneous', () => {
-  it('test rest_create_app', function (done) {
-    let appId;
-    Parse._request('POST', 'rest_create_app')
-      .then(res => {
-        expect(typeof res.application_id).toEqual('string');
-        expect(res.master_key).toEqual('master');
-        appId = res.application_id;
-        Parse.initialize(appId, 'unused');
-        const obj = new Parse.Object('TestObject');
-        obj.set('foo', 'bar');
-        return obj.save();
-      })
-      .then(() => {
-        const config = Config.get(appId);
-        return config.database.adapter.find('TestObject', { fields: {} }, {}, {});
-      })
-      .then(results => {
-        expect(results.length).toEqual(1);
-        expect(results[0]['foo']).toEqual('bar');
-        done();
-      })
-      .catch(error => {
-        fail(JSON.stringify(error));
-        done();
-      });
+  it('db contains document after successful save', async () => {
+    const obj = new Parse.Object('TestObject');
+    obj.set('foo', 'bar');
+    await obj.save();
+    const config = Config.get(defaultConfiguration.appId);
+    const results = await config.database.adapter.find('TestObject', { fields: {} }, {}, {});
+    expect(results.length).toEqual(1);
+    expect(results[0]['foo']).toEqual('bar');
   });
 });