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

Don't perform account deletion check when self hosted

package.json

@@ -32,6 +32,7 @@
     "kill-port": "kill-port 4001",
     "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:server": "lerna run --parallel dev:builder --concurrency 1 --scope @budibase/worker --scope @budibase/server",
     "test": "lerna run test",
     "lint:eslint": "eslint packages",
     "lint:prettier": "prettier --check \"packages/**/*.{js,svelte}\"",

packages/server/nodemon.json

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

packages/worker/nodemon.json

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

packages/worker/package.json

@@ -15,7 +15,7 @@
     "run:docker": "node src/index.js",
     "build:docker": "docker build . -t worker-service",
     "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",
     "env:multi:enable": "node scripts/multiTenancy.js enable",
     "env:multi:disable": "node scripts/multiTenancy.js disable",

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