feat: include sessionToken in onLiveQueryEvent

spec/ParseLiveQuery.spec.js

@@ -6,6 +6,36 @@ const validatorFail = () => {
 };
 
 describe('ParseLiveQuery', function () {
+  it('access user on onLiveQueryEvent disconnect', async done => {
+    await reconfigureServer({
+      liveQuery: {
+        classNames: ['TestObject'],
+      },
+      startLiveQueryServer: true,
+      verbose: false,
+      silent: true,
+    });
+    const requestedUser = new Parse.User();
+    requestedUser.setUsername('username');
+    requestedUser.setPassword('password');
+    Parse.Cloud.onLiveQueryEvent(req => {
+      const { event, sessionToken, user } = req;
+      if (event === 'ws_disconnect') {
+        expect(user).toBeDefined();
+        expect(user.id).toBe(requestedUser.id);
+        expect(user.get('username')).toBe('username');
+        expect(sessionToken).toBeDefined();
+        expect(sessionToken).toBe(requestedUser.getSessionToken());
+        done();
+      }
+    });
+    await requestedUser.signUp();
+    const query = new Parse.Query(TestObject);
+    await query.subscribe();
+    const client = await Parse.CoreManager.getLiveQueryController().getDefaultLiveQueryClient();
+    client.close();
+  });
+
   it('can subscribe to query', async done => {
     await reconfigureServer({
       liveQuery: {
@@ -28,6 +58,7 @@ describe('ParseLiveQuery', function () {
     object.set({ foo: 'bar' });
     await object.save();
   });
+
   it('expect afterEvent create', async done => {
     await reconfigureServer({
       liveQuery: {

src/LiveQuery/ParseLiveQueryServer.js

@@ -423,6 +423,7 @@ class ParseLiveQueryServer {
         subscriptions: this.subscriptions.size,
         useMasterKey: client.hasMasterKey,
         installationId: client.installationId,
+        sessionToken: client.sessionToken,
       });
     });
 

src/triggers.js

@@ -845,10 +845,18 @@ export function inflate(data, restObject) {
   return Parse.Object.fromJSON(copy);
 }
 
-export function runLiveQueryEventHandlers(data, applicationId = Parse.applicationId) {
-  if (!_triggerStore || !_triggerStore[applicationId] || !_triggerStore[applicationId].LiveQuery) {
+export async function runLiveQueryEventHandlers(data, applicationId = Parse.applicationId) {
+  if (
+    !_triggerStore ||
+    !_triggerStore[applicationId] ||
+    !_triggerStore[applicationId].LiveQuery ||
+    _triggerStore[applicationId].LiveQuery.length == 0
+  ) {
     return;
   }
+  if (data.sessionToken && !data.user) {
+    data.user = await userForSessionToken(data.sessionToken);
+  }
   _triggerStore[applicationId].LiveQuery.forEach(handler => handler(data));
 }
 
@@ -968,14 +976,10 @@ async function userForSessionToken(sessionToken) {
   }
   const q = new Parse.Query('_Session');
   q.equalTo('sessionToken', sessionToken);
+  q.include('user');
   const session = await q.first({ useMasterKey: true });
   if (!session) {
     return;
   }
-  const user = session.get('user');
-  if (!user) {
-    return;
-  }
-  await user.fetch({ useMasterKey: true });
-  return user;
+  return session.get('user');
 }