From f20cc45bc3a65e615f041245147e6f19d951a989 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Mon, 4 Oct 2021 14:07:10 +0100 Subject: [PATCH 1/4] Deny only when usage quota is exceeded --- packages/server/src/utilities/usageQuota.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/utilities/usageQuota.js b/packages/server/src/utilities/usageQuota.js index 80fddb8303..1980b13ef0 100644 --- a/packages/server/src/utilities/usageQuota.js +++ b/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}.` ) From df0b3cc6de9aa3e700d044a96c5b48394d2c579e Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Mon, 4 Oct 2021 15:58:05 +0100 Subject: [PATCH 2/4] Fix backup SMTP --- packages/worker/src/utilities/email.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/worker/src/utilities/email.js b/packages/worker/src/utilities/email.js index 14c836952e..fb30591908 100644 --- a/packages/worker/src/utilities/email.js +++ b/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, From 07097f8fbc32d96a6f6f37bc583c18332b690cb5 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 4 Oct 2021 15:37:08 +0000 Subject: [PATCH 3/4] v0.9.150-alpha.1 --- lerna.json | 2 +- packages/auth/package.json | 2 +- packages/bbui/package.json | 2 +- packages/builder/package.json | 8 ++++---- packages/cli/package.json | 2 +- packages/client/package.json | 6 +++--- packages/server/package.json | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lerna.json b/lerna.json index 31acac22a6..1065bbcbf1 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.9.150-alpha.0", + "version": "0.9.150-alpha.1", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/auth/package.json b/packages/auth/package.json index e84b5a7029..fdc5e03181 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/auth", - "version": "0.9.150-alpha.0", + "version": "0.9.150-alpha.1", "description": "Authentication middlewares for budibase builder and apps", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index e9e4635509..5fe434ea74 100644 --- a/packages/bbui/package.json +++ b/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-alpha.0", + "version": "0.9.150-alpha.1", "license": "AGPL-3.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", diff --git a/packages/builder/package.json b/packages/builder/package.json index 3cbf160cbf..0a527ba5b6 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "0.9.150-alpha.0", + "version": "0.9.150-alpha.1", "license": "AGPL-3.0", "private": true, "scripts": { @@ -65,10 +65,10 @@ } }, "dependencies": { - "@budibase/bbui": "^0.9.150-alpha.0", - "@budibase/client": "^0.9.150-alpha.0", + "@budibase/bbui": "^0.9.150-alpha.1", + "@budibase/client": "^0.9.150-alpha.1", "@budibase/colorpicker": "1.1.2", - "@budibase/string-templates": "^0.9.150-alpha.0", + "@budibase/string-templates": "^0.9.150-alpha.1", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index cd6738f95b..59f508d3fc 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "0.9.150-alpha.0", + "version": "0.9.150-alpha.1", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 04ca81e005..58854afcf2 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "0.9.150-alpha.0", + "version": "0.9.150-alpha.1", "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-alpha.0", + "@budibase/bbui": "^0.9.150-alpha.1", "@budibase/standard-components": "^0.9.139", - "@budibase/string-templates": "^0.9.150-alpha.0", + "@budibase/string-templates": "^0.9.150-alpha.1", "regexparam": "^1.3.0", "shortid": "^2.2.15", "svelte-spa-router": "^3.0.5" diff --git a/packages/server/package.json b/packages/server/package.json index d6e7479100..dcb675efd8 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "0.9.150-alpha.0", + "version": "0.9.150-alpha.1", "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-alpha.0", - "@budibase/client": "^0.9.150-alpha.0", - "@budibase/string-templates": "^0.9.150-alpha.0", + "@budibase/auth": "^0.9.150-alpha.1", + "@budibase/client": "^0.9.150-alpha.1", + "@budibase/string-templates": "^0.9.150-alpha.1", "@elastic/elasticsearch": "7.10.0", "@koa/router": "8.0.0", "@sendgrid/mail": "7.1.1", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 822d3801f1..1ed8e5ae10 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "0.9.150-alpha.0", + "version": "0.9.150-alpha.1", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index 3121bac886..6edb9e9527 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "0.9.150-alpha.0", + "version": "0.9.150-alpha.1", "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-alpha.0", - "@budibase/string-templates": "^0.9.150-alpha.0", + "@budibase/auth": "^0.9.150-alpha.1", + "@budibase/string-templates": "^0.9.150-alpha.1", "@koa/router": "^8.0.0", "@techpass/passport-openidconnect": "^0.3.0", "aws-sdk": "^2.811.0", From ed6491933c26ade35a0d88d8f780c97e996e82ed Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 4 Oct 2021 15:58:42 +0000 Subject: [PATCH 4/4] v0.9.151-alpha.0 --- lerna.json | 2 +- packages/auth/package.json | 2 +- packages/bbui/package.json | 2 +- packages/builder/package.json | 8 ++++---- packages/cli/package.json | 2 +- packages/client/package.json | 6 +++--- packages/server/package.json | 8 ++++---- packages/string-templates/package.json | 2 +- packages/worker/package.json | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lerna.json b/lerna.json index e82eee8242..4f81990b7e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.9.150", + "version": "0.9.151-alpha.0", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/auth/package.json b/packages/auth/package.json index a72bd9df18..cffefeb291 100644 --- a/packages/auth/package.json +++ b/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", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index a04b100647..3544c5653a 100644 --- a/packages/bbui/package.json +++ b/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", diff --git a/packages/builder/package.json b/packages/builder/package.json index 44dc77c3db..5c98b5bb01 100644 --- a/packages/builder/package.json +++ b/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", diff --git a/packages/cli/package.json b/packages/cli/package.json index b596f6ac04..5d262579ed 100644 --- a/packages/cli/package.json +++ b/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": { diff --git a/packages/client/package.json b/packages/client/package.json index 606e4694e1..b65403a4b5 100644 --- a/packages/client/package.json +++ b/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" diff --git a/packages/server/package.json b/packages/server/package.json index 27b70f86d3..a67d52ba30 100644 --- a/packages/server/package.json +++ b/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", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index b73337f472..c07a5f2276 100644 --- a/packages/string-templates/package.json +++ b/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", diff --git a/packages/worker/package.json b/packages/worker/package.json index b28cfd831c..8b4224cc23 100644 --- a/packages/worker/package.json +++ b/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",