Merge pull request #2885 from Budibase/develop

develop -> master

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.9.150",
+  "version": "0.9.151-alpha.0",
   "npmClient": "yarn",
   "packages": [
     "packages/*"

packages/auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/auth",
-  "version": "0.9.150",
+  "version": "0.9.151-alpha.0",
   "description": "Authentication middlewares for budibase builder and apps",
   "main": "src/index.js",
   "author": "Budibase",

packages/bbui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "0.9.150",
+  "version": "0.9.151-alpha.0",
   "license": "AGPL-3.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",

packages/builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "0.9.150",
+  "version": "0.9.151-alpha.0",
   "license": "AGPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.150",
-    "@budibase/client": "^0.9.150",
+    "@budibase/bbui": "^0.9.151-alpha.0",
+    "@budibase/client": "^0.9.151-alpha.0",
     "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^0.9.150",
+    "@budibase/string-templates": "^0.9.151-alpha.0",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "0.9.150",
+  "version": "0.9.151-alpha.0",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "0.9.150",
+  "version": "0.9.151-alpha.0",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^0.9.150",
+    "@budibase/bbui": "^0.9.151-alpha.0",
     "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^0.9.150",
+    "@budibase/string-templates": "^0.9.151-alpha.0",
     "regexparam": "^1.3.0",
     "shortid": "^2.2.15",
     "svelte-spa-router": "^3.0.5"

packages/server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "0.9.150",
+  "version": "0.9.151-alpha.0",
   "description": "Budibase Web Server",
   "main": "src/index.js",
   "repository": {
@@ -66,9 +66,9 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.150",
-    "@budibase/client": "^0.9.150",
-    "@budibase/string-templates": "^0.9.150",
+    "@budibase/auth": "^0.9.151-alpha.0",
+    "@budibase/client": "^0.9.151-alpha.0",
+    "@budibase/string-templates": "^0.9.151-alpha.0",
     "@elastic/elasticsearch": "7.10.0",
     "@koa/router": "8.0.0",
     "@sendgrid/mail": "7.1.1",

packages/server/src/utilities/usageQuota.js

@@ -58,7 +58,7 @@ exports.update = async (property, usage) => {
     // increment the quota
     quota.usageQuota[property] += usage
 
-    if (quota.usageQuota[property] >= quota.usageLimits[property]) {
+    if (quota.usageQuota[property] > quota.usageLimits[property]) {
       throw new Error(
         `You have exceeded your usage quota of ${quota.usageLimits[property]} ${property}.`
       )

packages/string-templates/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "0.9.150",
+  "version": "0.9.151-alpha.0",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",

packages/worker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "0.9.150",
+  "version": "0.9.151-alpha.0",
   "description": "Budibase background service",
   "main": "src/index.js",
   "repository": {
@@ -27,8 +27,8 @@
   "author": "Budibase",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
-    "@budibase/auth": "^0.9.150",
-    "@budibase/string-templates": "^0.9.150",
+    "@budibase/auth": "^0.9.151-alpha.0",
+    "@budibase/string-templates": "^0.9.151-alpha.0",
     "@koa/router": "^8.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",
     "aws-sdk": "^2.811.0",

packages/worker/src/utilities/email.js

@@ -113,7 +113,7 @@ async function getSmtpConfiguration(db, workspaceId = null, automation) {
     params.workspace = workspaceId
   }
 
-  const customConfig = getScopedConfig(db, params)
+  const customConfig = await getScopedConfig(db, params)
 
   if (customConfig) {
     return customConfig
@@ -125,6 +125,7 @@ async function getSmtpConfiguration(db, workspaceId = null, automation) {
       port: env.SMTP_PORT,
       host: env.SMTP_HOST,
       secure: false,
+      from: env.SMTP_FROM_ADDRESS,
       auth: {
         user: env.SMTP_USER,
         pass: env.SMTP_PASSWORD,