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

Merge pull request #2959 from Budibase/wrap-account-check 

Don't perform account deletion check when self hosted
This commit is contained in:
Rory Powell 2021-10-12 13:10:58 +01:00 committed by GitHub
parent 5948aab953 728ee82791
commit 70ac21dcbf
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -32,6 +32,7 @@
"kill-port": "kill-port 4001", "kill-port": "kill-port 4001",
"dev": "yarn run kill-port && lerna link && lerna run --parallel dev:builder --concurrency 1", "dev": "yarn run kill-port && lerna link && lerna run --parallel dev:builder --concurrency 1",
"dev:noserver": "lerna link && lerna run dev:stack:up && lerna run --parallel dev:builder --concurrency 1 --ignore @budibase/server --ignore @budibase/worker", "dev:noserver": "lerna link && lerna run dev:stack:up && lerna run --parallel dev:builder --concurrency 1 --ignore @budibase/server --ignore @budibase/worker",
"dev:server": "lerna run --parallel dev:builder --concurrency 1 --scope @budibase/worker --scope @budibase/server",
"test": "lerna run test", "test": "lerna run test",
"lint:eslint": "eslint packages", "lint:eslint": "eslint packages",
"lint:prettier": "prettier --check \"packages/**/*.{js,svelte}\"", "lint:prettier": "prettier --check \"packages/**/*.{js,svelte}\"",

2
packages/server/nodemon.json
View File

@ -1,5 +1,5 @@
{ {
"watch": ["src"], "watch": ["src", "../auth"],
"ext": "js,ts,json", "ext": "js,ts,json",
"ignore": ["src/**/*.spec.ts", "src/**/*.spec.js"], "ignore": ["src/**/*.spec.ts", "src/**/*.spec.js"],
"exec": "ts-node src/index.ts" "exec": "ts-node src/index.ts"

3
packages/worker/nodemon.json Normal file
View File

@ -0,0 +1,3 @@
{
"watch": ["src", "../auth"]
}

2
packages/worker/package.json
View File

@ -15,7 +15,7 @@
"run:docker": "node src/index.js", "run:docker": "node src/index.js",
"build:docker": "docker build . -t worker-service", "build:docker": "docker build . -t worker-service",
"dev:stack:init": "node ./scripts/dev/manage.js init", "dev:stack:init": "node ./scripts/dev/manage.js init",
"dev:builder": "npm run dev:stack:init && nodemon src/index.js", "dev:builder": "npm run dev:stack:init && nodemon",
"test": "jest --runInBand", "test": "jest --runInBand",
"env:multi:enable": "node scripts/multiTenancy.js enable", "env:multi:enable": "node scripts/multiTenancy.js enable",
"env:multi:disable": "node scripts/multiTenancy.js disable", "env:multi:disable": "node scripts/multiTenancy.js disable",

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

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