@budibase/worker 1.0.185-alpha.7 → 1.0.185

package/docker_run.sh

@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 if [[ -z $CLUSTER_MODE ]]; then
   yarn run:docker
 else

package/package.json

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

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/api/controllers/global/users.ts

@@ -12,7 +12,6 @@ const {
   getTenantId,
   getTenantUser,
   doesTenantExist,
-  doInTenant,
 } = require("@budibase/backend-core/tenancy")
 const { removeUserFromInfoDB } = require("@budibase/backend-core/deprovision")
 const { errors } = require("@budibase/backend-core")
@@ -42,73 +41,70 @@ const parseBooleanParam = (param: any) => {
 
 export const adminUser = async (ctx: any) => {
   const { email, password, tenantId } = ctx.request.body
-  await doInTenant(tenantId, async () => {
-    // account portal sends a pre-hashed password - honour param to prevent double hashing
-    const hashPassword = parseBooleanParam(ctx.request.query.hashPassword)
-    // account portal sends no password for SSO users
-    const requirePassword = parseBooleanParam(ctx.request.query.requirePassword)
-
-    if (await doesTenantExist(tenantId)) {
-      ctx.throw(403, "Organisation already exists.")
-    }
 
-    const response = await doWithGlobalDB(tenantId, async (db: any) => {
-      const response = await db.allDocs(
-        getGlobalUserParams(null, {
-          include_docs: true,
-        })
-      )
-      // write usage quotas for cloud
-      if (!env.SELF_HOSTED) {
-        // could be a scenario where it exists, make sure its clean
-        try {
-          const usageQuota = await db.get(
-            StaticDatabases.GLOBAL.docs.usageQuota
-          )
-          if (usageQuota) {
-            await db.remove(usageQuota._id, usageQuota._rev)
-          }
-        } catch (err) {
-          // don't worry about errors
+  // account portal sends a pre-hashed password - honour param to prevent double hashing
+  const hashPassword = parseBooleanParam(ctx.request.query.hashPassword)
+  // account portal sends no password for SSO users
+  const requirePassword = parseBooleanParam(ctx.request.query.requirePassword)
+
+  if (await doesTenantExist(tenantId)) {
+    ctx.throw(403, "Organisation already exists.")
+  }
+
+  const response = await doWithGlobalDB(tenantId, async (db: any) => {
+    const response = await db.allDocs(
+      getGlobalUserParams(null, {
+        include_docs: true,
+      })
+    )
+    // write usage quotas for cloud
+    if (!env.SELF_HOSTED) {
+      // could be a scenario where it exists, make sure its clean
+      try {
+        const usageQuota = await db.get(StaticDatabases.GLOBAL.docs.usageQuota)
+        if (usageQuota) {
+          await db.remove(usageQuota._id, usageQuota._rev)
         }
-        await db.put(quotas.generateNewQuotaUsage())
+      } catch (err) {
+        // don't worry about errors
       }
-      return response
-    })
-
-    if (response.rows.some((row: any) => row.doc.admin)) {
-      ctx.throw(
-        403,
-        "You cannot initialise once an global user has been created."
-      )
+      await db.put(quotas.generateNewQuotaUsage())
     }
+    return response
+  })
 
-    const user = {
-      email: email,
-      password: password,
-      createdAt: Date.now(),
-      roles: {},
-      builder: {
-        global: true,
-      },
-      admin: {
-        global: true,
-      },
+  if (response.rows.some((row: any) => row.doc.admin)) {
+    ctx.throw(
+      403,
+      "You cannot initialise once an global user has been created."
+    )
+  }
+
+  const user = {
+    email: email,
+    password: password,
+    createdAt: Date.now(),
+    roles: {},
+    builder: {
+      global: true,
+    },
+    admin: {
+      global: true,
+    },
+    tenantId,
+  }
+  try {
+    const finalUser = await users.save(
+      user,
       tenantId,
-    }
-    try {
-      const finalUser = await users.save(
-        user,
-        tenantId,
-        hashPassword,
-        requirePassword
-      )
-      await bustCache(CacheKeys.CHECKLIST)
-      ctx.body = finalUser
-    } catch (err: any) {
-      ctx.throw(err.status || 400, err)
-    }
-  })
+      hashPassword,
+      requirePassword
+    )
+    await bustCache(CacheKeys.CHECKLIST)
+    ctx.body = finalUser
+  } catch (err: any) {
+    ctx.throw(err.status || 400, err)
+  }
 }
 
 export const destroy = async (ctx: any) => {

package/src/environment.js

@@ -27,40 +27,33 @@ function parseIntSafe(number) {
 }
 
 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,
-  // other
+  PLATFORM_URL: process.env.PLATFORM_URL,
+  COOKIE_DOMAIN: process.env.COOKIE_DOMAIN,
   CHECKLIST_CACHE_TTL: parseIntSafe(process.env.CHECKLIST_CACHE_TTL) || 3600,
+  APPS_URL: process.env.APPS_URL,
   _set(key, value) {
     process.env[key] = value
     module.exports[key] = value