From 51c63d72589b44bc4d27b2e120e71242cdf8f191 Mon Sep 17 00:00:00 2001 From: Michael Drury Date: Fri, 10 Mar 2023 15:19:46 +0000 Subject: [PATCH 1/3] Disable google auth if no config found (#9983) * Fix for #9937 - Google config was pre-activated always, even if no google config had been created. * Fixing test case. --- packages/worker/src/api/controllers/global/configs.ts | 2 +- packages/worker/src/api/routes/global/tests/configs.spec.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/worker/src/api/controllers/global/configs.ts b/packages/worker/src/api/controllers/global/configs.ts index 02459855c2..4f4575074b 100644 --- a/packages/worker/src/api/controllers/global/configs.ts +++ b/packages/worker/src/api/controllers/global/configs.ts @@ -287,7 +287,7 @@ export async function publicSettings( // google const googleConfig = await configs.getGoogleConfig() - const preActivated = googleConfig?.activated == null + const preActivated = googleConfig && googleConfig.activated == null const google = preActivated || !!googleConfig?.activated const _googleCallbackUrl = await googleCallbackUrl(googleConfig) diff --git a/packages/worker/src/api/routes/global/tests/configs.spec.ts b/packages/worker/src/api/routes/global/tests/configs.spec.ts index 892fe8a67b..1abe575b02 100644 --- a/packages/worker/src/api/routes/global/tests/configs.spec.ts +++ b/packages/worker/src/api/routes/global/tests/configs.spec.ts @@ -288,7 +288,7 @@ describe("configs", () => { company: "Budibase", logoUrl: "", analyticsEnabled: false, - google: true, + google: false, googleCallbackUrl: `http://localhost:10000/api/global/auth/${config.tenantId}/google/callback`, isSSOEnforced: false, oidc: false, From d799db5a0f54ee5c709640df5e330f9206cc3a09 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 10 Mar 2023 15:28:16 +0000 Subject: [PATCH 2/3] v2.4.17 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index fc77f5f676..9dcbea2a82 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.4.16", + "version": "2.4.17", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 0fff5baf55..4943da163f 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.4.16", + "version": "2.4.17", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "^2.4.16", + "@budibase/types": "^2.4.17", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 663f583110..c25c82fce2 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": "2.4.16", + "version": "2.4.17", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/string-templates": "^2.4.16", + "@budibase/string-templates": "^2.4.17", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 6f96448c6b..b8c56b8619 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.4.16", + "version": "2.4.17", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.4.16", - "@budibase/client": "^2.4.16", - "@budibase/frontend-core": "^2.4.16", - "@budibase/string-templates": "^2.4.16", + "@budibase/bbui": "^2.4.17", + "@budibase/client": "^2.4.17", + "@budibase/frontend-core": "^2.4.17", + "@budibase/string-templates": "^2.4.17", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index e0cab09d83..fb58d7c80b 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.4.16", + "version": "2.4.17", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.4.16", - "@budibase/string-templates": "^2.4.16", - "@budibase/types": "^2.4.16", + "@budibase/backend-core": "^2.4.17", + "@budibase/string-templates": "^2.4.17", + "@budibase/types": "^2.4.17", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 334e837ef7..cff9fec5d8 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.4.16", + "version": "2.4.17", "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": "^2.4.16", - "@budibase/frontend-core": "^2.4.16", - "@budibase/string-templates": "^2.4.16", + "@budibase/bbui": "^2.4.17", + "@budibase/frontend-core": "^2.4.17", + "@budibase/string-templates": "^2.4.17", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 7e810b3c6d..4aa44b38e9 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.4.16", + "version": "2.4.17", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.4.16", + "@budibase/bbui": "^2.4.17", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index adaa63201c..f8ea22e71c 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.4.16", + "version": "2.4.17", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 68bb6c11ef..36ab2163ee 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.4.16", + "version": "2.4.17", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.4.16", - "@budibase/client": "^2.4.16", + "@budibase/backend-core": "^2.4.17", + "@budibase/client": "^2.4.17", "@budibase/pro": "2.4.16", - "@budibase/string-templates": "^2.4.16", - "@budibase/types": "^2.4.16", + "@budibase/string-templates": "^2.4.17", + "@budibase/types": "^2.4.17", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 6507ac6c7e..f91f498f7c 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.4.16", + "version": "2.4.17", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 2a7d8ef782..d1c1208234 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.4.16", + "version": "2.4.17", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 8302234267..df17ce1f16 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.4.16", + "version": "2.4.17", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.4.16", + "@budibase/backend-core": "^2.4.17", "@budibase/pro": "2.4.16", - "@budibase/string-templates": "^2.4.16", - "@budibase/types": "^2.4.16", + "@budibase/string-templates": "^2.4.17", + "@budibase/types": "^2.4.17", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 6f4d8dfab8191f6797f35c5d392716dc2151bad9 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 10 Mar 2023 15:31:01 +0000 Subject: [PATCH 3/3] Update pro version to 2.4.17 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 36ab2163ee..af22352b94 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.4.17", "@budibase/client": "^2.4.17", - "@budibase/pro": "2.4.16", + "@budibase/pro": "2.4.17", "@budibase/string-templates": "^2.4.17", "@budibase/types": "^2.4.17", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 86a141e296..bce54edcb4 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1278,14 +1278,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.16": - version "2.4.16" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.16.tgz#8bd00c484bdf22df56c11b00dc5a6800b1f4523c" - integrity sha512-jypbZHF7UUGNz/2VIhfsSpp/Jmd4rhouEwrmRys0kTugYguJeepTbnjBYKysF+TtdHbCWVzlLFbhTYJbU3NbFA== +"@budibase/backend-core@2.4.17": + version "2.4.17" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.17.tgz#a10f1d8282e53aa0baaafb0103fab3468ff1fc65" + integrity sha512-jvKSdqJrKTeMEZRVIrUX3d/d9hOKnsvqjvUObbJ3ZiLZLOQq2T4tHgkQhZsc3omPefUoxd6HhYUPD29crqP8Kw== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.16" + "@budibase/types" "^2.4.17" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1417,14 +1417,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.16": - version "2.4.16" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.16.tgz#c10ee6fd9a3b7f3774d4cce3b58ebdf9e9bc22fd" - integrity sha512-M3LLxcrLDYuFrOSQIWQU8tqnlDm26h3vr8OXJ+VMsxJ6Y+Hy6Ep75Cx2AIUjtr8kpBAyq09SWlc4dAKXq5M3bg== +"@budibase/pro@2.4.17": + version "2.4.17" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.17.tgz#1f0aff76e459d99369efaa3cfb453039790bbd08" + integrity sha512-lOytvIaLDmsRwoHyk0wYOkPOcJ/dF81KkHvVjhftTIyiFoo+sU/mLjN9nwCJZiQgxw+KpsA7LFXnP2NB75CbYw== dependencies: - "@budibase/backend-core" "2.4.16" + "@budibase/backend-core" "2.4.17" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.16" + "@budibase/types" "2.4.17" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1463,10 +1463,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.16", "@budibase/types@^2.4.16": - version "2.4.16" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.16.tgz#76b4e558282c090cbd0902dc500250d67cb09ca5" - integrity sha512-z2OjOaE7H4fyE9RCES/xHnbIDvYwsT6eiLXswAhT0ko7tY+LQwGzAY3uaQSchRCMFw4TAuvR1A+dzXglPGEjYw== +"@budibase/types@2.4.17", "@budibase/types@^2.4.17": + version "2.4.17" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.17.tgz#274cfbec2656870296137de0ab32ee6852a17061" + integrity sha512-7bi5svTxW/3w5biURoY85USJtI1r3da1qDVzLtnJQQUhA6wmOzshK3DJZOTAckKe/T1iL7OeL7VVxYs/Y7RGSQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index df17ce1f16..8ca304b922 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.4.17", - "@budibase/pro": "2.4.16", + "@budibase/pro": "2.4.17", "@budibase/string-templates": "^2.4.17", "@budibase/types": "^2.4.17", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 2a7365dd52..35e7ab001b 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,14 +475,14 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.4.16": - version "2.4.16" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.16.tgz#8bd00c484bdf22df56c11b00dc5a6800b1f4523c" - integrity sha512-jypbZHF7UUGNz/2VIhfsSpp/Jmd4rhouEwrmRys0kTugYguJeepTbnjBYKysF+TtdHbCWVzlLFbhTYJbU3NbFA== +"@budibase/backend-core@2.4.17": + version "2.4.17" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.17.tgz#a10f1d8282e53aa0baaafb0103fab3468ff1fc65" + integrity sha512-jvKSdqJrKTeMEZRVIrUX3d/d9hOKnsvqjvUObbJ3ZiLZLOQq2T4tHgkQhZsc3omPefUoxd6HhYUPD29crqP8Kw== dependencies: "@budibase/nano" "10.1.2" "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "^2.4.16" + "@budibase/types" "^2.4.17" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -564,14 +564,14 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.4.16": - version "2.4.16" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.16.tgz#c10ee6fd9a3b7f3774d4cce3b58ebdf9e9bc22fd" - integrity sha512-M3LLxcrLDYuFrOSQIWQU8tqnlDm26h3vr8OXJ+VMsxJ6Y+Hy6Ep75Cx2AIUjtr8kpBAyq09SWlc4dAKXq5M3bg== +"@budibase/pro@2.4.17": + version "2.4.17" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.17.tgz#1f0aff76e459d99369efaa3cfb453039790bbd08" + integrity sha512-lOytvIaLDmsRwoHyk0wYOkPOcJ/dF81KkHvVjhftTIyiFoo+sU/mLjN9nwCJZiQgxw+KpsA7LFXnP2NB75CbYw== dependencies: - "@budibase/backend-core" "2.4.16" + "@budibase/backend-core" "2.4.17" "@budibase/string-templates" "2.3.20" - "@budibase/types" "2.4.16" + "@budibase/types" "2.4.17" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -592,10 +592,10 @@ lodash "^4.17.20" vm2 "^3.9.4" -"@budibase/types@2.4.16", "@budibase/types@^2.4.16": - version "2.4.16" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.16.tgz#76b4e558282c090cbd0902dc500250d67cb09ca5" - integrity sha512-z2OjOaE7H4fyE9RCES/xHnbIDvYwsT6eiLXswAhT0ko7tY+LQwGzAY3uaQSchRCMFw4TAuvR1A+dzXglPGEjYw== +"@budibase/types@2.4.17", "@budibase/types@^2.4.17": + version "2.4.17" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.17.tgz#274cfbec2656870296137de0ab32ee6852a17061" + integrity sha512-7bi5svTxW/3w5biURoY85USJtI1r3da1qDVzLtnJQQUhA6wmOzshK3DJZOTAckKe/T1iL7OeL7VVxYs/Y7RGSQ== "@cspotcode/source-map-support@^0.8.0": version "0.8.1"