Merge branch 'alpha' into event-emitter

Author: dplewis

changelogs/CHANGELOG_alpha.md

@@ -1,3 +1,17 @@
+# [4.2.0-alpha.9](https://github.com/parse-community/Parse-SDK-JS/compare/4.2.0-alpha.8...4.2.0-alpha.9) (2023-09-01)
+
+
+### Features
+
+* Allow overriding `Parse.Error` message with custom message via new Core Manager option `PARSE_ERRORS` ([#2014](https://github.com/parse-community/Parse-SDK-JS/issues/2014)) ([be0c8a6](https://github.com/parse-community/Parse-SDK-JS/commit/be0c8a6ff90a7714487ae793e2b68ae04d0c8d0c))
+
+# [4.2.0-alpha.8](https://github.com/parse-community/Parse-SDK-JS/compare/4.2.0-alpha.7...4.2.0-alpha.8) (2023-08-30)
+
+
+### Features
+
+* Add Cloud Code context accessibility to `ParseUser.logIn` ([#2010](https://github.com/parse-community/Parse-SDK-JS/issues/2010)) ([2446007](https://github.com/parse-community/Parse-SDK-JS/commit/2446007ede4cc5af79e34f27dc1fbcc574d5f717))
+
 # [4.2.0-alpha.7](https://github.com/parse-community/Parse-SDK-JS/compare/4.2.0-alpha.6...4.2.0-alpha.7) (2023-08-29)
 
 

package-lock.json

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

package.json

@@ -194,6 +194,7 @@ const config: Config & { [key: string]: mixed } = {
   ENCRYPTED_USER: false,
   IDEMPOTENCY: false,
   ALLOW_CUSTOM_OBJECT_ID: false,
+  PARSE_ERRORS: [],
 };
 
 function requireMethods(name: string, methods: Array<string>, controller: any) {

src/CoreManager.js

@@ -5,6 +5,7 @@
  */
 
 import CoreManager from './CoreManager';
+import ParseError from './ParseError';
 import ParseObject from './ParseObject';
 import ParseQuery from './ParseQuery';
 import Storage from './Storage';
@@ -275,7 +276,7 @@ const EventuallyQueue = {
         await object.save(queueObject.object, queueObject.serverOptions);
         await this.remove(queueObject.queueId);
       } catch (e) {
-        if (e.message !== 'XMLHttpRequest failed: "Unable to connect to the Parse API"') {
+        if (e.code !== ParseError.CONNECTION_FAILED) {
           await this.remove(queueObject.queueId);
         }
       }
@@ -285,7 +286,7 @@ const EventuallyQueue = {
         await object.destroy(queueObject.serverOptions);
         await this.remove(queueObject.queueId);
       } catch (e) {
-        if (e.message !== 'XMLHttpRequest failed: "Unable to connect to the Parse API"') {
+        if (e.code !== ParseError.CONNECTION_FAILED) {
           await this.remove(queueObject.queueId);
         }
       }

src/EventuallyQueue.js

@@ -1,6 +1,10 @@
+import CoreManager from './CoreManager';
+
 /**
  * Constructs a new Parse.Error object with the given code and message.
  *
+ * Parse.CoreManager.set('PARSE_ERRORS', [{ code, message }]) can be use to override error messages.
+ *
  * @alias Parse.Error
  */
 class ParseError extends Error {
@@ -11,9 +15,15 @@ class ParseError extends Error {
   constructor(code, message) {
     super(message);
     this.code = code;
+    let customMessage = message;
+    CoreManager.get('PARSE_ERRORS').forEach((error) => {
+      if (error.code === code && error.code) {
+        customMessage = error.message;
+      }
+    });
     Object.defineProperty(this, 'message', {
       enumerable: true,
-      value: message,
+      value: customMessage,
     });
   }
 

src/ParseError.js

@@ -469,7 +469,12 @@ class ParseUser extends ParseObject {
     if (options.hasOwnProperty('usePost')) {
       loginOptions.usePost = options.usePost;
     }
-
+    if (
+      options.hasOwnProperty('context') &&
+      Object.prototype.toString.call(options.context) === '[object Object]'
+    ) {
+      loginOptions.context = options.context;
+    }
     const controller = CoreManager.getUserController();
     return controller.logIn(this, loginOptions);
   }

src/ParseUser.js

@@ -1,6 +1,8 @@
 jest.dontMock('../ParseError');
+jest.dontMock('../CoreManager');
 
 const ParseError = require('../ParseError').default;
+const CoreManager = require('../CoreManager');
 
 describe('ParseError', () => {
   it('have sensible string representation', () => {
@@ -18,4 +20,14 @@ describe('ParseError', () => {
       code: 123,
     });
   });
+
+  it('can override message', () => {
+    CoreManager.set('PARSE_ERRORS', [{ code: 123, message: 'Oops.' }]);
+    const error = new ParseError(123, 'some error message');
+    expect(JSON.parse(JSON.stringify(error))).toEqual({
+      message: 'Oops.',
+      code: 123,
+    });
+    CoreManager.set('PARSE_ERRORS', []);
+  });
 });

src/__tests__/ParseError-test.js

@@ -1942,6 +1942,27 @@ describe('ParseUser', () => {
     expect(controller.request.mock.calls[0][3].context).toEqual(context);
   });
 
+  it('can login with context', async () => {
+    CoreManager.setRESTController({
+      ajax() {},
+      request() {
+        return Promise.resolve(
+          {
+            objectId: 'uid33',
+            username: 'username',
+            sessionToken: '123abc',
+          },
+          200
+        );
+      },
+    });
+    const controller = CoreManager.getRESTController();
+    jest.spyOn(controller, 'request');
+    const context = { a: 'a' };
+    await ParseUser.logIn('username', 'password', { context });
+    expect(controller.request.mock.calls[0][3].context).toEqual(context);
+  });
+
   it('can verify user password', async () => {
     ParseUser.enableUnsafeCurrentUser();
     ParseUser._clearCache();