From f61e15594b8911983dc6895955fe506f56b909a7 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 4 Feb 2022 16:17:36 +0000 Subject: [PATCH 1/7] Fix for #3928 - error invalid use of FETCH was based on a lack of sorting on MS-SQL platforms, this enforces a sort of some type no matter what. --- .../integrations/mssql/data/Dockerfile | 2 +- .../scripts/integrations/mssql/data/setup.sql | 21 +++++++++++++++---- packages/server/src/integrations/base/sql.ts | 14 ++++++------- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/packages/server/scripts/integrations/mssql/data/Dockerfile b/packages/server/scripts/integrations/mssql/data/Dockerfile index 8ac56409a0..b8c96e8419 100644 --- a/packages/server/scripts/integrations/mssql/data/Dockerfile +++ b/packages/server/scripts/integrations/mssql/data/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/mssql/server +FROM mcr.microsoft.com/mssql/server:2017-latest ENV ACCEPT_EULA=Y ENV SA_PASSWORD=Passw0rd diff --git a/packages/server/scripts/integrations/mssql/data/setup.sql b/packages/server/scripts/integrations/mssql/data/setup.sql index 766388f46a..d0b4cfc39c 100644 --- a/packages/server/scripts/integrations/mssql/data/setup.sql +++ b/packages/server/scripts/integrations/mssql/data/setup.sql @@ -48,7 +48,20 @@ INSERT tasks VALUES ('Processing', 1); -INSERT people - (name, age) -VALUES - ('Bob', '30'); +INSERT INTO people (name, age) +VALUES ('Bob', '30'), + ('Bert', '10'), + ('Jack', '12'), + ('Mike', '31'), + ('Dave', '44'), + ('Jim', '43'), + ('Kerry', '32'), + ('Julie', '12'), + ('Kim', '55'), + ('Andy', '33'), + ('John', '22'), + ('Ruth', '66'), + ('Robert', '88'), + ('Bobert', '99'), + ('Jan', '22'), + ('Megan', '11'); diff --git a/packages/server/src/integrations/base/sql.ts b/packages/server/src/integrations/base/sql.ts index 2bcb5753d6..a4220565cf 100644 --- a/packages/server/src/integrations/base/sql.ts +++ b/packages/server/src/integrations/base/sql.ts @@ -166,15 +166,13 @@ class InternalBuilder { addSorting(query: KnexQuery, json: QueryJson): KnexQuery { let { sort, paginate } = json - if (!sort) { - return query - } const table = json.meta?.table - for (let [key, value] of Object.entries(sort)) { - const direction = value === SortDirection.ASCENDING ? "asc" : "desc" - query = query.orderBy(`${table?.name}.${key}`, direction) - } - if (this.client === SqlClients.MS_SQL && !sort && paginate?.limit) { + if (sort) { + for (let [key, value] of Object.entries(sort)) { + const direction = value === SortDirection.ASCENDING ? "asc" : "desc" + query = query.orderBy(`${table?.name}.${key}`, direction) + } + } else if (this.client === SqlClients.MS_SQL && paginate?.limit) { // @ts-ignore query = query.orderBy(`${table?.name}.${table?.primary[0]}`) } From e74621f327c17f1cef264363b58227b020482ede Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 4 Feb 2022 16:56:12 +0000 Subject: [PATCH 2/7] Fixing an issue with search field select erroring in builder when using queries in blocks. --- .../PropertiesPanel/PropertyControls/SearchFieldSelect.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/SearchFieldSelect.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/SearchFieldSelect.svelte index 474fbc676c..e609426b1e 100644 --- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/SearchFieldSelect.svelte +++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/SearchFieldSelect.svelte @@ -25,7 +25,7 @@ return base } const currentTable = $tables.list.find(table => table._id === ds.tableId) - return getFields(base, { allowLinks: currentTable.sql }).map( + return getFields(base, { allowLinks: currentTable?.sql }).map( field => field.name ) } From d87b8c0563a00f63b9e7993be2a80e08ff09e8ad Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 4 Feb 2022 17:34:39 +0000 Subject: [PATCH 3/7] Fix for #4267 - allow admins to access all roles. --- packages/backend-core/src/security/roles.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/backend-core/src/security/roles.js b/packages/backend-core/src/security/roles.js index 82bfbd5212..11abc70bdd 100644 --- a/packages/backend-core/src/security/roles.js +++ b/packages/backend-core/src/security/roles.js @@ -146,8 +146,9 @@ exports.getRole = async roleId => { * Simple function to get all the roles based on the top level user role ID. */ async function getAllUserRoles(userRoleId) { - if (!userRoleId) { - return [BUILTIN_IDS.BASIC] + // admins have access to all roles + if (userRoleId === BUILTIN_IDS.ADMIN) { + return exports.getAllRoles() } let currentRole = await exports.getRole(userRoleId) let roles = currentRole ? [currentRole] : [] From a214400e0362d6c36e9b3a6b6fa2de7ac9d7c8fa Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 4 Feb 2022 17:35:45 +0000 Subject: [PATCH 4/7] Fixing issue which was blocking the ability to logout fully, as well as causing issues with new user signup and password reset. --- packages/backend-core/src/utils.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/backend-core/src/utils.js b/packages/backend-core/src/utils.js index 6c71c51b9d..45fb4acd55 100644 --- a/packages/backend-core/src/utils.js +++ b/packages/backend-core/src/utils.js @@ -256,7 +256,7 @@ exports.saveUser = async ( exports.platformLogout = async ({ ctx, userId, keepActiveSession }) => { if (!ctx) throw new Error("Koa context must be supplied to logout.") - const currentSession = this.getCookie(ctx, Cookies.Auth) + const currentSession = exports.getCookie(ctx, Cookies.Auth) let sessions = await getUserSessions(userId) if (keepActiveSession) { @@ -265,8 +265,8 @@ exports.platformLogout = async ({ ctx, userId, keepActiveSession }) => { ) } else { // clear cookies - this.clearCookie(ctx, Cookies.Auth) - this.clearCookie(ctx, Cookies.CurrentApp) + exports.clearCookie(ctx, Cookies.Auth) + exports.clearCookie(ctx, Cookies.CurrentApp) } await invalidateSessions( From 30b6c1f3cabadb03e09f5cbdec0cd87dd5fae209 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 4 Feb 2022 17:37:13 +0000 Subject: [PATCH 5/7] Fixing an issue with user syncing on save to app DBs as well as fixing a problem with pretty app URLs not setting the app ID correctly into the context. --- .../src/api/controllers/static/index.js | 10 ++-- packages/server/src/api/controllers/user.js | 58 ++++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/packages/server/src/api/controllers/static/index.js b/packages/server/src/api/controllers/static/index.js index cafe999150..82e66ab545 100644 --- a/packages/server/src/api/controllers/static/index.js +++ b/packages/server/src/api/controllers/static/index.js @@ -16,7 +16,7 @@ const { clientLibraryPath } = require("../../../utilities") const { upload } = require("../../../utilities/fileSystem") const { attachmentsRelativeURL } = require("../../../utilities") const { DocumentTypes } = require("../../../db/utils") -const { getAppDB } = require("@budibase/backend-core/context") +const { getAppDB, updateAppId } = require("@budibase/backend-core/context") const AWS = require("aws-sdk") const AWS_REGION = env.AWS_REGION ? env.AWS_REGION : "eu-west-1" @@ -49,11 +49,9 @@ async function getAppIdFromUrl(ctx) { a => a.url && a.url.toLowerCase() === possibleAppUrl )[0] - if (app && app.appId) { - return app.appId - } else { - return ctx.params.appId - } + const appId = app && app.appId ? app.appId : ctx.params.appId + updateAppId(appId) + return appId } exports.serveBuilder = async function (ctx) { diff --git a/packages/server/src/api/controllers/user.js b/packages/server/src/api/controllers/user.js index ca7ef24162..7d4ef65994 100644 --- a/packages/server/src/api/controllers/user.js +++ b/packages/server/src/api/controllers/user.js @@ -14,7 +14,7 @@ const { dbExists, } = require("@budibase/backend-core/db") const { UserStatus } = require("@budibase/backend-core/constants") -const { getAppDB } = require("@budibase/backend-core/context") +const { getAppDB, doInAppContext } = require("@budibase/backend-core/context") async function rawMetadata() { const db = getAppDB() @@ -105,34 +105,36 @@ exports.syncUser = async function (ctx) { if (!(await dbExists(appId))) { continue } - const db = getAppDB() - const metadataId = generateUserMetadataID(userId) - let metadata - try { - metadata = await db.get(metadataId) - } catch (err) { - if (deleting) { - continue - } - metadata = { - tableId: InternalTables.USER_METADATA, - } - } - // assign the roleId for the metadata doc - if (roleId) { - metadata.roleId = roleId - } - let combined = !deleting - ? combineMetadataAndUser(user, metadata) - : { - ...metadata, - status: UserStatus.INACTIVE, - metadata: BUILTIN_ROLE_IDS.PUBLIC, + await doInAppContext(appId, async () => { + const db = getAppDB() + const metadataId = generateUserMetadataID(userId) + let metadata + try { + metadata = await db.get(metadataId) + } catch (err) { + if (deleting) { + return } - // if its null then there was no updates required - if (combined) { - await db.put(combined) - } + metadata = { + tableId: InternalTables.USER_METADATA, + } + } + // assign the roleId for the metadata doc + if (roleId) { + metadata.roleId = roleId + } + let combined = !deleting + ? combineMetadataAndUser(user, metadata) + : { + ...metadata, + status: UserStatus.INACTIVE, + metadata: BUILTIN_ROLE_IDS.PUBLIC, + } + // if its null then there was no updates required + if (combined) { + await db.put(combined) + } + }) } } ctx.body = { From 2a5e169b7c60764448cfbcdd5a6a901c460c469d Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 7 Feb 2022 10:27:31 +0000 Subject: [PATCH 6/7] v1.0.49-alpha.13 --- lerna.json | 2 +- packages/backend-core/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 47ab05ebf2..db201bc44a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.49-alpha.12", + "version": "1.0.49-alpha.13", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 71d1e9b6b3..0a7b6dd4fa 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.49-alpha.12", + "version": "1.0.49-alpha.13", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 8edc59695c..1e9006c4db 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": "1.0.49-alpha.12", + "version": "1.0.49-alpha.13", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", diff --git a/packages/builder/package.json b/packages/builder/package.json index a7757e9f92..6efede668d 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.49-alpha.12", + "version": "1.0.49-alpha.13", "license": "GPL-3.0", "private": true, "scripts": { @@ -66,10 +66,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.49-alpha.12", - "@budibase/client": "^1.0.49-alpha.12", + "@budibase/bbui": "^1.0.49-alpha.13", + "@budibase/client": "^1.0.49-alpha.13", "@budibase/colorpicker": "1.1.2", - "@budibase/string-templates": "^1.0.49-alpha.12", + "@budibase/string-templates": "^1.0.49-alpha.13", "@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 3be0513ccf..e4100846d1 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.49-alpha.12", + "version": "1.0.49-alpha.13", "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 342326c485..294488c955 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.49-alpha.12", + "version": "1.0.49-alpha.13", "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": "^1.0.49-alpha.12", + "@budibase/bbui": "^1.0.49-alpha.13", "@budibase/standard-components": "^0.9.139", - "@budibase/string-templates": "^1.0.49-alpha.12", + "@budibase/string-templates": "^1.0.49-alpha.13", "regexparam": "^1.3.0", "rollup-plugin-polyfill-node": "^0.8.0", "shortid": "^2.2.15", diff --git a/packages/server/package.json b/packages/server/package.json index 65e398f8c2..70e99ea8b6 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.49-alpha.12", + "version": "1.0.49-alpha.13", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -70,9 +70,9 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.49-alpha.12", - "@budibase/client": "^1.0.49-alpha.12", - "@budibase/string-templates": "^1.0.49-alpha.12", + "@budibase/backend-core": "^1.0.49-alpha.13", + "@budibase/client": "^1.0.49-alpha.13", + "@budibase/string-templates": "^1.0.49-alpha.13", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 01057b3db2..3166401688 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.49-alpha.12", + "version": "1.0.49-alpha.13", "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 436843db06..67126573de 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.49-alpha.12", + "version": "1.0.49-alpha.13", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,8 +34,8 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.49-alpha.12", - "@budibase/string-templates": "^1.0.49-alpha.12", + "@budibase/backend-core": "^1.0.49-alpha.13", + "@budibase/string-templates": "^1.0.49-alpha.13", "@koa/router": "^8.0.0", "@sentry/node": "^6.0.0", "@techpass/passport-openidconnect": "^0.3.0", From 22a685aadefc9249cbfbaea67ab7a1b791ee2d2b Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 7 Feb 2022 10:52:24 +0000 Subject: [PATCH 7/7] v1.0.49-alpha.14 --- lerna.json | 2 +- packages/backend-core/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 db201bc44a..60dcddc4cb 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.49-alpha.13", + "version": "1.0.49-alpha.14", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 0a7b6dd4fa..7f8aa6e4c7 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.49-alpha.13", + "version": "1.0.49-alpha.14", "description": "Budibase backend core libraries used in server and worker", "main": "src/index.js", "author": "Budibase", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 1e9006c4db..c9e8c8873c 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": "1.0.49-alpha.13", + "version": "1.0.49-alpha.14", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", diff --git a/packages/builder/package.json b/packages/builder/package.json index 6efede668d..3101d4f25c 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.49-alpha.13", + "version": "1.0.49-alpha.14", "license": "GPL-3.0", "private": true, "scripts": { @@ -66,10 +66,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.49-alpha.13", - "@budibase/client": "^1.0.49-alpha.13", + "@budibase/bbui": "^1.0.49-alpha.14", + "@budibase/client": "^1.0.49-alpha.14", "@budibase/colorpicker": "1.1.2", - "@budibase/string-templates": "^1.0.49-alpha.13", + "@budibase/string-templates": "^1.0.49-alpha.14", "@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 e4100846d1..5e909b02c6 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.49-alpha.13", + "version": "1.0.49-alpha.14", "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 294488c955..2c4e00e8a3 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.49-alpha.13", + "version": "1.0.49-alpha.14", "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": "^1.0.49-alpha.13", + "@budibase/bbui": "^1.0.49-alpha.14", "@budibase/standard-components": "^0.9.139", - "@budibase/string-templates": "^1.0.49-alpha.13", + "@budibase/string-templates": "^1.0.49-alpha.14", "regexparam": "^1.3.0", "rollup-plugin-polyfill-node": "^0.8.0", "shortid": "^2.2.15", diff --git a/packages/server/package.json b/packages/server/package.json index 70e99ea8b6..9d58d99838 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.49-alpha.13", + "version": "1.0.49-alpha.14", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -70,9 +70,9 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "^10.0.3", - "@budibase/backend-core": "^1.0.49-alpha.13", - "@budibase/client": "^1.0.49-alpha.13", - "@budibase/string-templates": "^1.0.49-alpha.13", + "@budibase/backend-core": "^1.0.49-alpha.14", + "@budibase/client": "^1.0.49-alpha.14", + "@budibase/string-templates": "^1.0.49-alpha.14", "@bull-board/api": "^3.7.0", "@bull-board/koa": "^3.7.0", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 3166401688..9492de19c2 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.49-alpha.13", + "version": "1.0.49-alpha.14", "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 67126573de..76ebaff106 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.49-alpha.13", + "version": "1.0.49-alpha.14", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,8 +34,8 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.49-alpha.13", - "@budibase/string-templates": "^1.0.49-alpha.13", + "@budibase/backend-core": "^1.0.49-alpha.14", + "@budibase/string-templates": "^1.0.49-alpha.14", "@koa/router": "^8.0.0", "@sentry/node": "^6.0.0", "@techpass/passport-openidconnect": "^0.3.0",