MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3389 from Budibase/fix/sync-issue 

Quick fix for sync issue
This commit is contained in:
Michael Drury 2021-11-15 17:37:59 +00:00 committed by GitHub
parent 3a8e08d3cc 0f54787072
commit b391684128
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/server/src/api/controllers/user.js
View File

@ -97,6 +97,7 @@ exports.syncUser = async function (ctx) {
.map(([appId]) => appId) .map(([appId]) => appId)
} }
for (let prodAppId of prodAppIds) { for (let prodAppId of prodAppIds) {
const roleId = roles[prodAppId]
const devAppId = getDevelopmentAppID(prodAppId) const devAppId = getDevelopmentAppID(prodAppId)
for (let appId of [prodAppId, devAppId]) { for (let appId of [prodAppId, devAppId]) {
if (!(await doesDatabaseExist(appId))) { if (!(await doesDatabaseExist(appId))) {
@ -115,19 +116,23 @@ exports.syncUser = async function (ctx) {
tableId: InternalTables.USER_METADATA, tableId: InternalTables.USER_METADATA,
} }
} }
let combined // assign the roleId for the metadata doc
if (deleting) { if (roleId) {
combined = { metadata.roleId = roleId
}
let combined = !deleting
? combineMetadataAndUser(user, metadata)
: {
...metadata, ...metadata,
status: UserStatus.INACTIVE, status: UserStatus.INACTIVE,
metadata: BUILTIN_ROLE_IDS.PUBLIC, metadata: BUILTIN_ROLE_IDS.PUBLIC,
} }
} else { // if its null then there was no updates required
combined = combineMetadataAndUser(user, metadata) if (combined) {
}
await db.put(combined) await db.put(combined)
} }
} }
}
ctx.body = { ctx.body = {
message: "User synced.", message: "User synced.",
} }