Revert "fix: allow Parse.Cloud.beforeSubscribe rejections to be cau…

…ght by query.subscribe" This reverts commit 3073b77.
dblythy · Jun 5, 2022 · bc0a576 · bc0a576
1 parent 3073b77
commit bc0a576
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 48 deletions.
diff --git a/integration/test/ParseLiveQueryTest.js b/integration/test/ParseLiveQueryTest.js
@@ -256,31 +256,4 @@ describe('Parse LiveQuery', () => {
     object.set({ foo: 'bar' });
     await object.save();
   });
-
-  it('live query can handle beforeConnect and beforeSubscribe errors', async () => {
-    const client = new Parse.LiveQueryClient({
-      applicationId: 'integration',
-      serverURL: 'ws://localhost:1337',
-      javascriptKey: null,
-      masterKey: null,
-      sessionToken: null,
-      installationId: null,
-    });
-    client.open();
-    const query = new Parse.Query('TestError');
-    let subscription = client.subscribe(query);
-    await expectAsync(subscription.subscribePromise).toBeRejectedWith(
-      new Parse.Error(141, 'not allowed to subscribe')
-    );
-    client.close();
-    await reconfigureServer({
-      cloud: `${__dirname}/cloud/before_connect.js`,
-    });
-    client.open();
-    subscription = client.subscribe(query);
-    await expectAsync(subscription.subscribePromise).toBeRejectedWith(
-      new Parse.Error(141, 'not allowed to connect')
-    );
-    client.close();
-  });
 });
diff --git a/integration/test/cloud/before_connect.js b/integration/test/cloud/before_connect.js
diff --git a/integration/test/cloud/main.js b/integration/test/cloud/main.js
@@ -48,7 +48,3 @@ Parse.Cloud.job('CloudJob2', function () {
 Parse.Cloud.job('CloudJobFailing', function () {
   throw 'cloud job failed';
 });
-
-Parse.Cloud.beforeSubscribe('TestError', () => {
-  throw 'not allowed to subscribe';
-});
diff --git a/src/LiveQueryClient.js b/src/LiveQueryClient.js
@@ -14,7 +14,6 @@ import EventEmitter from './EventEmitter';
 import ParseObject from './ParseObject';
 import LiveQuerySubscription from './LiveQuerySubscription';
 import { resolvingPromise } from './promiseUtils';
-import ParseError from './ParseError';
 
 // The LiveQuery client inner state
 const CLIENT_STATE = {
@@ -219,10 +218,6 @@ class LiveQueryClient extends EventEmitter {
     this.subscriptions.set(this.requestId, subscription);
     this.requestId += 1;
     this.connectPromise.then(() => {
-      if (this.connectError) {
-        subscription.subscribePromise.reject(this.connectError);
-        return;
-      }
       this.socket.send(JSON.stringify(subscribeRequest));
     });
 
@@ -387,16 +382,10 @@ class LiveQueryClient extends EventEmitter {
         setTimeout(() => subscription.emit(SUBSCRIPTION_EMMITER_TYPES.OPEN, response), 200);
       }
       break;
-    case OP_EVENTS.ERROR: {
-      const parseError = new ParseError(data.code, data.error);
-      if (!this.id) {
-        this.connectError = parseError;
-        this.connectPromise.resolve();
-        this.state = CLIENT_STATE.DISCONNECTED;
-      }
+    case OP_EVENTS.ERROR:
       if (data.requestId) {
         if (subscription) {
-          subscription.subscribePromise.reject(parseError);
+          subscription.subscribePromise.resolve();
           setTimeout(() => subscription.emit(SUBSCRIPTION_EMMITER_TYPES.ERROR, data.error), 200);
         }
       } else {
@@ -409,7 +398,6 @@ class LiveQueryClient extends EventEmitter {
         this._handleReconnect();
       }
       break;
-    }
     case OP_EVENTS.UNSUBSCRIBED:
       // We have already deleted subscription in unsubscribe(), do nothing here
       break;