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

Merge pull request #4237 from Budibase/fix/app-update 

Fix app update endpoint
This commit is contained in:
Rory Powell 2022-01-28 15:04:48 +00:00 committed by GitHub
parent a3e5c5af7f d5e5e5fd93
commit a91c56c802
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/server/src/api/controllers/application.js
View File

@ -81,12 +81,13 @@ async function getAppUrl(ctx) {
if (ctx.request.body.url) { if (ctx.request.body.url) {
// if the url is provided, use that // if the url is provided, use that
url = encodeURI(ctx.request.body.url) url = encodeURI(ctx.request.body.url)
} else { } else if (ctx.request.body.name) {
// otherwise use the name // otherwise use the name
url = encodeURI(`${ctx.request.body.name}`) url = encodeURI(`${ctx.request.body.name}`)
} }
url = `/${url.replace(URL_REGEX_SLASH, "")}`.toLowerCase() if (url) {
url = `/${url.replace(URL_REGEX_SLASH, "")}`.toLowerCase()
}
return url return url
} }
@ -276,16 +277,22 @@ exports.create = async ctx => {
ctx.body = newApplication ctx.body = newApplication
} }
// This endpoint currently operates as a PATCH rather than a PUT
// Thus name and url fields are handled only if present
exports.update = async ctx => { exports.update = async ctx => {
const apps = await getAllApps(CouchDB, { dev: true }) const apps = await getAllApps(CouchDB, { dev: true })
// validation // validation
const name = ctx.request.body.name const name = ctx.request.body.name
checkAppName(ctx, apps, name, ctx.params.appId) if (name) {
checkAppName(ctx, apps, name, ctx.params.appId)
}
const url = await getAppUrl(ctx) const url = await getAppUrl(ctx)
checkAppUrl(ctx, apps, url, ctx.params.appId) if (url) {
checkAppUrl(ctx, apps, url, ctx.params.appId)
ctx.request.body.url = url
}
const appPackageUpdates = { name, url } const data = await updateAppPackage(ctx.request.body, ctx.params.appId)
const data = await updateAppPackage(appPackageUpdates, ctx.params.appId)
ctx.status = 200 ctx.status = 200
ctx.body = data ctx.body = data
} }