MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Budibase/budibase into develop

This commit is contained in:
mike12345567 2023-03-08 12:37:34 +00:00
parent 88b61311c4 bd52e56a4d
commit b735259534
18 changed files with 89 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hosting/docker-compose.yaml
View File

@ -59,7 +59,8 @@ services:
minio-service: minio-service:
restart: unless-stopped restart: unless-stopped
image: minio/minio # Last version that supports the "fs" backend
image: minio/minio:RELEASE.2022-10-24T18-35-07Z
volumes: volumes:
- minio_data:/data - minio_data:/data
environment: environment:

2
lerna.json
View File

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

4
packages/backend-core/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/backend-core", "name": "@budibase/backend-core",
"version": "2.4.5-alpha.1", "version": "2.4.5",
"description": "Budibase backend core libraries used in server and worker", "description": "Budibase backend core libraries used in server and worker",
"main": "dist/src/index.js", "main": "dist/src/index.js",
"types": "dist/src/index.d.ts", "types": "dist/src/index.d.ts",
@ -24,7 +24,7 @@
"dependencies": { "dependencies": {
"@budibase/nano": "10.1.2", "@budibase/nano": "10.1.2",
"@budibase/pouchdb-replication-stream": "1.2.10", "@budibase/pouchdb-replication-stream": "1.2.10",
"@budibase/types": "2.4.5-alpha.1", "@budibase/types": "^2.4.5",
"@shopify/jest-koa-mocks": "5.0.1", "@shopify/jest-koa-mocks": "5.0.1",
"@techpass/passport-openidconnect": "0.3.2", "@techpass/passport-openidconnect": "0.3.2",
"aws-cloudfront-sign": "2.2.0", "aws-cloudfront-sign": "2.2.0",

4
packages/bbui/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@budibase/bbui", "name": "@budibase/bbui",
"description": "A UI solution used in the different Budibase projects.", "description": "A UI solution used in the different Budibase projects.",
"version": "2.4.5-alpha.1", "version": "2.4.5",
"license": "MPL-2.0", "license": "MPL-2.0",
"svelte": "src/index.js", "svelte": "src/index.js",
"module": "dist/bbui.es.js", "module": "dist/bbui.es.js",
@ -38,7 +38,7 @@
], ],
"dependencies": { "dependencies": {
"@adobe/spectrum-css-workflow-icons": "1.2.1", "@adobe/spectrum-css-workflow-icons": "1.2.1",
"@budibase/string-templates": "2.4.5-alpha.1", "@budibase/string-templates": "^2.4.5",
"@spectrum-css/accordion": "3.0.24", "@spectrum-css/accordion": "3.0.24",
"@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actionbutton": "1.0.1",
"@spectrum-css/actiongroup": "1.0.1", "@spectrum-css/actiongroup": "1.0.1",

10
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/builder", "name": "@budibase/builder",
"version": "2.4.5-alpha.1", "version": "2.4.5",
"license": "GPL-3.0", "license": "GPL-3.0",
"private": true, "private": true,
"scripts": { "scripts": {
@ -58,10 +58,10 @@
} }
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "2.4.5-alpha.1", "@budibase/bbui": "^2.4.5",
"@budibase/client": "2.4.5-alpha.1", "@budibase/client": "^2.4.5",
"@budibase/frontend-core": "2.4.5-alpha.1", "@budibase/frontend-core": "^2.4.5",
"@budibase/string-templates": "2.4.5-alpha.1", "@budibase/string-templates": "^2.4.5",
"@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/fontawesome-svg-core": "^6.2.1",
"@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1",
"@fortawesome/free-solid-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1",

8
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/cli", "name": "@budibase/cli",
"version": "2.4.5-alpha.1", "version": "2.4.5",
"description": "Budibase CLI, for developers, self hosting and migrations.", "description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "dist/index.js", "main": "dist/index.js",
"bin": { "bin": {
@ -29,9 +29,9 @@
"outputPath": "build" "outputPath": "build"
}, },
"dependencies": { "dependencies": {
"@budibase/backend-core": "2.4.5-alpha.1", "@budibase/backend-core": "^2.4.5",
"@budibase/string-templates": "2.4.5-alpha.1", "@budibase/string-templates": "^2.4.5",
"@budibase/types": "2.4.5-alpha.1", "@budibase/types": "^2.4.5",
"axios": "0.21.2", "axios": "0.21.2",
"chalk": "4.1.0", "chalk": "4.1.0",
"cli-progress": "3.11.2", "cli-progress": "3.11.2",

8
packages/client/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/client", "name": "@budibase/client",
"version": "2.4.5-alpha.1", "version": "2.4.5",
"license": "MPL-2.0", "license": "MPL-2.0",
"module": "dist/budibase-client.js", "module": "dist/budibase-client.js",
"main": "dist/budibase-client.js", "main": "dist/budibase-client.js",
@ -19,9 +19,9 @@
"dev:builder": "rollup -cw" "dev:builder": "rollup -cw"
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "2.4.5-alpha.1", "@budibase/bbui": "^2.4.5",
"@budibase/frontend-core": "2.4.5-alpha.1", "@budibase/frontend-core": "^2.4.5",
"@budibase/string-templates": "2.4.5-alpha.1", "@budibase/string-templates": "^2.4.5",
"@spectrum-css/button": "^3.0.3", "@spectrum-css/button": "^3.0.3",
"@spectrum-css/card": "^3.0.3", "@spectrum-css/card": "^3.0.3",
"@spectrum-css/divider": "^1.0.3", "@spectrum-css/divider": "^1.0.3",

4
packages/frontend-core/package.json
View File

@ -1,12 +1,12 @@
{ {
"name": "@budibase/frontend-core", "name": "@budibase/frontend-core",
"version": "2.4.5-alpha.1", "version": "2.4.5",
"description": "Budibase frontend core libraries used in builder and client", "description": "Budibase frontend core libraries used in builder and client",
"author": "Budibase", "author": "Budibase",
"license": "MPL-2.0", "license": "MPL-2.0",
"svelte": "src/index.js", "svelte": "src/index.js",
"dependencies": { "dependencies": {
"@budibase/bbui": "2.4.5-alpha.1", "@budibase/bbui": "^2.4.5",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"svelte": "^3.46.2" "svelte": "^3.46.2"
} }

2
packages/sdk/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/sdk", "name": "@budibase/sdk",
"version": "2.4.5-alpha.1", "version": "2.4.5",
"description": "Budibase Public API SDK", "description": "Budibase Public API SDK",
"author": "Budibase", "author": "Budibase",
"license": "MPL-2.0", "license": "MPL-2.0",

12
packages/server/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@budibase/server", "name": "@budibase/server",
"email": "hi@budibase.com", "email": "hi@budibase.com",
"version": "2.4.5-alpha.1", "version": "2.4.5",
"description": "Budibase Web Server", "description": "Budibase Web Server",
"main": "src/index.ts", "main": "src/index.ts",
"repository": { "repository": {
@ -43,11 +43,11 @@
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"@apidevtools/swagger-parser": "10.0.3", "@apidevtools/swagger-parser": "10.0.3",
"@budibase/backend-core": "2.4.5-alpha.1", "@budibase/backend-core": "^2.4.5",
"@budibase/client": "2.4.5-alpha.1", "@budibase/client": "^2.4.5",
"@budibase/pro": "2.4.5-alpha.1", "@budibase/pro": "2.4.5",
"@budibase/string-templates": "2.4.5-alpha.1", "@budibase/string-templates": "^2.4.5",
"@budibase/types": "2.4.5-alpha.1", "@budibase/types": "^2.4.5",
"@bull-board/api": "3.7.0", "@bull-board/api": "3.7.0",
"@bull-board/koa": "3.9.4", "@bull-board/koa": "3.9.4",
"@elastic/elasticsearch": "7.10.0", "@elastic/elasticsearch": "7.10.0",

30
packages/server/yarn.lock
View File

@ -1278,14 +1278,14 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@2.4.5-alpha.1": "@budibase/backend-core@2.4.5":
version "2.4.5-alpha.1" version "2.4.5"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.5-alpha.1.tgz#6a18ba2a60ea300609ddcf849a511535f166528c" resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.5.tgz#d748c482001a89fe6921a0a18f4f2db9ca62ca27"
integrity sha512-YBCmrCAdZXJ5U5lMZ/8kwYpg/opMq5xXzpW3B1VEv4shUZbihkfHfk+t1Rc7ohVuhpBfzkHgacTh4tfMAcGhXw== integrity sha512-5mzO8NzpV41ITwqlCK+DHDTIjj2e9mcRBNyTolqfYj3PP8RmEd/tXNQFvHz6XAe3++Ow/dLkVHi/cQSPZxhvJQ==
dependencies: dependencies:
"@budibase/nano" "10.1.2" "@budibase/nano" "10.1.2"
"@budibase/pouchdb-replication-stream" "1.2.10" "@budibase/pouchdb-replication-stream" "1.2.10"
"@budibase/types" "2.4.5-alpha.1" "@budibase/types" "^2.4.5"
"@shopify/jest-koa-mocks" "5.0.1" "@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2" "@techpass/passport-openidconnect" "0.3.2"
aws-cloudfront-sign "2.2.0" aws-cloudfront-sign "2.2.0"
@ -1417,14 +1417,14 @@
pouchdb-promise "^6.0.4" pouchdb-promise "^6.0.4"
through2 "^2.0.0" through2 "^2.0.0"
"@budibase/pro@2.4.5-alpha.1": "@budibase/pro@2.4.5":
version "2.4.5-alpha.1" version "2.4.5"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.5-alpha.1.tgz#90d679e0533b69727ed2acc0369de1280e1239fb" resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.5.tgz#b63e8e8ba876352679620b9d4f29c01b8438bd31"
integrity sha512-gvmy50jMJC2wyI4m8JaMbpVCTK870YaksLLc/etqbwkCOSJ+8qkLsqBzkzYforNyucnDRxtVw0H6lEuAwqkB6g== integrity sha512-u8NKQGrpmMvleTfWVJcI3LGt1+UWNYH8/6hJrk5hmEgmP+t+wzQanz7x8OcGdN1VDNvCf8fWvTXHWk1zV1byFA==
dependencies: dependencies:
"@budibase/backend-core" "2.4.5-alpha.1" "@budibase/backend-core" "2.4.5"
"@budibase/string-templates" "2.3.20" "@budibase/string-templates" "2.3.20"
"@budibase/types" "2.4.5-alpha.1" "@budibase/types" "2.4.5"
"@koa/router" "8.0.8" "@koa/router" "8.0.8"
bull "4.10.1" bull "4.10.1"
joi "17.6.0" joi "17.6.0"
@ -1463,10 +1463,10 @@
lodash "^4.17.20" lodash "^4.17.20"
vm2 "^3.9.4" vm2 "^3.9.4"
"@budibase/types@2.4.5-alpha.1": "@budibase/types@2.4.5", "@budibase/types@^2.4.5":
version "2.4.5-alpha.1" version "2.4.5"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.5-alpha.1.tgz#b67d1e6ef35b2da6d7f987be7b554e90e0d7c137" resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.5.tgz#69439ce148eca80132b72ad955a81b23e8e5de7d"
integrity sha512-YHgf3bluvdsnR3ioi0b6ZcvltQHdGJ8zkjewNLPk2FAS/CyqgtNhCYX2AwdXu7L2KELIGpr0UDwwwq26BXXruw== integrity sha512-rwb5xt61hh6dkk29cp8TCvKjyMrDcABe94zZr8iE2tQ+GAJnn18F5wQ4fUtC1/0MO6Kxc0gT/VT/roDH1ogv1A==
"@bull-board/api@3.7.0": "@bull-board/api@3.7.0":
version "3.7.0" version "3.7.0"

2
packages/string-templates/package.json
View File

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

2
packages/types/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/types", "name": "@budibase/types",
"version": "2.4.5-alpha.1", "version": "2.4.5",
"description": "Budibase types", "description": "Budibase types",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",

11
packages/worker/package.json
View File

@ -1,7 +1,8 @@
{ {
"name": "@budibase/worker", "name": "@budibase/worker",
"email": "hi@budibase.com", "email": "hi@budibase.com",
"version": "2.4.5-alpha.1", "version": "2.4.5",
"description": "Budibase background service",
"main": "src/index.ts", "main": "src/index.ts",
"repository": { "repository": {
"type": "git", "type": "git",
@ -35,10 +36,10 @@
"author": "Budibase", "author": "Budibase",
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"@budibase/backend-core": "2.4.5-alpha.1", "@budibase/backend-core": "^2.4.5",
"@budibase/pro": "2.4.5-alpha.1", "@budibase/pro": "2.4.5",
"@budibase/string-templates": "2.4.5-alpha.1", "@budibase/string-templates": "^2.4.5",
"@budibase/types": "2.4.5-alpha.1", "@budibase/types": "^2.4.5",
"@koa/router": "8.0.8", "@koa/router": "8.0.8",
"@sentry/node": "6.17.7", "@sentry/node": "6.17.7",
"@techpass/passport-openidconnect": "0.3.2", "@techpass/passport-openidconnect": "0.3.2",

15
packages/worker/src/api/routes/global/tests/users.spec.ts
View File

@ -4,6 +4,7 @@ jest.mock("nodemailer")
import { TestConfiguration, mocks, structures } from "../../../../tests" import { TestConfiguration, mocks, structures } from "../../../../tests"
const sendMailMock = mocks.email.mock() const sendMailMock = mocks.email.mock()
import { events, tenancy, accounts as _accounts } from "@budibase/backend-core" import { events, tenancy, accounts as _accounts } from "@budibase/backend-core"
import * as userSdk from "../../../../sdk/users"
const accounts = jest.mocked(_accounts) const accounts = jest.mocked(_accounts)
@ -468,6 +469,20 @@ describe("/api/global/users", () => {
config.authHeaders(nonAdmin) config.authHeaders(nonAdmin)
) )
}) })
describe("sso users", () => {
function createSSOUser() {
return config.doInTenant(() => {
const user = structures.users.ssoUser()
return userSdk.save(user, { requirePassword: false })
})
}
it("should be able to update an sso user that has no password", async () => {
const user = await createSSOUser()
await config.api.users.saveUser(user)
})
})
}) })
describe("POST /api/global/users/bulk (delete)", () => { describe("POST /api/global/users/bulk (delete)", () => {

5
packages/worker/src/sdk/users/users.ts
View File

@ -131,6 +131,11 @@ const buildUser = async (
): Promise<User> => { ): Promise<User> => {
let { password, _id } = user let { password, _id } = user
// don't require a password if the db user doesn't already have one
if (dbUser && !dbUser.password) {
opts.requirePassword = false
}
let hashedPassword let hashedPassword
if (password) { if (password) {
if (await isPreventPasswordActions(user)) { if (await isPreventPasswordActions(user)) {

30
packages/worker/yarn.lock
View File

@ -475,14 +475,14 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@2.4.5-alpha.1": "@budibase/backend-core@2.4.5":
version "2.4.5-alpha.1" version "2.4.5"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.5-alpha.1.tgz#6a18ba2a60ea300609ddcf849a511535f166528c" resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.5.tgz#d748c482001a89fe6921a0a18f4f2db9ca62ca27"
integrity sha512-YBCmrCAdZXJ5U5lMZ/8kwYpg/opMq5xXzpW3B1VEv4shUZbihkfHfk+t1Rc7ohVuhpBfzkHgacTh4tfMAcGhXw== integrity sha512-5mzO8NzpV41ITwqlCK+DHDTIjj2e9mcRBNyTolqfYj3PP8RmEd/tXNQFvHz6XAe3++Ow/dLkVHi/cQSPZxhvJQ==
dependencies: dependencies:
"@budibase/nano" "10.1.2" "@budibase/nano" "10.1.2"
"@budibase/pouchdb-replication-stream" "1.2.10" "@budibase/pouchdb-replication-stream" "1.2.10"
"@budibase/types" "2.4.5-alpha.1" "@budibase/types" "^2.4.5"
"@shopify/jest-koa-mocks" "5.0.1" "@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2" "@techpass/passport-openidconnect" "0.3.2"
aws-cloudfront-sign "2.2.0" aws-cloudfront-sign "2.2.0"
@ -564,14 +564,14 @@
pouchdb-promise "^6.0.4" pouchdb-promise "^6.0.4"
through2 "^2.0.0" through2 "^2.0.0"
"@budibase/pro@2.4.5-alpha.1": "@budibase/pro@2.4.5":
version "2.4.5-alpha.1" version "2.4.5"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.5-alpha.1.tgz#90d679e0533b69727ed2acc0369de1280e1239fb" resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.5.tgz#b63e8e8ba876352679620b9d4f29c01b8438bd31"
integrity sha512-gvmy50jMJC2wyI4m8JaMbpVCTK870YaksLLc/etqbwkCOSJ+8qkLsqBzkzYforNyucnDRxtVw0H6lEuAwqkB6g== integrity sha512-u8NKQGrpmMvleTfWVJcI3LGt1+UWNYH8/6hJrk5hmEgmP+t+wzQanz7x8OcGdN1VDNvCf8fWvTXHWk1zV1byFA==
dependencies: dependencies:
"@budibase/backend-core" "2.4.5-alpha.1" "@budibase/backend-core" "2.4.5"
"@budibase/string-templates" "2.3.20" "@budibase/string-templates" "2.3.20"
"@budibase/types" "2.4.5-alpha.1" "@budibase/types" "2.4.5"
"@koa/router" "8.0.8" "@koa/router" "8.0.8"
bull "4.10.1" bull "4.10.1"
joi "17.6.0" joi "17.6.0"
@ -592,10 +592,10 @@
lodash "^4.17.20" lodash "^4.17.20"
vm2 "^3.9.4" vm2 "^3.9.4"
"@budibase/types@2.4.5-alpha.1": "@budibase/types@2.4.5", "@budibase/types@^2.4.5":
version "2.4.5-alpha.1" version "2.4.5"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.5-alpha.1.tgz#b67d1e6ef35b2da6d7f987be7b554e90e0d7c137" resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.5.tgz#69439ce148eca80132b72ad955a81b23e8e5de7d"
integrity sha512-YHgf3bluvdsnR3ioi0b6ZcvltQHdGJ8zkjewNLPk2FAS/CyqgtNhCYX2AwdXu7L2KELIGpr0UDwwwq26BXXruw== integrity sha512-rwb5xt61hh6dkk29cp8TCvKjyMrDcABe94zZr8iE2tQ+GAJnn18F5wQ4fUtC1/0MO6Kxc0gT/VT/roDH1ogv1A==
"@cspotcode/source-map-support@^0.8.0": "@cspotcode/source-map-support@^0.8.0":
version "0.8.1" version "0.8.1"

4
scripts/install-minio.sh
View File

@ -2,9 +2,9 @@
if [[ $TARGETARCH == arm* ]] ; if [[ $TARGETARCH == arm* ]] ;
then then
echo "INSTALLING ARM64 MINIO" echo "INSTALLING ARM64 MINIO"
wget https://dl.min.io/server/minio/release/linux-arm64/minio wget https://dl.min.io/server/minio/release/linux-arm64/archive/minio.RELEASE.2022-10-24T18-35-07Z
else else
echo "INSTALLING AMD64 MINIO" echo "INSTALLING AMD64 MINIO"
wget https://dl.min.io/server/minio/release/linux-amd64/minio wget https://dl.min.io/server/minio/release/linux-amd64/minio.RELEASE.2022-10-24T18-35-07Z
fi fi
chmod +x minio chmod +x minio