Browse Source

Don't perform account deletion check when self hosted

master
Rory Powell 5 years ago
parent
commit
c0d46262bf
  1. 2
      packages/builder/cypress/support/commands.js
  2. 18
      packages/worker/src/api/controllers/global/users.js

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

@ -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

@ -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")
}
}
}

Loading…
Cancel
Save