Merge remote-tracking branch 'upstream/alpha' into alpha

Author: dblythy

changelogs/CHANGELOG_alpha.md

@@ -1,3 +1,10 @@
+## [3.4.3-alpha.2](https://github.com/parse-community/Parse-SDK-JS/compare/3.4.3-alpha.1...3.4.3-alpha.2) (2022-05-29)
+
+
+### Bug Fixes
+
+* invalid name for `Parse.Role` throws incorrect error ([#1481](https://github.com/parse-community/Parse-SDK-JS/issues/1481)) ([8326a6f](https://github.com/parse-community/Parse-SDK-JS/commit/8326a6f1d7cda0ca8c6f1a3a7ea82448881e118e))
+
 ## [3.4.3-alpha.1](https://github.com/parse-community/Parse-SDK-JS/compare/3.4.2...3.4.3-alpha.1) (2022-05-02)
 
 

integration/test/ParseACLTest.js

@@ -533,4 +533,13 @@ describe('Parse.ACL', () => {
     const obj1withInclude = await query.first();
     assert(obj1withInclude.get('other').get('ACL'));
   });
+
+  it('prevents save with invalid role name', async () => {
+    expect(() => new Parse.Role(':%#', new Parse.ACL())).toThrow(
+      new Parse.Error(
+        Parse.Error.OTHER_CAUSE,
+        `A role's name can be only contain alphanumeric characters, _, -, and spaces.`
+      )
+    );
+  });
 });

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "parse",
-  "version": "3.4.3-alpha.1",
+  "version": "3.4.3-alpha.2",
   "description": "The Parse JavaScript SDK",
   "homepage": "https://parseplatform.org/",
   "keywords": [

package.json

@@ -75,6 +75,7 @@ class ParseRole extends ParseObject {
    * @returns {(ParseObject|boolean)} true if the set succeeded.
    */
   setName(name: string, options?: mixed): ParseObject | boolean {
+    this._validateName(name);
     return this.set('name', name, options);
   }
 
@@ -108,6 +109,18 @@ class ParseRole extends ParseObject {
     return this.relation('roles');
   }
 
+  _validateName(newName) {
+    if (typeof newName !== 'string') {
+      throw new ParseError(ParseError.OTHER_CAUSE, "A role's name must be a String.");
+    }
+    if (!/^[0-9a-zA-Z\-_ ]+$/.test(newName)) {
+      throw new ParseError(
+        ParseError.OTHER_CAUSE,
+        "A role's name can be only contain alphanumeric characters, _, " + '-, and spaces.'
+      );
+    }
+  }
+
   validate(attrs: AttributeMap, options?: mixed): ParseError | boolean {
     const isInvalid = super.validate(attrs, options);
     if (isInvalid) {
@@ -125,14 +138,10 @@ class ParseRole extends ParseObject {
           "A role's name can only be set before it has been saved."
         );
       }
-      if (typeof newName !== 'string') {
-        return new ParseError(ParseError.OTHER_CAUSE, "A role's name must be a String.");
-      }
-      if (!/^[0-9a-zA-Z\-_ ]+$/.test(newName)) {
-        return new ParseError(
-          ParseError.OTHER_CAUSE,
-          "A role's name can be only contain alphanumeric characters, _, " + '-, and spaces.'
-        );
+      try {
+        this._validateName(newName);
+      } catch (e) {
+        return e;
       }
     }
     return false;

src/ParseRole.js

@@ -779,7 +779,7 @@ class ParseUser extends ParseObject {
    * Request an email verification.
    *
    * @param {string} email The email address associated with the user that
-   *     forgot their password.
+   *     needs to verify their email.
    * @param {object} options
    * @static
    * @returns {Promise}

src/ParseUser.js

@@ -45,6 +45,15 @@ describe('ParseRole', () => {
     expect(role.getName()).toBe('');
   });
 
+  it('should throw error string with invalid name', () => {
+    expect(() => new ParseRole('invalid:name', new ParseACL())).toThrow(
+      new ParseError(
+        ParseError.OTHER_CAUSE,
+        "A role's name can be only contain alphanumeric characters, _, " + '-, and spaces.'
+      )
+    );
+  });
+
   it('can validate attributes', () => {
     const acl = new ParseACL({ aUserId: { read: true, write: true } });
     const role = new ParseRole('admin', acl);