Formatting.

packages/server/src/api/controllers/user.js

@@ -4,9 +4,7 @@ const {
   getUserMetadataParams,
 } = require("../../db/utils")
 const { InternalTables } = require("../../db/utils")
-const {
+const { addAppRoleToUser } = require("../../utilities/workerRequests")
-  addAppRoleToUser,
-} = require("../../utilities/workerRequests")
 const { getGlobalUsers, getGlobalUser } = require("../../utilities/global")
 const { getFullUser } = require("../../utilities/users")
 

packages/server/src/db/linkedRows/index.js

@@ -11,10 +11,7 @@ const {
 const { flatten } = require("lodash")
 const CouchDB = require("../../db")
 const { FieldTypes } = require("../../constants")
-const {
+const { getMultiIDParams, USER_METDATA_PREFIX } = require("../../db/utils")
-  getMultiIDParams,
-  USER_METDATA_PREFIX,
-} = require("../../db/utils")
 const { partition } = require("lodash")
 const { getGlobalUsers } = require("../../utilities/global")
 
@@ -70,20 +67,21 @@ async function getFullLinkedDocs(appId, links) {
     row => row.doc
   )
   // need to handle users as specific cases
-  let [users, other] = partition(linked, linkRow => linkRow._id.startsWith(USER_METDATA_PREFIX))
+  let [users, other] = partition(linked, linkRow =>
+    linkRow._id.startsWith(USER_METDATA_PREFIX)
+  )
   const globalUsers = await getGlobalUsers(appId, users)
   users = users.map(user => {
-    const globalUser = globalUsers.find(globalUser => globalUser && user._id.includes(globalUser._id))
+    const globalUser = globalUsers.find(
+      globalUser => globalUser && user._id.includes(globalUser._id)
+    )
     return {
       ...globalUser,
       // doing user second overwrites the id and rev (always metadata)
       ...user,
     }
   })
-  return [
+  return [...other, ...users]
-    ...other,
-    ...users,
-  ]
 }
 
 /**

packages/server/src/utilities/global.js

@@ -43,16 +43,22 @@ exports.getGlobalUsers = async (appId = null, users = null) => {
       row => row.doc
     )
   } else {
-    globalUsers = (await db.allDocs(getGlobalUserParams(null,{
+    globalUsers = (
-      include_docs: true,
+      await db.allDocs(
-    }))).rows.map(row => row.doc)
+        getGlobalUserParams(null, {
+          include_docs: true,
+        })
+      )
+    ).rows.map(row => row.doc)
   }
-  globalUsers = globalUsers.filter(user => user != null).map(user => {
+  globalUsers = globalUsers
-    delete user.password
+    .filter(user => user != null)
-    return user
+    .map(user => {
-  })
+      delete user.password
+      return user
+    })
   if (!appId) {
     return globalUsers
   }
   return globalUsers.map(user => exports.updateAppRole(appId, user))
-}
+}