CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-06-28 11:00:55 +12:00
Code Issues Projects Releases Wiki Activity

Don't perform account deletion check when self hosted

Browse source
This commit is contained in:
Rory Powell 2021-10-11 11:14:44 +01:00
parent 6da4e25f0a
commit 9ea1774bcf
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/builder/cypress/support/commands.js
View file

@ -5,7 +5,7 @@
// ***********************************************
//
Cypress.on('uncaught:exception', (err, runnable) => {
Cypress.on("uncaught:exception", () => {
return false
})

18
packages/worker/src/api/controllers/global/users.js
View file

@ -111,14 +111,16 @@ exports.destroy = async ctx => {
const db = getGlobalDB()
const dbUser = await db.get(ctx.params.id)
// root account holder can't be deleted from inside budibase
const email = dbUser.email
const account = await accounts.getAccount(email)
if (account) {
if (email === ctx.user.email) {
ctx.throw(400, 'Please visit "Account" to delete this user')
} else {
ctx.throw(400, "Account holder cannot be deleted")
if (!env.SELF_HOSTED && !env.DISABLE_ACCOUNT_PORTAL) {
// root account holder can't be deleted from inside budibase
const email = dbUser.email
const account = await accounts.getAccount(email)
if (account) {
if (email === ctx.user.email) {
ctx.throw(400, 'Please visit "Account" to delete this user')
} else {
ctx.throw(400, "Account holder cannot be deleted")
}
}
}