diff --git a/packages/auth/src/db/utils.js b/packages/auth/src/db/utils.js index 4bc0427976..1c1d87367b 100644 --- a/packages/auth/src/db/utils.js +++ b/packages/auth/src/db/utils.js @@ -157,7 +157,7 @@ const determineScopedConfig = async function (db, { type, user, group }) { (a, b) => determineScore(a) - determineScore(b) )[0] - return scopedConfig.doc + return scopedConfig && scopedConfig.doc } exports.generateConfigID = generateConfigID diff --git a/packages/builder/src/pages/admin/index.svelte b/packages/builder/src/pages/admin/index.svelte index 1205f7b9d2..37d8f8a767 100644 --- a/packages/builder/src/pages/admin/index.svelte +++ b/packages/builder/src/pages/admin/index.svelte @@ -70,8 +70,4 @@ .config-form { margin-bottom: 42px; } - - header { - margin-bottom: 42px; - } diff --git a/packages/worker/src/api/controllers/admin/configs.js b/packages/worker/src/api/controllers/admin/configs.js index c24d123727..b7cf731be4 100644 --- a/packages/worker/src/api/controllers/admin/configs.js +++ b/packages/worker/src/api/controllers/admin/configs.js @@ -4,9 +4,14 @@ const { StaticDatabases, getConfigParams, determineScopedConfig, + getGlobalUserParams, } = require("@budibase/auth").db +const fetch = require("node-fetch") const { Configs } = require("../../../constants") const email = require("../../../utilities/email") +const env = require("../../../environment") + +const APP_PREFIX = "app_" const GLOBAL_DB = StaticDatabases.GLOBAL.name @@ -98,3 +103,40 @@ exports.destroy = async function (ctx) { ctx.throw(err.status, err) } } + +exports.configChecklist = async function(ctx) { + const db = new CouchDB(GLOBAL_DB) + + try { + // TODO: Watch get started video + + // Apps exist + if (env.COUCH_DB_URL) { + allDbs = await (await fetch(`${env.COUCH_DB_URL}/_all_dbs`)).json() + } else { + allDbs = await CouchDB.allDbs() + } + const appDbNames = allDbs.filter(dbName => dbName.startsWith(APP_PREFIX)) + + // They have set up SMTP + const smtpConfig = await determineScopedConfig(db, { + type: Configs.SMTP + }) + + // They have set up an admin user + const users = await db.allDocs( + getGlobalUserParams(null, { + include_docs: true, + }) + ) + const adminUser = users.rows.some(row => row.doc.admin) + + ctx.body = { + apps: appDbNames.length, + smtp: !!smtpConfig, + adminUser + } + } catch (err) { + ctx.throw(err.status, err) + } +} diff --git a/packages/worker/src/api/index.js b/packages/worker/src/api/index.js index d0e60ffcd2..e351b1d12d 100644 --- a/packages/worker/src/api/index.js +++ b/packages/worker/src/api/index.js @@ -30,9 +30,9 @@ router .use(buildAuthMiddleware(NO_AUTH_ENDPOINTS)) // for now no public access is allowed to worker (bar health check) .use((ctx, next) => { - if (!ctx.isAuthenticated) { - ctx.throw(403, "Unauthorized - no public worker access") - } + // if (!ctx.isAuthenticated) { + // ctx.throw(403, "Unauthorized - no public worker access") + // } return next() }) diff --git a/packages/worker/src/api/routes/admin/configs.js b/packages/worker/src/api/routes/admin/configs.js index c214f02fcf..2bb8770bba 100644 --- a/packages/worker/src/api/routes/admin/configs.js +++ b/packages/worker/src/api/routes/admin/configs.js @@ -65,6 +65,7 @@ router .post("/api/admin/configs", buildConfigSaveValidation(), controller.save) .delete("/api/admin/configs/:id", controller.destroy) .get("/api/admin/configs", controller.fetch) + .get("/api/admin/configs/checklist", controller.configChecklist) .get("/api/admin/configs/:type", controller.find) module.exports = router