Browse Source

Fixing an issue with page not loading.

pull/4023/head
mike12345567 5 years ago
parent
commit
dfd1815041
  1. 7
      packages/server/src/utilities/workerRequests.js
  2. 1318
      packages/server/yarn.lock

7
packages/server/src/utilities/workerRequests.js

@ -9,7 +9,8 @@ function getAppRole(appId, user) {
if (!user.roles) {
return user
}
user.roleId = user.roles[appId]
// always use the deployed app
user.roleId = user.roles[getDeployedAppID(appId)]
if (!user.roleId) {
user.roleId = BUILTIN_ROLE_IDS.PUBLIC
}
@ -97,8 +98,7 @@ exports.deleteGlobalUser = async (ctx, globalId) => {
}
exports.getGlobalUsers = async (ctx, appId = null, globalId = null) => {
// always use the deployed app
appId = getDeployedAppID(appId)
const endpoint = globalId
? `/api/admin/users/${globalId}`
: `/api/admin/users`
@ -136,7 +136,6 @@ exports.getGlobalSelf = async (ctx, appId = null) => {
}
exports.addAppRoleToUser = async (ctx, appId, roleId, userId = null) => {
appId = getDeployedAppID(appId)
let user,
endpoint,
body = {}

1318
packages/server/yarn.lock

File diff suppressed because it is too large
Loading…
Cancel
Save