Update ParseLiveQueryServer.js

Author: dblythy

src/LiveQuery/ParseLiveQueryServer.js

@@ -170,7 +170,10 @@ class ParseLiveQueryServer {
             };
             const trigger = getTrigger(className, 'afterEvent', Parse.applicationId);
             if (trigger) {
-              const auth = await this.getAuthFromClient(client, res, requestId);
+              const auth = await this.getAuthFromClient(client, requestId);
+              if (auth && auth.user) {
+                res.user = auth.user;
+              }
               if (res.object) {
                 res.object = Parse.Object.fromJSON(res.object);
               }
@@ -317,7 +320,10 @@ class ParseLiveQueryServer {
               if (res.original) {
                 res.original = Parse.Object.fromJSON(res.original);
               }
-              const auth = await this.getAuthFromClient(client, res, requestId);
+              const auth = await this.getAuthFromClient(client, requestId);
+              if (auth && auth.user) {
+                res.user = auth.user;
+              }
               await runTrigger(trigger, `afterEvent.${className}`, res, auth);
             }
             if (!res.sendEvent) {
@@ -579,7 +585,7 @@ class ParseLiveQueryServer {
       });
   }
 
-  async getAuthFromClient(client: any, res: any, requestId: number, sessionToken: string) {
+  async getAuthFromClient(client: any, requestId: number, sessionToken: string) {
     const getSessionFromClient = () => {
       const subscriptionInfo = client.getSubscriptionInfo(requestId);
       if (typeof subscriptionInfo === 'undefined') {
@@ -591,9 +597,6 @@ class ParseLiveQueryServer {
       sessionToken = getSessionFromClient();
     }
     const { auth } = await this.getAuthForSessionToken(sessionToken);
-    if (auth && auth.user) {
-      res.user = auth.user;
-    }
     return auth;
   }
 
@@ -649,7 +652,10 @@ class ParseLiveQueryServer {
       };
       const trigger = getTrigger('@Connect', 'beforeConnect', Parse.applicationId);
       if (trigger) {
-        const auth = await this.getAuthFromClient(client, req, request.requestId, req.sessionToken);
+        const auth = await this.getAuthFromClient(client, request.requestId, req.sessionToken);
+        if (auth && auth.user) {
+          req.user = auth.user;
+        }
         await runTrigger(trigger, `beforeConnect.@Connect`, req, auth);
       }
       parseWebsocket.clientId = clientId;
@@ -707,12 +713,10 @@ class ParseLiveQueryServer {
     try {
       const trigger = getTrigger(className, 'beforeSubscribe', Parse.applicationId);
       if (trigger) {
-        const auth = await this.getAuthFromClient(
-          client,
-          request,
-          request.requestId,
-          request.sessionToken
-        );
+        const auth = await this.getAuthFromClient(client, request.requestId, request.sessionToken);
+        if (auth && auth.user) {
+          request.user = auth.user;
+        }
 
         const parseQuery = new Parse.Query(className);
         parseQuery.withJSON(request.query);