Commit Graph

4943 Commits

Author SHA1 Message Date
mike12345567 e9bb17dd8a Fixing cluster mode in docker-compose setups, we weren't copying across the pm2 config that was needed to achieve this. 2024-02-15 12:47:27 +00:00
Dean 5c5dc4c155 Merge remote-tracking branch 'origin/master' into feature/form-screen-template 2024-02-14 14:32:15 +00:00
Dean e9e5281e82 Initial commit form screen flow and tour refactor 2024-02-14 12:11:24 +00:00
Peter Clement 8857ca989f
Merge branch 'master' into fix/custom-branding-issue 2024-02-09 16:06:26 +00:00
Peter Clement f1da6d5f87 Fix for custom branding not appearing on login 2024-02-09 15:26:57 +00:00
Sam Rose 77b3d479a0
Update dd-trace to 5.2.0. 2024-02-09 12:01:37 +00:00
Adria Navarro 573096e869
Merge branch 'master' into revert-12934-revert-12930-revert-12929-revert-12769-isolated-vm 2024-02-08 18:15:36 +01:00
Sam Rose 8e9db069e5
Remove all uses of test.com in the code, replace them with example.com and create a lint rule to prevent this in future. 2024-02-08 16:32:14 +00:00
Adria Navarro 2c4601440f Merge branch 'master' into revert-12934-revert-12930-revert-12929-revert-12769-isolated-vm 2024-02-06 17:53:22 +01:00
Martin McKeaveney b17bd4d8fd merge 2024-02-02 17:00:09 -03:00
Adria Navarro 8dfcc3aeb1
Revert "Revert "Migrate from `vm` to `isolated-vm`"" 2024-02-02 12:02:09 +01:00
dependabot[bot] 163c10c71e
Bump nodemailer from 6.7.2 to 6.9.9 in /packages/worker
Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.7.2 to 6.9.9.
- [Release notes](https://github.com/nodemailer/nodemailer/releases)
- [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodemailer/nodemailer/compare/v6.7.2...v6.9.9)

---
updated-dependencies:
- dependency-name: nodemailer
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-02 09:58:15 +00:00
Sam Rose 332a201ae7
Revert "Migrate from `vm` to `isolated-vm`" 2024-02-02 09:51:46 +00:00
Adria Navarro 45ea6a6fd6
Revert "Revert "Migrate from `vm` to `isolated-vm`"" 2024-02-01 16:47:41 +01:00
Adria Navarro 16749ec3dd
Revert "Migrate from `vm` to `isolated-vm`" 2024-02-01 16:30:34 +01:00
Sam Rose b52ba43979
Fix tests. 2024-01-31 15:56:17 +00:00
Sam Rose 281b88a86a
Respond to PR feedback. 2024-01-31 15:54:36 +00:00
Adria Navarro 623b4f5dab
Merge branch 'master' into isolated-vm 2024-01-31 10:47:08 +01:00
Sam Rose a268e55607
Plumbing for showing a maintenance page when SQS is required but missing. 2024-01-30 17:31:11 +00:00
mike12345567 21a8d44ec7 Adding a 'SESSION_EXPIRY_SECONDS' environment variable which can be set on the services to configure how long before an idle user is logged out. 2024-01-25 16:22:39 +00:00
Adria Navarro d7b5aa08db nodemon, don't watch tests 2024-01-23 17:33:52 +01:00
jvcalderon 09b75c3924 Recalculate creators count on plan downgrade 2024-01-23 13:21:54 +01:00
Adria Navarro 09d8951fc3
Merge branch 'master' into isolated-vm 2024-01-18 14:21:13 +01:00
Michael Drury a6d9601f07
Merge branch 'master' into fix/dd-trace-version 2024-01-17 11:29:42 +00:00
Adria Navarro a4959e2762
Merge branch 'master' into isolated-vm 2024-01-16 12:46:56 +01:00
Adria Navarro e42784b5e9 Use system lock 2024-01-16 11:49:34 +01:00
Adria Navarro 7e50986a2e Remove unnecessary get 2024-01-16 11:28:35 +01:00
Adria Navarro 0cce142571 Use lock to prevent race conditions on invite 2024-01-16 11:20:27 +01:00
Adria Navarro 0ed8464aab Display error on wrong password 2024-01-16 11:07:03 +01:00
mike12345567 b370e2a0e5 Updating dd-trace to 5.0.0 across all packages now that the memory leak is solved, this also removes the erronous message on startup describing DataDog startup problems. 2024-01-15 17:44:52 +00:00
Martin McKeaveney a34ae9e2e2 merge with master 2024-01-08 16:44:32 +00:00
Sam Rose 58abca62de
work in progress: replace vm2 and vm with isolated-vm 2024-01-05 13:48:20 +00:00
Adria Navarro a052f8873d Register paths on ts-node from worker 2024-01-04 13:57:10 +01:00
Adria Navarro 7413fd96a8
Merge branch 'master' into chore/node-20 2024-01-03 14:15:21 +01:00
Martin McKeaveney 57cf6dec94 merge 2024-01-03 11:43:27 +00:00
Adria Navarro 3ce3f6b5ac Fix flakiness test 2024-01-03 12:42:52 +01:00
Adria Navarro 8b866a53c8 Clean 2024-01-03 12:11:25 +01:00
Adria Navarro 4db5d9dab2 Lint 2024-01-03 12:08:18 +01:00
Adria Navarro b09f941027 Fix tests 2024-01-03 12:06:23 +01:00
Adria Navarro b45717a1e1 Move password checks to db 2024-01-03 12:00:25 +01:00
Adria Navarro 874c3f9dd4 Fix tests 2024-01-03 11:41:57 +01:00
Adria Navarro ba2b54f842 Use env variables instead of checking if isdev 2024-01-03 10:12:22 +01:00
Adria Navarro 0685caf8a2 Validate password in backend-core 2024-01-02 15:23:12 +01:00
Adria Navarro e50cc35140 Validate password on admin creation 2024-01-02 13:23:08 +01:00
Adria Navarro 7b9fadc3ba Validate password on reset 2024-01-02 13:05:48 +01:00
Adria Navarro 1633284f9d Bubble up error 2024-01-02 13:02:24 +01:00
Adria Navarro c94c3d09dc
Merge branch 'master' into vulnerability/budi-7794-invalidate-session-on-password-reset 2024-01-02 12:25:42 +01:00
Adria Navarro d1ffe24269 Invalidate session on password update 2023-12-29 16:54:47 +01:00
Adria Navarro f74264c1c8 Add tests 2023-12-29 16:37:34 +01:00
Adria Navarro dcacd6bf17 Add basic test 2023-12-29 16:07:26 +01:00
Adria Navarro f722f9e2d6 Invalidate reset code once used 2023-12-29 15:06:04 +01:00
Adria Navarro fede6dc3e4 Fix flaky scim test 2023-12-29 11:12:31 +01:00
Adria Navarro a6537e66c3 Set scim config on beforeall 2023-12-29 10:26:03 +01:00
Martin McKeaveney 8f1470f5a5 merge with master 2023-12-22 17:08:32 +00:00
Adria Navarro a3e371edff Update docker versions 2023-12-22 15:05:42 +01:00
Adria Navarro c7bb63da35 Update node refs to 20 2023-12-22 14:55:22 +01:00
Sam Rose 1f3a75e892
Downgrade back to dd-trace 3.13.2 2023-12-20 17:20:30 +00:00
Sam Rose 269c382524
Revert "Set `--enable-source-maps` when running Node." 2023-12-19 13:50:35 +00:00
Sam Rose 5da9bfee14
Set --enable-source-maps for the worker package. 2023-12-19 10:39:25 +00:00
Sam Rose 223aeaf337
Update dd-trace to 4.20.0. 2023-12-18 09:30:15 +00:00
Sam Rose 56a240bc18
Set up DD version and code tracking. 2023-12-15 09:53:48 +00:00
Martin McKeaveney ab02b2c910 bump deps 2023-12-15 00:17:36 +00:00
Adria Navarro 116b1ce909 Ensure .env is created properly 2023-12-13 13:14:13 +01:00
Sam Rose 0a7af05f01
Unmock node-fetch again. 2023-12-12 14:46:08 +00:00
Sam Rose 614a659032
Merge branch 'master' of github.com:budibase/budibase into budi-7664-sqs-self-host-ui-for-detecting-lack-of-sqs-support 2023-12-12 14:44:08 +00:00
Sam Rose b4f0423ca3
Respond to Adri's feedback. 2023-12-12 14:43:53 +00:00
Andrew Kingston f7b7f3efde Error when searching global users using more than one filter per field 2023-12-12 11:15:29 +00:00
Andrew Kingston 635bf9acf2 Merge branch 'fix/global-users-search-numeric-prefixing' of github.com:Budibase/budibase into fix/global-users-search-numeric-prefixing 2023-12-12 10:28:53 +00:00
Andrew Kingston 66f219d778 Lint and change status code to 400 when searching on invalid fields 2023-12-12 10:26:48 +00:00
Sam Rose 3a7c30c7f3
Seeing if CI is happy if I remove the unmock call. 2023-12-11 17:54:02 +00:00
Sam Rose f249dadcc7
Merge branch 'master' of github.com:budibase/budibase into budi-7664-sqs-self-host-ui-for-detecting-lack-of-sqs-support 2023-12-11 17:46:27 +00:00
Sam Rose 779bd8f230
Remove core env overriding in worker TestConfiguration. Should be split out in server, too. 2023-12-11 17:28:33 +00:00
Andrew Kingston 23475942d0
Merge branch 'master' into fix/global-users-search-numeric-prefixing 2023-12-11 17:27:49 +00:00
Andrew Kingston e16cc26781 Lint 2023-12-11 17:25:42 +00:00
Sam Rose 867d68d429
Cleanup. 2023-12-11 17:25:38 +00:00
Andrew Kingston 6617243ce5 Update global users search to account for numeric prefixing 2023-12-11 17:23:02 +00:00
Sam Rose e0243b495c
Fix tests. 2023-12-11 17:20:00 +00:00
Sam Rose 2c3b3d03e1
Respond to PR comments. 2023-12-11 16:49:44 +00:00
Sam Rose 6b491815a5
Add isSqsAvailable key to the environment endpoint. 2023-12-11 15:22:02 +00:00
Adria Navarro 1e267fca5b Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-12-11 09:50:48 +01:00
mike12345567 8628c67c90 Fixing typing issues. 2023-12-05 18:17:27 +00:00
mike12345567 33b7e4d5d2 Some final refactoring, using proper jwt lib rather than requiring (proper typing). 2023-12-05 16:28:19 +00:00
Sam Rose 71a4e96d58
Move CODEOWNERS to the root to see if that fixes it. 2023-11-30 11:34:11 +00:00
Sam Rose fb3c072165
Capitalise @Budibase. 2023-11-29 09:22:47 +00:00
Sam Rose 204769b6e9
Add @budibase/backend as code owners to packages/{server,worker,backend-core} 2023-11-29 09:19:08 +00:00
Adria Navarro e7bcabf1d2 Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-11-27 20:48:32 +01:00
Andrew Kingston c4a3837fc1 Merge branch 'master' of github.com:Budibase/budibase into creator-changes 2023-11-24 15:18:06 +00:00
Adria Navarro 9c221afc59 Rename Dockerfile.v2 to Dockerfile 2023-11-24 13:02:14 +01:00
mike12345567 b6c6e6ec6e Clearing out per-app builders when app is deleted. 2023-11-23 17:35:55 +00:00
Michael Drury 1d368be5de
Merge branch 'master' into fix/admin-user-backup 2023-11-22 10:59:45 +00:00
mike12345567 ddd8482013 Updating bb admin user creation so that it can be used incase in self host a user gets locked out, the environment variables can be used to create a simple user to access the system. 2023-11-21 17:30:11 +00:00
Adria Navarro db2c20e3ae eslint import/newline-after-import 2023-11-20 21:52:29 +01:00
Adria Navarro 4d27ff1dc0 eslint import/no-duplicates 2023-11-20 21:48:49 +01:00
mike12345567 258ea803bc Further PR comments. 2023-11-17 16:37:00 +00:00
mike12345567 7fb6c0927a Moving things around to get rid of cyclics created by moving invite/passwordReset into backend-core - also updating currentapp test case to mock a bit better. 2023-11-17 16:20:10 +00:00
Sam Rose 4c7c10b121
Set Redis initialisation back to how it was before I started messing with it. 2023-11-10 16:17:18 +00:00
Sam Rose d6eb2b9452
Attempting to get integration tests passing again. 2023-11-10 15:43:06 +00:00
Sam Rose 94983c289f
Hook redis init flow into overall worker init flow. 2023-11-10 11:39:26 +00:00
Sam Rose d98e217c6c
Fix backend-core redis imports. 2023-11-10 11:21:36 +00:00
Sam Rose 7f530eeab5
Add tests for the onboarding endpoint. 2023-11-09 15:13:59 +00:00
Sam Rose 822c03b0ef
Refactor onboardUsers endpoint. 2023-11-09 15:02:44 +00:00
Sam Rose b29cfc600c
Move Invite and PasswordReset code into backend-core. 2023-11-09 14:51:07 +00:00
Sam Rose b2841b30b2
Add a test for the multi-invite endpoint. 2023-11-09 11:17:30 +00:00
Sam Rose a6a75b533c
Reject inviting the same user twice. 2023-11-09 11:15:44 +00:00
Sam Rose 3f69b17c94
Fully type the worker redis utils file. 2023-11-09 11:05:42 +00:00
Adria Navarro 6fd8a58850
Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-11-08 17:05:42 +01:00
Adria Navarro a945b52f9a Rename dev:builder to dev (unifying account-portal) 2023-11-07 19:15:40 +01:00
Sam Rose fdfda100c1
Ensure that the DB always returns Documents. 2023-11-07 18:14:52 +00:00
Adria Navarro ef914882d4 Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-11-07 19:06:33 +01:00
Martin McKeaveney 5dd6c40a29
Merge branch 'master' into fix/update-bull-queue-parameters 2023-11-06 18:02:49 +00:00
Adria Navarro bdd33ac2f5 Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-11-06 15:59:36 +01:00
Adria Navarro 004e0a5f11 Update jest 2023-11-06 14:24:33 +01:00
mike12345567 86f7bd192f Moving audit log init to be part of the server startup. 2023-11-03 14:55:56 +00:00
Andrew Kingston 1146f7e19a Merge branch 'new-branding' of github.com:Budibase/budibase into new-branding 2023-10-31 13:59:47 +00:00
Andrew Kingston 7c1f71745e Update email link and button colours and sort apps in portal side bar 2023-10-31 13:58:59 +00:00
Andrew Kingston c73117e336
Merge branch 'master' into new-branding 2023-10-31 13:56:44 +00:00
Andrew Kingston e8f5980905 Update images in emails, readme and a few other usages 2023-10-31 11:13:19 +00:00
Adria Navarro 18b8d6d3ef Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-10-31 09:55:30 +01:00
Adria Navarro a80ea2f2c0 Clean scripts 2023-10-30 14:38:26 +01:00
Adria Navarro 24eed537ed Fix timeouts 2023-10-30 12:00:55 +01:00
Adria Navarro b0ef79bbd9 Build for both amd and arm platforms 2023-10-30 11:36:32 +01:00
Adria Navarro 725e3aa4ef Use image v2 on build:docker 2023-10-30 10:11:06 +01:00
Adria Navarro 7b7dc84a8e Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-10-27 16:05:43 +02:00
Adria Navarro 6abb1b5f70 Merge branch 'master' into BUDI-7580/account_portal_submodule 2023-10-27 10:57:07 +02:00
Sam Rose 5a80487c77
Fix redirect loop when accessing a group as a global builder but not an admin. 2023-10-26 17:54:26 +01:00
Adria Navarro 8db0ff79a6 Increase yarn timeouts 2023-10-26 12:44:52 +02:00
Adria Navarro 453c0744be Fix tests 2023-10-23 15:20:44 +02:00
Adria Navarro e3b342da57 Fix after renames 2023-10-23 13:57:23 +02:00
Adria Navarro 3c16e82035 Comment docker 2023-10-23 13:55:23 +02:00
Adria Navarro 0cc7cc67a3 Renames 2023-10-23 13:53:18 +02:00
Adria Navarro d1f0e8fca0 Fix tests 2023-10-20 17:53:40 +02:00
Adria Navarro e83e45e2b6
Merge branch 'master' into BUDI-7641/package_version_from_env 2023-10-20 17:40:17 +02:00
Adria Navarro 5ee1d73e81 Add args to build 2023-10-20 17:25:30 +02:00
Adria Navarro 9dacb5849b Add versions to server/worker docker v2 2023-10-20 17:19:44 +02:00
mike12345567 8c744ea7a9 PR comments. 2023-10-20 15:57:45 +01:00
mike12345567 04a2bbc61a Two fixes here - a quick fix for the builder side panel, making sure it fills up with users correctly (not all, but enough to make it look more pleasant) as well as dropping user search endpoint permissions to allow basic users to access it for user columns. 2023-10-20 15:45:35 +01:00
Adria Navarro 56ae857d49 Add version to dev .env 2023-10-20 16:21:48 +02:00
Adria Navarro 6b68e52836 Use v2 dockerfiles 2023-10-20 10:02:18 +02:00
Adria Navarro 63a26ac823 Fix dependencies 2023-10-19 11:16:52 +02:00
Adria Navarro 3851a67915 Unify jsonwebtoken and lodash packages 2023-10-19 11:00:53 +02:00
Adria Navarro ba053490dc Npm-less images 2023-10-18 16:08:54 +02:00
Sam Rose f9bff0846a
Merge branch 'master' into refactor/remove-jsdoc-types-in-ts-files 2023-10-18 11:45:52 +01:00
Adria Navarro 3fd2973152 Remove sentry packages 2023-10-18 10:51:09 +02:00
Adria Navarro ea1853c78c Remove sentry from the backend 2023-10-18 10:51:09 +02:00
Adria Navarro ac9c99aebc Remove sentry packages 2023-10-18 10:50:18 +02:00
Adria Navarro 0b1bfdee6b Remove sentry from the backend 2023-10-18 10:49:15 +02:00
Adria Navarro dd526c92e6 Unify supertest 2023-10-18 10:49:15 +02:00
Adria Navarro 0f862088d2 Unify lodash 2023-10-18 10:49:15 +02:00
Adria Navarro c9b7c861f4 Unify packages 2023-10-18 10:49:15 +02:00
Sam Rose 767900aec6
Remove type information from JSDoc in .ts files, it's redundant. 2023-10-17 16:46:32 +01:00