rename to requireAny and requireAll

Author: dblythy

CHANGELOG.md

@@ -14,7 +14,7 @@ ___
 - IMPROVE: Parse Server will from now on be continuously tested against all relevant MongoDB versions (minor versions). Added MongoDB compatibility table to Parse Server docs. [7161](https://github.com/parse-community/parse-server/pull/7161). Thanks to [Manuel Trezza](https://github.com/mtrezza).
 - 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: `requireUserRole` and `requireUserRoles` for Parse Cloud validator. [#7097](https://github.com/parse-community/parse-server/pull/7097). Thanks to [dblythy](https://github.com/dblythy)
+- NEW: `requireAnyUserRoles` and `requireAllUserRoles` 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)
 - FIX: Winston Logger interpolating stdout to console [#7114](https://github.com/parse-community/parse-server/pull/7114). Thanks to [dplewis](https://github.com/dplewis)
 

spec/CloudCode.Validator.spec.js

@@ -878,15 +878,15 @@ describe('cloud validator', () => {
       });
   });
 
-  it('basic validator requireUserRole', async function (done) {
+  it('basic validator requireAnyUserRoles', async function (done) {
     Parse.Cloud.define(
       'cloudFunction',
       () => {
         return true;
       },
       {
         requireUser: true,
-        requireUserRole: ['Admin'],
+        requireAnyUserRoles: ['Admin'],
       }
     );
     const user = await Parse.User.signUp('testuser', 'p@ssword');
@@ -905,15 +905,15 @@ describe('cloud validator', () => {
     done();
   });
 
-  it('basic validator requireUserRoles', async function (done) {
+  it('basic validator requireAllUserRoles', async function (done) {
     Parse.Cloud.define(
       'cloudFunction',
       () => {
         return true;
       },
       {
         requireUser: true,
-        requireUserRoles: ['Admin', 'Admin2'],
+        requireAllUserRoles: ['Admin', 'Admin2'],
       }
     );
     const user = await Parse.User.signUp('testuser', 'p@ssword');
@@ -935,14 +935,14 @@ describe('cloud validator', () => {
     done();
   });
 
-  it('basic requireUserRoles but no user', async function (done) {
+  it('basic requireAllUserRoles but no user', async function (done) {
     Parse.Cloud.define(
       'cloudFunction',
       () => {
         return true;
       },
       {
-        requireUserRoles: ['Admin'],
+        requireAllUserRoles: ['Admin'],
       }
     );
     try {

src/cloud-code/Parse.Cloud.js

@@ -751,7 +751,8 @@ module.exports = ParseCloud;
  * @property {Array|function|Any} requireUserKeys.field.options array of options that the field can be, function to validate field, or single value. Throw an error if value is invalid.
  * @property {String} requireUserKeys.field.error custom error message if field is invalid.
  *
- * @property {Array<String>}requireUserRoles If set, array of roles names allowed on request.user to make the request.
+ * @property {Array<String>}requireAnyUserRoles If set, request.user has to be part of at least one roles name to make the request.
+ * @property {Array<String>}requireAllUserRoles If set, request.user has to be part all roles name to make the request.
  *
  * @property {Object|Array<String>} fields if an array of strings, validator will look for keys in request.params, and throw if not provided. If Object, fields to validate. If the trigger is a cloud function, `request.params` will be validated, otherwise `request.object`.
  * @property {String} fields.field name of field to validate.

src/triggers.js

@@ -641,7 +641,10 @@ async function builtInTriggerValidator(options, request, auth) {
   ) {
     reqUser = request.object;
   }
-  if ((options.requireUser || options.requireUserRole || options.requireUserRoles) && !reqUser) {
+  if (
+    (options.requireUser || options.requireAnyUserRoles || options.requireAllUserRoles) &&
+    !reqUser
+  ) {
     throw 'Validation failed. Please login to continue.';
   }
   if (options.requireMaster && !request.master) {
@@ -732,8 +735,8 @@ async function builtInTriggerValidator(options, request, auth) {
       }
     }
   }
-  const userRoles = options.requireUserRole;
-  const requireAllRoles = options.requireUserRoles;
+  const userRoles = options.requireAnyUserRoles;
+  const requireAllRoles = options.requireAllUserRoles;
   let roles;
   if (userRoles || requireAllRoles) {
     roles = await auth.getUserRoles();