PR Comment fixes...

Author: Arthur Cinader

src/RestQuery.js

@@ -387,14 +387,30 @@ RestQuery.prototype.replaceDontSelect = function() {
 };
 
 const cleanResultOfSensitiveUserInfo = function (result, auth, config) {
-  if (auth.isMaster || ( auth.user && auth.user.id === result.objectId)) {
+  delete result.password;
+
+  if (auth.isMaster || (auth.user && auth.user.id === result.objectId)) {
     return;
   }
 
   for (const field of config.userSensitiveFields) {
     delete result[field];
   }
-}
+};
+
+const cleanResultAuthData = function (result) {
+  if (result.authData) {
+    Object.keys(result.authData).forEach((provider) => {
+      if (result.authData[provider] === null) {
+        delete result.authData[provider];
+      }
+    });
+
+    if (Object.keys(result.authData).length == 0) {
+      delete result.authData;
+    }
+  }
+};
 
 // Returns a promise for whether it was successful.
 // Populates this.response with an object that only has 'results'.
@@ -416,18 +432,8 @@ RestQuery.prototype.runFind = function(options = {}) {
     this.className, this.restWhere, findOptions).then((results) => {
       if (this.className === '_User') {
         for (var result of results) {
-          delete result.password;
           cleanResultOfSensitiveUserInfo(result, this.auth, this.config);
-          if (result.authData) {
-            Object.keys(result.authData).forEach((provider) => {
-              if (result.authData[provider] === null) {
-                delete result.authData[provider];
-              }
-            });
-            if (Object.keys(result.authData).length == 0) {
-              delete result.authData;
-            }
-          }
+          cleanResultAuthData(result);
         }
       }