Update ParseLiveQueryServer.js

Author: dblythy

src/LiveQuery/ParseLiveQueryServer.js

@@ -171,7 +171,9 @@ class ParseLiveQueryServer {
             const trigger = getTrigger(className, 'afterEvent', Parse.applicationId);
             if (trigger) {
               const auth = await this.getAuthFromClient(client, requestId);
-              res.user = auth.user;
+              if (auth && auth.user) {
+                res.user = auth.user;
+              }
               if (res.object) {
                 res.object = Parse.Object.fromJSON(res.object);
               }
@@ -319,7 +321,9 @@ class ParseLiveQueryServer {
                 res.original = Parse.Object.fromJSON(res.original);
               }
               const auth = await this.getAuthFromClient(client, requestId);
-              res.user = auth.user;
+              if (auth && auth.user) {
+                res.user = auth.user;
+              }
               await runTrigger(trigger, `afterEvent.${className}`, res, auth);
             }
             if (!res.sendEvent) {
@@ -592,8 +596,11 @@ class ParseLiveQueryServer {
     if (!sessionToken) {
       sessionToken = getSessionFromClient();
     }
+    if (!sessionToken) {
+      return;
+    }
     const { auth } = await this.getAuthForSessionToken(sessionToken);
-    return auth || {};
+    return auth;
   }
 
   async _matchesACL(acl: any, client: any, requestId: number): Promise<boolean> {
@@ -649,7 +656,9 @@ class ParseLiveQueryServer {
       const trigger = getTrigger('@Connect', 'beforeConnect', Parse.applicationId);
       if (trigger) {
         const auth = await this.getAuthFromClient(client, request.requestId, req.sessionToken);
-        req.user = auth.user;
+        if (auth && auth.user) {
+          req.user = auth.user;
+        }
         await runTrigger(trigger, `beforeConnect.@Connect`, req, auth);
       }
       parseWebsocket.clientId = clientId;
@@ -708,7 +717,9 @@ class ParseLiveQueryServer {
       const trigger = getTrigger(className, 'beforeSubscribe', Parse.applicationId);
       if (trigger) {
         const auth = await this.getAuthFromClient(client, request.requestId, request.sessionToken);
-        request.user = auth.user;
+        if (auth && auth.user) {
+          request.user = auth.user;
+        }
 
         const parseQuery = new Parse.Query(className);
         parseQuery.withJSON(request.query);