CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-07-01 12:30:41 +12:00
Code Issues Projects Releases Wiki Activity

Updating configs API based on some feedback during the development of the settings frontend.

Browse source
This commit is contained in:
mike12345567 2021-05-05 15:59:24 +01:00
parent 3812a31a22
commit 4d49fd4da0
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
packages/worker/src/api/controllers/admin/configs.js
View file

@ -48,7 +48,7 @@ exports.save = async function (ctx) {
exports.fetch = async function (ctx) {
const db = new CouchDB(GLOBAL_DB)
const response = await db.allDocs(
getConfigParams(undefined, {
getConfigParams({ type: ctx.params.type }, {
include_docs: true,
})
)
@ -61,11 +61,10 @@ exports.fetch = async function (ctx) {
*/
exports.find = async function (ctx) {
const db = new CouchDB(GLOBAL_DB)
const userId = ctx.params.user && ctx.params.user._id
const { group } = ctx.query
if (group) {
const group = await db.get(group)
const { userId, groupId } = ctx.query
if (groupId && userId) {
const group = await db.get(groupId)
const userInGroup = group.users.some(groupUser => groupUser === userId)
if (!ctx.user.admin && !userInGroup) {
ctx.throw(400, `User is not in specified group: ${group}.`)
@ -77,7 +76,7 @@ exports.find = async function (ctx) {
const scopedConfig = await determineScopedConfig(db, {
type: ctx.params.type,
user: userId,
group,
group: groupId,
})
if (scopedConfig) {

13
packages/worker/src/api/routes/admin/configs.js
View file

@ -54,14 +54,21 @@ function buildConfigSaveValidation() {
{ is: Configs.GOOGLE, then: googleValidation() }
],
}),
}),
}).required(),
)
}
function buildConfigGetValidation() {
// prettier-ignore
return joiValidator.params(Joi.object({
type: Joi.string().valid(...Object.values(Configs)).required()
}).unknown(true).required())
}
router
.post("/api/admin/configs", buildConfigSaveValidation(), controller.save)
.delete("/api/admin/configs/:id", controller.destroy)
.get("/api/admin/configs", controller.fetch)
.get("/api/admin/configs/:type", controller.find)
.get("/api/admin/configs/all/:type", buildConfigGetValidation(), controller.fetch)
.get("/api/admin/configs/:type", buildConfigGetValidation(), controller.find)
module.exports = router