Update ParseLiveQueryServer.js

Author: dblythy

src/LiveQuery/ParseLiveQueryServer.js

@@ -578,15 +578,17 @@ class ParseLiveQueryServer {
         return false;
       });
   }
-  async getAuthFromClient(client: any, res: any, requestId: number) {
+  async getAuthFromClient(client: any, res: any, requestId: number, sessionToken: string) {
     const getSessionFromClient = () => {
       const subscriptionInfo = client.getSubscriptionInfo(requestId);
       if (typeof subscriptionInfo === 'undefined') {
         return client.sessionToken;
       }
       return subscriptionInfo.sessionToken || client.sessionToken;
     };
-    const sessionToken = getSessionFromClient();
+    if (!sessionToken) {
+      sessionToken = getSessionFromClient();
+    }
     const { auth } = await this.getAuthForSessionToken(sessionToken);
     if (auth && auth.user) {
       res.user = auth.user;
@@ -645,10 +647,7 @@ class ParseLiveQueryServer {
       };
       const trigger = getTrigger('@Connect', 'beforeConnect', Parse.applicationId);
       if (trigger) {
-        const { auth } = await this.getAuthForSessionToken(req.sessionToken);
-        if (auth && auth.user) {
-          req.user = auth.user;
-        }
+        const auth = await this.getAuthFromClient(client, req, request.requestId, req.sessionToken);
         await runTrigger(trigger, `beforeConnect.@Connect`, req, auth);
       }
       parseWebsocket.clientId = clientId;
@@ -706,10 +705,12 @@ class ParseLiveQueryServer {
     try {
       const trigger = getTrigger(className, 'beforeSubscribe', Parse.applicationId);
       if (trigger) {
-        const { auth } = await this.getAuthForSessionToken(request.sessionToken);
-        if (auth && auth.user) {
-          request.user = auth.user;
-        }
+        const auth = await this.getAuthFromClient(
+          client,
+          request,
+          request.requestId,
+          request.sessionToken
+        );
 
         const parseQuery = new Parse.Query(className);
         parseQuery.withJSON(request.query);