From 467cc27f47e903ad25d25d76cfc9861b77651dea Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 30 Jun 2022 11:28:52 +0100 Subject: [PATCH] Add env vars to automatically create initial admin user on first run --- hosting/.env | 6 ++++- hosting/docker-compose.yaml | 2 ++ packages/server/scripts/dev/manage.js | 2 ++ packages/server/src/app.ts | 25 ++++++++++++++++++- packages/server/src/environment.js | 2 ++ .../server/src/utilities/workerRequests.js | 16 ++++++++++++ 6 files changed, 51 insertions(+), 2 deletions(-) diff --git a/hosting/.env b/hosting/.env index 39df76d01e..11dd661bf1 100644 --- a/hosting/.env +++ b/hosting/.env @@ -18,4 +18,8 @@ MINIO_PORT=4004 COUCH_DB_PORT=4005 REDIS_PORT=6379 WATCHTOWER_PORT=6161 -BUDIBASE_ENVIRONMENT=PRODUCTION \ No newline at end of file +BUDIBASE_ENVIRONMENT=PRODUCTION + +# An admin user can be automatically created initially if these are set +BB_ADMIN_USER_EMAIL= +BB_ADMIN_USER_PASSWORD= \ No newline at end of file diff --git a/hosting/docker-compose.yaml b/hosting/docker-compose.yaml index f9d9eaf1c5..57cbf33709 100644 --- a/hosting/docker-compose.yaml +++ b/hosting/docker-compose.yaml @@ -23,6 +23,8 @@ services: ENABLE_ANALYTICS: "true" REDIS_URL: redis-service:6379 REDIS_PASSWORD: ${REDIS_PASSWORD} + BB_ADMIN_USER_EMAIL: ${BB_ADMIN_USER_EMAIL} + BB_ADMIN_USER_PASSWORD: ${BB_ADMIN_USER_PASSWORD} depends_on: - worker-service - redis-service diff --git a/packages/server/scripts/dev/manage.js b/packages/server/scripts/dev/manage.js index b5cce1c58b..fc9fde0a02 100644 --- a/packages/server/scripts/dev/manage.js +++ b/packages/server/scripts/dev/manage.js @@ -56,6 +56,8 @@ async function init() { DISABLE_THREADING: 1, SERVICE: "app-service", DEPLOYMENT_ENVIRONMENT: "development", + BB_ADMIN_USER_EMAIL: "", + BB_ADMIN_USER_PASSWORD: "", } let envFile = "" Object.keys(envFileJson).forEach(key => { diff --git a/packages/server/src/app.ts b/packages/server/src/app.ts index d19ad1625a..733fa5afdf 100644 --- a/packages/server/src/app.ts +++ b/packages/server/src/app.ts @@ -18,7 +18,9 @@ const { logAlert } = require("@budibase/backend-core/logging") const { Thread } = require("./threads") import redis from "./utilities/redis" import * as migrations from "./migrations" -import { events, installation } from "@budibase/backend-core" +import { events, installation, tenancy } from "@budibase/backend-core" +import { createAdminUser, getChecklist } from "./utilities/workerRequests" +import { DEFAULT_TENANT_ID } from "@budibase/backend-core/dist/src/constants" const app = new Koa() @@ -110,6 +112,27 @@ module.exports = server.listen(env.PORT || 0, async () => { } } + // check and create admin user if required + if ( + env.SELF_HOSTED && + !env.MULTI_TENANCY && + env.BB_ADMIN_USER_EMAIL && + env.BB_ADMIN_USER_PASSWORD + ) { + const checklist = await getChecklist() + if (!checklist?.adminUser?.checked) { + await createAdminUser( + env.BB_ADMIN_USER_EMAIL, + env.BB_ADMIN_USER_PASSWORD, + "default" + ) + console.log( + "Admin account automatically created for", + env.BB_ADMIN_USER_EMAIL + ) + } + } + // check for version updates await installation.checkInstallVersion() diff --git a/packages/server/src/environment.js b/packages/server/src/environment.js index bf7e7f4709..cba81d913e 100644 --- a/packages/server/src/environment.js +++ b/packages/server/src/environment.js @@ -74,6 +74,8 @@ module.exports = { DYNAMO_ENDPOINT: process.env.DYNAMO_ENDPOINT, QUERY_THREAD_TIMEOUT: parseIntSafe(process.env.QUERY_THREAD_TIMEOUT), SQL_MAX_ROWS: process.env.SQL_MAX_ROWS, + BB_ADMIN_USER_EMAIL: process.env.BB_ADMIN_USER_EMAIL, + BB_ADMIN_USER_PASSWORD: process.env.BB_ADMIN_USER_PASSWORD, // flags ALLOW_DEV_AUTOMATIONS: process.env.ALLOW_DEV_AUTOMATIONS, DISABLE_THREADING: process.env.DISABLE_THREADING, diff --git a/packages/server/src/utilities/workerRequests.js b/packages/server/src/utilities/workerRequests.js index 1ee975f13e..cbecb2c4b5 100644 --- a/packages/server/src/utilities/workerRequests.js +++ b/packages/server/src/utilities/workerRequests.js @@ -137,3 +137,19 @@ exports.readGlobalUser = async ctx => { ) return checkResponse(response, "get user", { ctx }) } + +exports.createAdminUser = async (email, password, tenantId) => { + const response = await fetch( + checkSlashesInUrl(env.WORKER_URL + "/api/global/users/init"), + request(null, { method: "POST", body: { email, password, tenantId } }) + ) + return checkResponse(response, "create admin user") +} + +exports.getChecklist = async () => { + const response = await fetch( + checkSlashesInUrl(env.WORKER_URL + "/api/global/configs/checklist"), + request(null, { method: "GET" }) + ) + return checkResponse(response, "get checklist") +}