Merge branch 'master' into roleBasedValidator

Author: dblythy

CHANGELOG.md

@@ -9,6 +9,7 @@ ___
 - 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: requireUserRoles for Parse Cloud validator. [#7097](https://github.com/parse-community/parse-server/pull/7097). 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)
 
 ### 4.5.0
 [Full Changelog](https://github.com/parse-community/parse-server/compare/4.4.0...4.5.0)

package-lock.json

@@ -34,15 +34,15 @@
     "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.0",
+    "ldapjs": "2.2.3",
     "lodash": "4.17.20",
     "lru-cache": "5.1.1",
     "mime": "2.4.6",
@@ -51,13 +51,13 @@
     "pg-promise": "10.8.1",
     "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

@@ -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

@@ -1,5 +1,6 @@
 import { Parse } from 'parse/node';
 import * as triggers from '../triggers';
+const Config = require('../Config');
 
 function isParseObjectConstructor(object) {
   return typeof object === 'function' && Object.prototype.hasOwnProperty.call(object, 'className');
@@ -528,6 +529,37 @@ ParseCloud.beforeConnect = function (handler, validationHandler) {
   );
 };
 
+/**
+ * Sends an email through the Parse Server mail adapter.
+ *
+ * **Available in Cloud Code only.**
+ * **Requires a mail adapter to be configured for Parse Server.**
+ *
+ * ```
+ * Parse.Cloud.sendEmail({
+ *   from: 'Example <test@example.com>',
+ *   to: '[email protected]',
+ *   subject: 'Test email',
+ *   text: 'This email is a test.'
+ * });
+ *```
+ *
+ * @method sendEmail
+ * @name Parse.Cloud.sendEmail
+ * @param {Object} data The object of the mail data to send.
+ */
+ParseCloud.sendEmail = function (data) {
+  const config = Config.get(Parse.applicationId);
+  const emailAdapter = config.userController.adapter;
+  if (!emailAdapter) {
+    config.loggerController.error(
+      'Failed to send email because no mail adapter is configured for Parse Server.'
+    );
+    return;
+  }
+  return emailAdapter.sendMail(data);
+};
+
 /**
  * Registers a before live query subscription function.
  *