CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-06-16 09:25:12 +12:00
Code Issues Projects Releases Wiki Activity

Fixing userId storage to redis and making sure lockedBy property never stored.

Browse source
This commit is contained in:
mike12345567 2021-05-13 14:17:04 +01:00
parent 31901c89f8
commit 28a7282a8b
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
packages/server/src/api/controllers/application.js
View file

@ -138,6 +138,9 @@ exports.fetch = async function (ctx) {
const lock = locks.find(lock => lock.appId === app._id)
if (lock) {
app.lockedBy = lock.user
} else {
// make sure its definitely not present
delete app.lockedBy
}
}
}
@ -222,6 +225,12 @@ exports.update = async function (ctx) {
const data = ctx.request.body
const newData = { ...application, ...data, url }
// the locked by property is attached by server but generated from
// Redis, shouldn't ever store it
if (newData.lockedBy) {
delete newData.lockedBy
}
const response = await db.put(newData)
data._rev = response.rev

4
packages/server/src/utilities/redis.js
View file

@ -32,9 +32,11 @@ exports.getAllLocks = async () => {
exports.updateLock = async (devAppId, user) => {
// make sure always global user ID
const globalId = getGlobalIDFromUserMetadataID(user._id)
const inputUser = {
...user,
_id: getGlobalIDFromUserMetadataID(user._id),
userId: globalId,
_id: globalId,
}
await devAppClient.store(devAppId, inputUser, APP_DEV_LOCK_SECONDS)
}