Merge remote-tracking branch 'remotes/origin/pr_beforeUnsubscribe'

Author: sadortun

CHANGELOG.md

@@ -150,6 +150,7 @@ ___
 - Add CI check to add changelog entry (Manuel Trezza) [#7512](https://github.com/parse-community/parse-server/pull/7512)
 - Refactor: uniform issue templates across repos (Manuel Trezza) [#7528](https://github.com/parse-community/parse-server/pull/7528)
 - ci: bump ci environment (Manuel Trezza) [#7539](https://github.com/parse-community/parse-server/pull/7539)
+- Added Cloud Trigger for LiveQuery event beforeUnsubscribe (sadortun) [#7419](https://github.com/parse-community/parse-server/pull/7419)
 
 ## 4.10.3
 [Full Changelog](https://github.com/parse-community/parse-server/compare/4.10.2...4.10.3)

spec/ParseLiveQuery.spec.js

@@ -645,6 +645,45 @@ describe('ParseLiveQuery', function () {
     await object.save();
   });
 
+  it('can handle select beforeUnsubscribe trigger', async done => {
+    await reconfigureServer({
+      liveQuery: {
+        classNames: ['TestObject'],
+      },
+      startLiveQueryServer: true,
+      verbose: false,
+      silent: true,
+    });
+    const user = new Parse.User();
+    user.setUsername('username');
+    user.setPassword('password');
+    await user.signUp();
+
+    Parse.Cloud.beforeSubscribe(TestObject, req => {
+      expect(req.requestId).toBe(1);
+      expect(req.user).toBeDefined();
+    });
+
+    Parse.Cloud.beforeUnsubscribe(TestObject, req => {
+      expect(req.requestId).toBe(1);
+      expect(req.user).toBeDefined();
+      expect(req.user.get('username')).toBe('username');
+      done();
+    });
+
+    const object = new TestObject();
+    await object.save();
+
+    const query = new Parse.Query(TestObject);
+    query.equalTo('objectId', object.id);
+    const subscription = await query.subscribe();
+
+    object.set({ foo: 'bar', yolo: 'abc' });
+    await object.save();
+
+    await subscription.unsubscribe();
+  });
+
   it('LiveQuery with ACL', async () => {
     await reconfigureServer({
       liveQuery: {

src/LiveQuery/ParseLiveQueryServer.js

@@ -848,20 +848,24 @@ class ParseLiveQueryServer {
         request.user = auth.user;
       }
 
-      const parseQuery = new Parse.Query(className);
-      parseQuery.withJSON(request.query);
-      request.query = subscription.query;
       request.sessionToken = subscriptionInfo.sessionToken;
       request.useMasterKey = client.hasMasterKey;
       request.installationId = client.installationId;
 
-      await runTrigger(trigger, `beforeUnsubscribe.${className}`, request, auth);
-
-      const query = request.query.toJSON();
-      if (query.keys) {
-        query.fields = query.keys.split(',');
+      try {
+        await runTrigger(trigger, `beforeUnsubscribe.${className}`, request, auth);
+      } catch (error) {
+        Client.pushError(
+          parseWebsocket,
+          error.code || Parse.Error.SCRIPT_FAILED,
+          error.message || error,
+          false
+        );
+        logger.error(
+          `Failed running beforeUnsubscribe for session ${request.sessionToken} with:\n Error: ` +
+            JSON.stringify(error)
+        );
       }
-      request.query = query;
     }
 
     // Remove subscription from client

src/cloud-code/Parse.Cloud.js

@@ -703,7 +703,7 @@ ParseCloud.onLiveQueryEvent = function (handler) {
  */
 ParseCloud.beforeUnsubscribe = function (parseClass, handler, validationHandler) {
   validateValidator(validationHandler);
-  var className = getClassName(parseClass);
+  const className = getClassName(parseClass);
   triggers.addTrigger(
     triggers.Types.beforeUnsubscribe,
     className,
@@ -713,10 +713,6 @@ ParseCloud.beforeUnsubscribe = function (parseClass, handler, validationHandler)
   );
 };
 
-ParseCloud.onLiveQueryEvent = function (handler) {
-  triggers.addLiveQueryEventHandler(handler, Parse.applicationId);
-};
-
 /**
  * Registers an after live query server event function.
  *