@budibase/worker 1.0.167-alpha.7 → 1.0.168

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.167-alpha.7",
+  "version": "1.0.168",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -31,9 +31,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.167-alpha.7",
-    "@budibase/pro": "1.0.167-alpha.6",
-    "@budibase/string-templates": "^1.0.167-alpha.7",
+    "@budibase/backend-core": "^1.0.168",
+    "@budibase/pro": "1.0.167",
+    "@budibase/string-templates": "^1.0.168",
     "@koa/router": "^8.0.0",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "^0.3.0",
@@ -89,5 +89,5 @@
       "./scripts/jestSetup.js"
     ]
   },
-  "gitHead": "f392086bb3fbf4de55f9ca84c0e85eeaf7e1fd9e"
+  "gitHead": "7e71bec61d8581f453d2259a2189911c2ea42d41"
 }

package/src/api/controllers/global/configs.js

@@ -271,13 +271,14 @@ exports.configChecklist = async function (ctx) {
     const oidcConfig = await getScopedFullConfig(db, {
       type: Configs.OIDC,
     })
+
     // They have set up an global user
     const users = await db.allDocs(
       getGlobalUserParams(null, {
         include_docs: true,
+        limit: 1,
       })
     )
-    const adminUser = users.rows.some(row => row.doc.admin)
 
     ctx.body = {
       apps: {
@@ -291,7 +292,7 @@ exports.configChecklist = async function (ctx) {
         link: "/builder/portal/manage/email",
       },
       adminUser: {
-        checked: adminUser,
+        checked: users && users.rows.length >= 1,
         label: "Create your first user",
         link: "/builder/portal/manage/users",
       },

package/src/api/controllers/global/license.ts

@@ -25,5 +25,6 @@ export const getInfo = async (ctx: any) => {
 }
 
 export const getQuotaUsage = async (ctx: any) => {
-  ctx.body = await quotas.getQuotaUsage()
+  const usage = await quotas.getQuotaUsage()
+  ctx.body = usage
 }

package/src/api/controllers/global/self.js

@@ -75,8 +75,8 @@ const checkCurrentApp = ctx => {
 const addSessionAttributesToUser = ctx => {
   ctx.body.account = ctx.user.account
   ctx.body.license = ctx.user.license
-  ctx.body.budibaseAccess = !!ctx.user.budibaseAccess
-  ctx.body.accountPortalAccess = !!ctx.user.accountPortalAccess
+  ctx.body.budibaseAccess = ctx.user.budibaseAccess
+  ctx.body.accountPortalAccess = ctx.user.accountPortalAccess
   ctx.body.csrfToken = ctx.user.csrfToken
 }
 

package/src/environment.js

@@ -1,3 +1,5 @@
+const { join } = require("path")
+
 function isDev() {
   return process.env.NODE_ENV !== "production"
 }
@@ -12,43 +14,39 @@ function isTest() {
 
 let LOADED = false
 if (!LOADED && isDev() && !isTest()) {
-  require("dotenv").config()
+  require("dotenv").config({
+    path: join(__dirname, "..", ".env"),
+  })
   LOADED = true
 }
 
 module.exports = {
-  // auth
+  NODE_ENV: process.env.NODE_ENV,
+  SELF_HOSTED: !!parseInt(process.env.SELF_HOSTED),
+  PORT: process.env.PORT || process.env.WORKER_PORT,
+  CLUSTER_PORT: process.env.CLUSTER_PORT,
   MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
   MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
+  MINIO_URL: process.env.MINIO_URL,
+  COUCH_DB_URL: process.env.COUCH_DB_URL,
+  LOG_LEVEL: process.env.LOG_LEVEL,
   JWT_SECRET: process.env.JWT_SECRET,
   SALT_ROUNDS: process.env.SALT_ROUNDS,
+  REDIS_URL: process.env.REDIS_URL,
   REDIS_PASSWORD: process.env.REDIS_PASSWORD,
   INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
-  COOKIE_DOMAIN: process.env.COOKIE_DOMAIN,
-  // urls
-  MINIO_URL: process.env.MINIO_URL,
-  COUCH_DB_URL: process.env.COUCH_DB_URL,
-  REDIS_URL: process.env.REDIS_URL,
-  ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL,
-  PLATFORM_URL: process.env.PLATFORM_URL,
-  APPS_URL: process.env.APPS_URL,
-  // ports
-  PORT: process.env.PORT || process.env.WORKER_PORT,
-  CLUSTER_PORT: process.env.CLUSTER_PORT,
-  // flags
-  NODE_ENV: process.env.NODE_ENV,
-  SELF_HOSTED: !!parseInt(process.env.SELF_HOSTED),
-  LOG_LEVEL: process.env.LOG_LEVEL,
   MULTI_TENANCY: process.env.MULTI_TENANCY,
   DISABLE_ACCOUNT_PORTAL: process.env.DISABLE_ACCOUNT_PORTAL,
+  ACCOUNT_PORTAL_URL: process.env.ACCOUNT_PORTAL_URL,
   SMTP_FALLBACK_ENABLED: process.env.SMTP_FALLBACK_ENABLED,
-  DISABLE_DEVELOPER_LICENSE: process.env.DISABLE_DEVELOPER_LICENSE,
-  // smtp
   SMTP_USER: process.env.SMTP_USER,
   SMTP_PASSWORD: process.env.SMTP_PASSWORD,
   SMTP_HOST: process.env.SMTP_HOST,
   SMTP_PORT: process.env.SMTP_PORT,
   SMTP_FROM_ADDRESS: process.env.SMTP_FROM_ADDRESS,
+  PLATFORM_URL: process.env.PLATFORM_URL,
+  COOKIE_DOMAIN: process.env.COOKIE_DOMAIN,
+  APPS_URL: process.env.APPS_URL,
   _set(key, value) {
     process.env[key] = value
     module.exports[key] = value