Commit Graph

1242 Commits

Author SHA1 Message Date
Rory Powell efe53bb217 Update license endpoints to provide consistent pattern for offline license and license key (create, read, delete) 2023-07-06 20:46:25 +01:00
Rory Powell 586bca16d0 Move OFFLINE_MODE to backend-core environment 2023-07-06 20:44:48 +01:00
mike12345567 6d24a30d91 Basic refactor work, the types required for the new API endpoints. 2023-07-05 18:28:04 +01:00
Michael Drury f7cdf5f2bc Merge pull request #11001 from Budibase/feature/custom-role-readable-ids
Custom roles - readable IDs
2023-06-27 16:17:08 +01:00
Dean eaecd3ab68 Merge remote-tracking branch 'origin/develop' into merge-master 2023-06-27 09:31:35 +01:00
mike12345567 8882801315 Fixing lookup of custom role by ID in test case. 2023-06-26 17:01:50 +01:00
Dean 8f9a1d4bba PR feedback 2023-06-26 10:23:57 +01:00
Dean 10108fb543 Null checking logo configs 2023-06-26 10:22:03 +01:00
Dean 6f24772f49 PR Feedback 2023-06-23 16:40:40 +01:00
Dean ceecd85d76 OIDC icon fix recreated on a new branch 2023-06-23 14:47:58 +01:00
mike12345567 38be94fa07 Fix for test case. 2023-06-20 12:36:05 +01:00
mike12345567 3955b00bbc Merge branch 'develop' of github.com:Budibase/budibase into fix/airgap-templates-call 2023-06-19 18:57:17 +01:00
mike12345567 289a75fc9a Few minor updates to the integration suite to make it easier to decipher what is happening under the hood, as well as making it easier to log from these (where there is no pino logging available, importing backend-core breaks things). Also added a new script which can be used to get local environment setup as needed to run qa-core tests. Finally, xdescribe for the failing test until can work out what is wrong with MongoDB installation in QA environment. 2023-06-19 18:28:38 +01:00
Martin McKeaveney 7c49dd716c remove console log 2023-06-15 15:29:29 +01:00
Martin McKeaveney dd8e54c5e1 update airgap script and enable support for offline mode 2023-06-15 15:20:14 +01:00
melohagan c0578d4cc2 Send meeting invite via automation email smtp (#10787)
* Pass calendar props into sendSmtpEmail

* Add calendar event to message

* Add Checkbox and DatePicker automation field UI

* Add URL prop

* Add url to sendSmtpEmail unit test

* Refactor

* Code review comments

* Make location optional

* Add EmailInvite type

---------

Co-authored-by: mike12345567 <me@michaeldrury.co.uk>
2023-06-08 14:25:35 +01:00
Adria Navarro deeba8bae3 Revert "Merge branch 'develop' into master"
This reverts commit 6f29c978e0, reversing
changes made to 1c6ff73c19.
2023-06-06 22:06:34 +01:00
Adria Navarro 3a6a3eb8a5 Store tokens in cache and amend redirect 2023-06-06 11:29:49 +01:00
Dean 0a7669ad2d PR feedback 2023-06-05 16:26:27 +01:00
Dean f20653d4ca Branding fixes 2023-06-05 15:20:04 +01:00
Rory Powell e00eb171be WIP logo url fixes 2023-06-05 14:01:46 +01:00
Michael Drury adbdaf394a Small update to make sure that save/patch calls to the rows API (all DS+) return the squashed relationships, not the whole structure. 2023-06-01 18:18:12 +01:00
Adria Navarro 0a2335a047 Merge pull request #10622 from Budibase/chore/improve_pipeline_times
Chore - Improve pipeline run time
2023-05-19 13:18:21 +02:00
Adria Navarro 0850ee7b8c Fix flakiness 2023-05-18 17:38:23 +02:00
mike12345567 55ec808a82 Fixing comment. 2023-05-16 15:47:38 +01:00
Adria Navarro 0882046ea2 Test search by email 2023-05-10 14:53:30 +02:00
Adria Navarro c05a93f875 Test last page search 2023-05-10 12:33:11 +02:00
Adria Navarro 3de3ddfa62 Add tests 2023-05-10 12:33:11 +02:00
Adria Navarro 63244e1dde Add test 2023-05-10 12:33:11 +02:00
Adria Navarro 8bbfa7e0ab Dynamic groups for testing 2023-05-10 12:31:09 +02:00
Adria Navarro ad257366cf Merge branch 'develop' into budi-6158/paginage-group-users 2023-05-10 10:37:38 +02:00
Adria Navarro a4e97f768b Add group name limit 2023-05-08 13:26:26 +02:00
Adria Navarro cd47bc20a2 Test name trimming 2023-05-08 12:45:30 +02:00
Adria Navarro 1b44f8b18b Do not allow empty names on request 2023-05-08 12:42:51 +02:00
Adria Navarro 752790f3c9 Do not allow undefined names on request 2023-05-08 12:41:48 +02:00
Adria Navarro 4eaa95fc41 Type contexts 2023-05-05 16:31:53 +01:00
Rory Powell 972e2257b7 [draft] Pricing/fixes (#10424)
* Fix qa core suite

* Update package.json

* Lint

* Handle conflict on account metadata

* Fix issue adding users via csv import when on paid plan

* Fix user invites

* Lint
2023-04-27 08:25:53 +01:00
Rory Powell aee52af7f0 Add feature and quota overrides to qa core for cloud tests (#10417)
* Fix qa core suite

* Update package.json

* Lint
2023-04-25 20:36:27 +01:00
mike12345567 ebb599e023 Removing units. 2023-04-25 15:22:15 +01:00
mike12345567 5d0fa664f9 Quick attempt at fix for #10274 - some email clients don't respect width, add both height and width. 2023-04-25 15:20:25 +01:00
Rory Powell ec06f13aa6 Per user pricing (#10378)
* Update pro version to 2.4.44-alpha.9 (#10231)

Co-authored-by: Budibase Staging Release Bot <>

* Track installation and unique tenant id on licence activate (#10146)

* changes and exports

* removing the extend

* Lint + tidy

* Update account.ts

---------

Co-authored-by: Rory Powell <rory.codes@gmail.com>
Co-authored-by: mike12345567 <me@michaeldrury.co.uk>

* Type updates for loading new plans (#10245)

* Add new quota for max users on free plan

* Split available vs purchased plan & price type definitions. Update usages of available prices and plans

* Type fixes

* Add types for minimums

* New `PlanModel` type for `PER_USER` and `DAY_PASS` (#10247)

* Add new quota for max users on free plan

* Split available vs purchased plan & price type definitions. Update usages of available prices and plans

* Type fixes

* Add types for minimums

* New `PlanModel` type for `PER_USER` and `DAY_PASS`

* Add loadEnvFiles to lerna config for run command to prevent local test failures

* Fix types in license test structure

* Add quotas integration to user create / delete + migration (#10250)

* Add new quota for max users on free plan

* Split available vs purchased plan & price type definitions. Update usages of available prices and plans

* Type fixes

* Add types for minimums

* New `PlanModel` type for `PER_USER` and `DAY_PASS`

* Add loadEnvFiles to lerna config for run command to prevent local test failures

* Fix types in license test structure

* Add quotas integration to user create / delete

* Always sync user count from view total_rows value for accuracy

* Add migration to sync users

* Add syncUsers.spec.ts

* Lint

* Types and structures for user subscription quantity sync (#10280)

* Add new quota for max users on free plan

* Split available vs purchased plan & price type definitions. Update usages of available prices and plans

* Type fixes

* Add types for minimums

* New `PlanModel` type for `PER_USER` and `DAY_PASS`

* Add loadEnvFiles to lerna config for run command to prevent local test failures

* Fix types in license test structure

* Add quotas integration to user create / delete

* Always sync user count from view total_rows value for accuracy

* Add migration to sync users

* Add syncUsers.spec.ts

* Prevent old installs from activating, track install info via get license request instead of on activation.

* Add usesInvoicing to PurchasedPlan

* Add min/max users to PurchasedPlan

* Additional test structures for generating a license, remove maxUsers from PurchasedPlan - this is already present in the license quotas

* Stripe integration for monthly prorations on annual plans

* Integrate annual prorations with test clocks

* Updated types, test utils and date processing for licensing (#10346)

* Add new quota for max users on free plan

* Split available vs purchased plan & price type definitions. Update usages of available prices and plans

* Type fixes

* Add types for minimums

* New `PlanModel` type for `PER_USER` and `DAY_PASS`

* Add loadEnvFiles to lerna config for run command to prevent local test failures

* Fix types in license test structure

* Add quotas integration to user create / delete

* Always sync user count from view total_rows value for accuracy

* Add migration to sync users

* Add syncUsers.spec.ts

* Prevent old installs from activating, track install info via get license request instead of on activation.

* Add usesInvoicing to PurchasedPlan

* Add min/max users to PurchasedPlan

* Additional test structures for generating a license, remove maxUsers from PurchasedPlan - this is already present in the license quotas

* Stripe integration for monthly prorations on annual plans

* Integrate annual prorations with test clocks

* Updated types, test utils and date processing

* Lint

* Pricing/billing page (#10353)

* bbui updates for billing page

* Require all PlanTypes in PlanMinimums for compile time safety

* fix test package utils

* Incoming user limits warnings (#10379)

* incoming user limits warning

* fix inlinealert button

* add corretc button link and text to user alert

* pr comments

* simplify limit check

* Types and test updates for subscription quantity changes in account-portal (#10372)

* Add chance extensions for `arrayOf`. Update events spies with license events

* Add generics to doInTenant response

* Update account structure with quota usage

* User count limits (#10385)

* incoming user limits warning

* fix inlinealert button

* add corretc button link and text to user alert

* pr comments

* simplify limit check

* user limit messaging on add users modal

* user limit messaging on import users modal

* update licensing store to be more generic

* some styling updates

* remove console log

* Store tweaks

* Add startDate to Quota type

---------

Co-authored-by: Rory Powell <rory.codes@gmail.com>

* Lint

* Support custom lock options

* Reactivity fixes for add user modals

* Update ethereal email creds

* Add warn for getting invite from code error

* Extract disabling user import condition

* Handling unlimited users in modals logic and adding start date processing to store

* Lint

* Integration testing fixes (#10389)

* lint

---------

Co-authored-by: Mateus Badan de Pieri <mateuspieri@gmail.com>
Co-authored-by: mike12345567 <me@michaeldrury.co.uk>
Co-authored-by: Peter Clement <PClmnt@users.noreply.github.com>
2023-04-24 09:31:48 +01:00
mike12345567 b6f14a3f55 Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754 2023-04-17 14:58:40 +01:00
adrinr ac4e45a433 Replace usages 2023-04-17 10:27:37 +01:00
mike12345567 d506ef52f8 Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754 2023-04-17 10:16:15 +01:00
Adria Navarro b5175884c7 Merge pull request #10310 from Budibase/budi-6855-allow-editing-group-display-names
BUDI-6855 - Allow editing group display names
2023-04-17 10:51:41 +02:00
Michael Drury 941947f04c Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754 2023-04-14 22:42:02 +01:00
mike12345567 b36702ca72 Merge branch 'master' of github.com:Budibase/budibase into develop 2023-04-14 17:32:04 +01:00
adrinr c83cf33707 Test get group without members 2023-04-14 15:14:41 +01:00
adrinr f3e6295892 Add tests 2023-04-14 14:50:44 +01:00
adrinr ce2a610c00 Test exclude members 2023-04-14 14:48:48 +01:00
adrinr 1301b23f02 Add group filter fetch 2023-04-14 14:36:06 +01:00
adrinr f882993091 Name and its fields are optional 2023-04-11 16:12:18 +01:00
adrinr c77ed3d737 Renames 2023-04-11 13:39:13 +01:00
adrinr 56567de04a Fix tests 2023-04-11 13:39:13 +01:00
adrinr e1279ffecd Use proper errors instead of string throwing 2023-04-11 13:39:13 +01:00
adrinr 57a3ff96ea Add new test for conflicting user email 2023-04-11 13:39:13 +01:00
adrinr 122db55dce Fix tests 2023-04-10 18:47:22 +01:00
mike12345567 0803b08217 Merge branch 'develop' of github.com:Budibase/budibase into fix/BUDI-6754 2023-04-05 17:59:18 +01:00
Rory Powell 976b3a55ca Update logging to support dd trace attributes (#10086)
* Update logging middleware to integrate with pino for console logging

* Remove elastic apm references, use updated core middlewares

* Remove redundant LOG_LEVEL definitions

* Remove no longer needed jest logging overrides

* lint

* Backwards compat between console log helpers and pino

* Configurable DISABLE_HTTP_LOGGING

* Don't log 4xx as errors

* Remove redundant ENABLE_4XX_HTTP_LOGGING

* Cleanup migrations and event logging

* Improve bb-alert logging

* Add DISABLE_HTTP_LOGGING to helm chart

* Add ops endpoints for testing

* Disable http logging in dev

* Backwards compatible tracing implementation

* Naming update on http logging env var

* lint

* Update packages/backend-core/src/environment.ts

Co-authored-by: Adria Navarro <adria@revityapp.com>

* Merge

* Lint

* Fix console.warn failing mock by replacing with alerts mock instead

* Lint

---------

Co-authored-by: Adria Navarro <adria@revityapp.com>
2023-04-04 15:08:46 +01:00
mike12345567 a2cabb01d5 Removing user app sync calls from worker - no longer required. 2023-04-04 13:53:30 +01:00
Rory Powell 5eecb6e686 Remove loop for get account during user bulk import (#10203) 2023-04-04 10:14:20 +01:00
adrinr e0bcc42c80 Make scim info extensible and the object unaware of the data 2023-04-03 19:06:03 +01:00
Adria Navarro e1669c8260 Merge pull request #10022 from Budibase/feature/scim
Feature - SCIM endpoints
2023-04-03 13:22:01 +02:00
adrinr 48b964378b Remove all app cookie references (not really needed anymore) 2023-03-31 09:01:40 +01:00
Rory Powell 38e6d61709 Explictly check for google datasource configured (#10165)
* Explictly check for google datasource configured

* Unit tests for getGoogleDatasourceConfig

* Update /api/global/configs/public test + lint
2023-03-30 13:40:59 +01:00
mike12345567 f40da2dc49 Test fix. 2023-03-29 18:18:37 +01:00
mike12345567 26aeac357d Removing tenancy validity check, instead depending on the PLATFORM_URL environment variable for determining tenant ID. 2023-03-29 16:19:35 +01:00
Michael Drury d255bfad0b Merge pull request #10149 from Budibase/fix/budicloud-log-out
Budicloud logout on googlesheet auth
2023-03-29 14:47:15 +01:00
mike12345567 70d91acc41 Adding a check for the tenant ID - to make sure it is a real tenant before forcing the user out of the platform based on it. 2023-03-29 14:19:54 +01:00
Rory Powell d6992bbf94 Merge branch 'master' into merge-master-develop 2023-03-29 11:52:09 +01:00
adrinr 18ccb0fd27 Add and map display name in scim 2023-03-29 10:41:37 +01:00
adrinr 5e478f2eaa Fix setting scim config 2023-03-29 09:27:52 +01:00
adrinr 23088c036e Replace beforeEach for before All 2023-03-28 16:46:23 +01:00
adrinr 247f44ac32 Fix tests 2023-03-28 16:46:23 +01:00
adrinr 1a9653a4db Tests configs 2023-03-28 16:46:23 +01:00
adrinr d0772ee142 Test when scim is disabled 2023-03-28 16:46:23 +01:00
adrinr 5d8c1e7e92 Merge scim tests 2023-03-28 16:46:23 +01:00
adrinr 2586f30548 Merge tests 2023-03-28 16:46:23 +01:00
adrinr d1c224ed42 Fix tests 2023-03-28 16:46:23 +01:00
adrinr 74573a1625 Rename routes 2023-03-28 16:46:23 +01:00
adrinr a5f6fddbdb Fix merge conflicts 2023-03-28 16:46:23 +01:00
adrinr 62cd6a43f2 Remove "duplicated" events 2023-03-28 16:46:23 +01:00
adrinr 31eaa36883 Unify create events 2023-03-28 16:46:23 +01:00
adrinr 924c103ccc Use ids instead of email on the events 2023-03-28 16:46:23 +01:00
adrinr 26f077cc1c Event on delete 2023-03-28 16:46:23 +01:00
adrinr cbadf69a29 Dispatch event on user update 2023-03-28 16:46:23 +01:00
adrinr 7840470d83 Add create test 2023-03-28 16:46:23 +01:00
adrinr 2476b64163 Updates 2023-03-28 16:46:23 +01:00
adrinr 25276bafb2 Dry tests 2023-03-28 16:46:23 +01:00
adrinr 7bfdd31daa Test different patch use cases 2023-03-28 16:46:23 +01:00
adrinr cd202839b7 Add multiple users tests 2023-03-28 16:46:23 +01:00
adrinr 76cb3e6061 Test adding user 2023-03-28 16:46:23 +01:00
adrinr 4ac682a3c2 Move creators to structures 2023-03-28 16:46:22 +01:00
adrinr 586275ed89 Allow fields edit 2023-03-28 16:46:22 +01:00
adrinr baca156a17 Implement delete endpoint 2023-03-28 16:46:22 +01:00
adrinr 6de4588fc1 Implement find endpoint 2023-03-28 16:46:22 +01:00
adrinr 10e465e07d Fix merge conflicts 2023-03-28 16:46:22 +01:00
adrinr 5dbbdf3f82 Use generic mock dates 2023-03-28 16:46:22 +01:00
adrinr 8f3488707b Add get and create tests 2023-03-28 16:46:22 +01:00
adrinr 8196277a01 Add scim group api test tools 2023-03-28 16:46:22 +01:00
adrinr 4e82957e52 Fix test 2023-03-28 16:46:22 +01:00
adrinr 51ebad2b14 Test activations 2023-03-28 16:46:22 +01:00
adrinr e222381a6c Test extra cases 2023-03-28 16:46:22 +01:00
adrinr de716ba869 Add extra tests 2023-03-28 16:46:22 +01:00
adrinr d452f5cf0d Handle string boolean requests 2023-03-28 16:46:22 +01:00
adrinr 3b07f0e1a2 filter by email 2023-03-28 16:46:22 +01:00
adrinr 05b7467076 Test filter by external id 2023-03-28 16:46:22 +01:00
adrinr ad2a23d113 Test filtering by user name 2023-03-28 16:46:22 +01:00
adrinr 495c8f4b0e Undo unwanted changes 2023-03-28 16:46:22 +01:00
adrinr e568c5756f Fix tests 2023-03-28 16:46:22 +01:00
adrinr fc0c4815af Handle SCIM body requests 2023-03-28 16:46:22 +01:00
adrinr 2fda1bb5d1 Clean tests 2023-03-28 16:46:22 +01:00
adrinr 86d848458e Test second page 2023-03-28 16:46:22 +01:00
adrinr e679cc3987 Add multifetch test 2023-03-28 16:46:22 +01:00
adrinr 4f2696ed32 Use ctx.identity instead of passing it as param 2023-03-28 16:46:22 +01:00
adrinr f8959aacb0 Fix merge conflicts 2023-03-28 16:46:22 +01:00
adrinr 829aee1f68 Add tests 2023-03-28 16:46:22 +01:00
adrinr fbd53d5fd3 Add delete test 2023-03-28 16:46:22 +01:00
adrinr 4f9b5a6aea Patch endpoint 2023-03-28 16:46:22 +01:00
adrinr 89957f5490 Fix merge conflicts 2023-03-28 16:46:22 +01:00
adrinr 24d2937d0b Implement patch tests 2023-03-28 16:46:22 +01:00
adrinr 40a1921f02 Use scim-patch package 2023-03-28 16:46:22 +01:00
adrinr 3500aabc8a Patch endpoint 2023-03-28 16:46:22 +01:00
adrinr a509dc1739 Add find endpoint tests 2023-03-28 16:46:22 +01:00
adrinr 263d3613be Test 404 2023-03-28 16:46:22 +01:00
adrinr afdefce55d Add find endpoint tests 2023-03-28 16:46:22 +01:00
adrinr f62647f284 Feature tests 2023-03-28 16:46:22 +01:00
adrinr a5b23c4067 Fix types 2023-03-28 16:46:22 +01:00
adrinr 2c157c0feb Test persistation 2023-03-28 16:46:22 +01:00
adrinr 3e68e8ebe8 Add tests 2023-03-28 16:46:22 +01:00
adrinr f8396725d1 Init pro with the save user function 2023-03-28 16:46:22 +01:00
adrinr 2072664294 Move user search to core 2023-03-28 16:46:22 +01:00
adrinr 39f9ffa4e6 Renames and consistency 2023-03-28 16:46:22 +01:00
adrinr 9c64f54fa9 Rename types 2023-03-28 16:46:22 +01:00
adrinr 81e086680d Test 403s 2023-03-28 16:46:22 +01:00
adrinr 7fef377e1d Improve test helpers 2023-03-28 16:46:22 +01:00
adrinr b120fce5dd Add tests 2023-03-28 16:46:22 +01:00
adrinr 4068faf9f3 Add scaffolding 2023-03-28 16:46:22 +01:00
adrinr d083553373 Add scim endpoints 2023-03-28 16:46:22 +01:00
Rory Powell 06794d8085 Chore: Account deletion via API (#10137) 2023-03-28 14:49:46 +01:00
Dean 8557c307dd Merge remote-tracking branch 'origin/develop' into feature/whitelabelling 2023-03-28 11:19:08 +01:00
deanhannigan dfe6b55c1a Merge branch 'feature/whitelabelling' into feature/whitelabelling-pro 2023-03-28 09:13:47 +01:00
Rory Powell 60650b031b Move branding read behind pro 2023-03-27 22:28:25 +01:00
Dean 56e1d102fc Added feature flag function for branding to ensure it uses the cached license 2023-03-27 21:15:09 +01:00
mike12345567 cf5316ec8d General fixes for open handles, attempting to find and close all issues in server which are stopping shutdown of Jest suite. 2023-03-27 19:38:49 +01:00
Dean 4de8333f80 Review updates 2023-03-27 18:00:57 +01:00
Dean 6db03768e6 Review updates 2023-03-27 17:28:12 +01:00
mike12345567 82286d519f Fixing some issues with test cases. 2023-03-21 17:27:31 +00:00
Dean bfd7e49c72 Template fixes and updates to the file picker. Error handling added to display a warning when navigating to an unpublished or invalid app url. 2023-03-21 09:20:43 +00:00
Vinoth Kirubakaran a46a33877b chore: ran prettier for environment.ts and auth.ts 2023-03-16 12:43:06 +00:00
Vinoth Kirubakaran 9407383c54 Update auth.ts
Updated success and error redirect paths using ENV variables
2023-03-16 12:42:48 +00:00
Vinoth Kirubakaran 0b26cc8743 Update environment.ts
Added new ENV variables for auth redirect paths
2023-03-16 12:42:29 +00:00
Dean ce33afdeae Merge remote-tracking branch 'origin/develop' into feature/whitelabelling 2023-03-16 09:07:58 +00:00
Dean 253ee413a2 Working commit 2023-03-16 09:07:21 +00:00
Rory Powell de89b9112a Simplify errors framework (#10042)
* Simplify errors framework

* Use enum for ErrorCode

* Lint

* Update base BudibaseError type to use enum

* For for public error on UsageLimitError

* Build fix

* Build fix
2023-03-16 08:42:02 +00:00
Dean f3b58923cf Merge remote-tracking branch 'origin/develop' into feature/whitelabelling 2023-03-15 09:13:36 +00:00
mike12345567 63cf91218d Merge branch 'master' of github.com:Budibase/budibase into develop 2023-03-14 14:12:32 +00:00
Rory Powell e116941750 Rotatable secrets (#9982)
* Rotatable secrets

* Set new api encryption key var

* Lint

* Use fallback keys instead of array

* Point api encryption key to dedicated value

* Add API_ENCRYPTION_KEY to cli

* Lint + add api encryption key to env files
2023-03-13 15:02:59 +00:00
Dean 5ce52cad06 Working commit 2023-03-13 12:33:16 +00:00
Michael Drury 51c63d7258 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.
2023-03-10 15:19:46 +00:00
Rory Powell c33ea4dcfe Update deployment templates to remove unused cdn url and fix empty env vars (#9967) 2023-03-09 16:13:26 +00:00
mike12345567 b735259534 Merge branch 'master' of github.com:Budibase/budibase into develop 2023-03-08 12:37:34 +00:00
Rory Powell b92d9c60ca Don't require password on update if user doesn't have one (#9941) 2023-03-08 12:00:02 +00:00
mike12345567 ae3671ea42 Merge branch 'master' of github.com:Budibase/budibase into develop 2023-03-07 17:49:44 +00:00
Martin McKeaveney 72cb60ec02 merge from master 2023-03-07 16:54:33 +00:00
Dean f622c84ebc Review feedback 2023-03-07 16:39:26 +00:00
Dean ab45e06edb Review updates 2023-03-07 16:17:29 +00:00
Dean ec9e570ac2 Test updates 2023-03-07 14:21:55 +00:00
Dean 5b9fbbc3b4 Various fixes for update self behaviour 2023-03-07 13:35:18 +00:00
Martin McKeaveney 63e7d9d97e update imports 2023-03-07 10:01:19 +00:00
Martin McKeaveney fd8488d4d3 remove array of tenantIds 2023-03-07 09:56:12 +00:00
Martin McKeaveney b839eafbe3 return all when in single tenant env 2023-03-07 09:49:58 +00:00
Martin McKeaveney ea5e564428 fix tenant filtering issue 2023-03-07 09:45:39 +00:00
Vinoth Kirubakaran 7be551b2ea chore: ran prettier for environment.ts and auth.ts 2023-03-06 15:55:29 +00:00
Vinoth Kirubakaran 201087ee95 Update auth.ts
Updated success and error redirect paths using ENV variables
2023-03-06 20:57:24 +05:30
Vinoth Kirubakaran c66e4f5c2a Update environment.ts
Added new ENV variables for auth redirect paths
2023-03-06 20:56:09 +05:30
Rory Powell 4c43ba2943 Bypass password onboarding for enforced sso (#9851) 2023-03-01 21:56:30 +00:00
Rory Powell 6917abb6e7 lint 2023-03-01 15:31:46 +00:00
Rory Powell c83684ed83 Prevent showing user exists for password disabled actions 2023-03-01 14:49:44 +00:00
Dean 09adef4d59 Fixes for invitation unit tests 2023-02-28 22:27:02 +00:00
Dean f66fc22f29 Updated email utility import 2023-02-28 17:05:11 +00:00
Dean a5c6dbe4ae Merge remote-tracking branch 'origin/develop' into feature/app-user-onboarding-ux 2023-02-28 16:38:44 +00:00
Dean 8c8dd637e1 Enable the feature tour window and extend the invite duration to 1 week 2023-02-28 16:38:11 +00:00
Rory Powell 7b48c2787e lint 2023-02-28 13:37:34 +00:00
Rory Powell 7ed0586673 Add validation between sso config acivation and sso enforcement 2023-02-28 13:36:54 +00:00
Dean dd08845a44 Merge remote-tracking branch 'origin/develop' into feature/app-user-onboarding-ux 2023-02-28 09:38:15 +00:00
Dean 61ed62e6c4 Builder user onboarding 2023-02-28 09:37:03 +00:00
mike12345567 2fb33e2cf3 Merge branch 'develop' of github.com:Budibase/budibase into feature/audit-logs 2023-02-27 14:51:33 +00:00
mike12345567 fefc6d920f Fixing open handle issue - now that the worker has access to queues needs to shut them down. 2023-02-27 14:41:28 +00:00
Rory Powell 2c46109e7d Enforceable SSO (#9787)
* Add ENFORCEABLE_SSO feature flag

* First draft of enforce sso configuration / show single sign on url

* Reading and writing isSSOEnforced + integration with login page

* Enable CI + lint

* Set correct base branch for CI

* Test fix for expected string changed

* Use tenant aware platform url as SSO link

* Bring in latest pro changes

* Lint

* Add useEnforceableSSO mock helper function

* Update configs.spec.ts with coverage for public settings

* Update users.spec.ts with additional tests for isPreventPasswordActions

* Lint

* Update refresh OAuthToken to use correct enum and add case statement
2023-02-27 13:42:51 +00:00
mike12345567 db2a8c125a Trying to remove audit log test - see if it fixes test stalling issue. 2023-02-27 13:31:52 +00:00
mike12345567 0a9344622a Fixing test case. 2023-02-27 13:17:42 +00:00
mike12345567 8853776c79 Moving around processors to separate audit logs out of central event handling. 2023-02-24 13:52:54 +00:00
mike12345567 58fab29fb4 Main body of PR comments. 2023-02-24 13:32:45 +00:00
mike12345567 0b48075688 Implementing a few basic tests to create and search the audit logs. 2023-02-23 17:23:06 +00:00
Rory Powell 2d993adec8 Fix for real email tests failing silently 2023-02-23 13:42:10 +00:00
Rory Powell d3a7286711 Configs updates: remove circular deps, dedicated module, typing improvements, reduce db reads 2023-02-23 13:41:35 +00:00
Dean 234e2fe3f3 Merge remote-tracking branch 'origin/develop' into feature/app-user-onboarding-ux 2023-02-23 11:19:29 +00:00
Dean b4c88bd545 Merge commit to dev 2023-02-23 10:38:03 +00:00
mike12345567 01076bd35f Getting downloading working correctly, some minor UI updates, adding a new middleware for converting a query string to a body (useful for when a GET has to be used). 2023-02-22 18:50:27 +00:00
mike12345567 22f42ef898 Adding new mechanism to get the ipAddress and userAgent of call for audit logs. 2023-02-21 19:14:57 +00:00
mike12345567 ef30c03fa6 Merge branch 'develop' of github.com:Budibase/budibase into feature/audit-logs 2023-02-21 17:26:24 +00:00
mike12345567 41eb0c3964 Updating worker db config to have replication available (for audit logs). 2023-02-21 17:22:23 +00:00
Rory Powell 940de8b6a0 Run CI steps in parallel (#9760)
* Parallel CI

* Add build to integration test

* Add checkout to top of each run

* Revert branch update for ci job

* Experiment with --runInBand for CI

* Fix intermittent backend-core migration test failure

* Fix hanging worker redis connection

* Update naming from reset to newTenant
2023-02-21 17:13:24 +00:00
Rory Powell a84665c199 Re-order deprovisioning sequence to fix platform user removal 2023-02-21 13:36:14 +00:00
Rory Powell cacf275a99 Prevent SSO users from setting / resetting a password (#9672)
* Prevent SSO users from setting / resetting a password

* Add support for ENABLE_SSO_MAINTENANCE_MODE

* Add typing to self api and build out user update sdk

* Integrate sso checks with user sdk. Integrate user sdk with self api

* Test fixes

* Move self update into SDK

* Lock down maintenance mode to admin user

* Fix typo

* Add health status response and return type signature to accounts.getStatus

* Remove some unnecessary comments

* Make sso save user function non optional

* Remove redundant check on sso auth details provider

* Update syncProfilePicture function name to getProfilePictureUrl

* Update packages/worker/src/sdk/users/events.ts

Co-authored-by: Adria Navarro <adria@revityapp.com>

* Add ENABLE_EMAIL_TEST_MODE flag

* Fix for logging in as sso user when existing user has password already

* Hide password update and force reset from ui for sso users

* Always disable sso maintenance mode in cloud

---------

Co-authored-by: Adria Navarro <adria@revityapp.com>
2023-02-21 08:23:53 +00:00
Rory Powell a57f0c9dea Merge branch 'develop' into rory/february 2023-02-20 09:57:17 +00:00
Rory Powell b34b5fc5bb Fix tenant creation on user save (#9725) 2023-02-17 09:16:11 +00:00
mike12345567 2afd3e1580 Updating events to include a proper friendly map of audited events. 2023-02-15 19:44:32 +00:00
mike12345567 6d83ea9bec Adding in event auditing to server/worker. 2023-02-15 18:03:55 +00:00
Jonny McCullagh c5bc0d4ffb add datadog apm (#9693)
* add datadog apm

* datadog init not start

* extra env vars for DD APM

* add datadog apm

* datadog init not start

* extra env vars for DD APM

* add datadog apm

* remove space

* Enable typescript integration with apm agents

* Fix typo

---------

Co-authored-by: Jonny <Jonny McCullagh>
Co-authored-by: Rory Powell <rory.codes@gmail.com>
2023-02-15 16:28:20 +00:00
Rory Powell bb1faac62a Merge master into develop 2023-02-15 15:10:02 +00:00
mike12345567 05ceee1cfe Moving lucene handling to backend-core so that it can be used for other databases (outside row indexes). 2023-02-13 17:13:59 +00:00
Rory Powell cc7eb64a3b Rename LOG_4XX to ENABLE_4XX_HTTP_LOGGING and enable by default 2023-02-13 14:39:24 +00:00
Rory Powell 0e3a17ab18 Merge pull request #9669 from Budibase/budi-6558-configurable-test-log-levels-and-common
Configurable test log levels and common error handling
2023-02-13 14:31:43 +00:00
Rory Powell ae9979929a Enable higher concurrency and resiliency in worker tests 2023-02-13 11:57:30 +00:00
Rory Powell 5cd6cb166a Configurable test log levels and common error handling 2023-02-13 11:53:01 +00:00
Rory Powell c05b063f10 Bump CI default unit test timeout to 10s 2023-02-09 09:19:31 +00:00
adrinr 2e29ac9ec7 Rename name for id 2023-02-03 12:09:56 +00:00
adrinr 5d58fc5948 Dry 2023-02-03 11:28:27 +00:00
adrinr 9936d03e27 Merge branch 'develop' into feature/dependencies-image 2023-02-03 10:44:40 +00:00
adrinr 74fe4ead31 Remove addTenantToGlobalDb from helpers 2023-02-03 09:59:57 +00:00
adrinr 4116d19a2b Clean tests 2023-02-03 09:54:25 +00:00
Dean 73f3fc41cb Bug fixes for logo and binding validation. Random fix for a button actions issue found while testing 2023-02-02 12:49:26 +00:00
adrinr 34278349c3 Merge branch 'develop' into feature/dependencies-image 2023-02-01 10:56:22 +00:00
adrinr abe3e2921f Race conditions 2023-01-31 22:50:52 +00:00
deanhannigan ee288c1f2d Merge pull request #9409 from Budibase/feature/user-onboarding-overlays
Feature/user onboarding overlays
2023-01-31 16:37:18 +00:00
deanhannigan 7540cad45c Merge pull request #9467 from Budibase/feature/auth-screens-redesign
Selfhost onboarding UX/UI updates
2023-01-31 16:13:46 +00:00
adrinr 9c04ae5f85 Expose beforeall error 2023-01-31 11:48:58 +00:00
adrinr dd2a05fdcb Looking for testcontainer config 2023-01-31 11:23:26 +00:00
adrinr 2b8190418c Log as error 2023-01-31 10:30:57 +00:00
adrinr fb9657872b Log global 2023-01-31 10:18:51 +00:00
Adria Navarro 16e53957bc Merge branch 'develop' into feature/dependencies-image 2023-01-30 18:54:05 +00:00
adrinr d160430ac8 Start race condition 2023-01-30 18:51:22 +00:00
adrinr b2db582f02 Use docker compose for test-containers 2023-01-30 18:15:29 +00:00
adrinr 60c3e522fe Add retry to prevent race conditions 2023-01-30 18:12:06 +00:00
adrinr 55de45e86b Fix tenancy issues 2023-01-30 16:45:04 +00:00
adrinr e074030a0f Fix test after patch 2023-01-30 16:39:15 +00:00
adrinr 7d279e2eca Fix test race conditions 2023-01-30 12:29:39 +00:00
Dean df84839ca6 Updated the user invite test to include the required firstName 2023-01-27 20:32:06 +00:00
adrinr 651c367f75 Fix worker tests 2023-01-27 17:59:14 +00:00
Dean d37c0e4b5d UI Onboarding UI/UX auth refactoring 2023-01-27 13:44:57 +00:00
Rory Powell da2c809a09 Merge branch 'develop' into feature/environment-variables 2023-01-27 11:27:11 +00:00
mike12345567 63d882efc6 Adding frontend event publishing for events like upgrade panel opened. 2023-01-23 19:18:02 +00:00
mike12345567 557a9a8eeb Adding an API for publishing an event from the frontend. 2023-01-23 18:56:44 +00:00
Dean a10bd138ff Merge remote-tracking branch 'origin/develop' into feature/user-onboarding-overlays 2023-01-23 09:34:20 +00:00
Dean 14da8c0c9e Added new onboarding tour flow for builder 2023-01-23 00:32:01 +00:00
mike12345567 0f33fd8d48 Merge branch 'develop' of github.com:Budibase/budibase into feature/test-image 2023-01-20 19:55:11 +00:00
Andrew Thompson 0f5d0a0992 fix auth config validation for saving deactivation (#9361) 2023-01-19 13:06:38 +00:00
Adria Navarro 70a01c48f1 Merge pull request #9337 from Budibase/bug/#7220-removing-user-from-auth-does-not-remove-from-app
Bug - #7220 removing user from auth does not remove from app
2023-01-16 10:49:27 +00:00
Adria Navarro 946cc35ff7 Type request and body 2023-01-16 10:15:00 +00:00
Adria Navarro 23266bd456 Send old user on delete 2023-01-13 14:54:26 +00:00
Adria Navarro ff10fa422b Unify endpoints 2023-01-13 14:45:04 +00:00
Adria Navarro c853d2c78e Rename and move type check 2023-01-13 13:36:35 +00:00
Adria Navarro 09570e26f6 Remove user within the app on deletion 2023-01-12 16:28:02 +00:00
Rory Powell e5e767f18d Correlation id's and log context (#7232)
* Correlation id's and log context

* fix build

* Remove redundant fields from LoggingProcessor.ts

* Only log correlation id when present e.g. this is not present on startup / shutdown / automations
2023-01-11 20:39:33 +00:00
mike12345567 75df57c3d1 Merge branch 'develop' of github.com:Budibase/budibase into feature/test-image 2023-01-11 10:31:57 +00:00
Rory Powell fba7ef26ad Replace ts-jest with swc/jest (#9289)
- Add swc dependencies
- Add transform change to jest.config.ts
- Replace `export =` with `export default` in src code to enable code coverage to work with swc transformer
- Restructure backend-core errors package to allow for exporting error classes with ESM syntax
- Update backend-core to no longer use `export =`, export individual packages instead of replacing with `export default` for backwards compatibility
- Update event publishers to use `export default` - this was required for the `jest.spyOn` usage inside backend-core common mocks
- Restructure some jest.mock usages where declaring the jest.fn as a variable outside of the package mock threw an error
2023-01-11 09:37:37 +00:00
mike12345567 ea5b515783 Playing around with getting tests working. 2023-01-04 19:47:56 +00:00
Martin McKeaveney 84ab7862d1 fixes for google sheets, admin checklist, and deleting an app from API (#8846)
* fixes for google sheets, admin checklist, and deleting an app from API

* code review

* splitting unpublish endpoint, moving deploy endpoint to applications controller. Still to do public API work and move deployment controller into application controller

* updating REST method for unpublish in API test

* unpublish and publish endpoint on public API, delete endpoint unpublishes and deletes app

* removing skip_setup from prodAppDb call

* removing commented code

* unit tests and open API spec updates

* unpublish, publish unit tests - delete still in progress

* remove line updating app name in API test

* unit tests

* v2.1.46

* Update pro version to 2.1.46

* v2.2.0

* Update pro version to 2.2.0

* Fix for budibase plugin skeleton, which utilises the old import style.

* Fix side nav styles

* v2.2.1

* Update pro version to 2.2.1

* using dist folder to allow importing constants for openAPI specs

* v2.2.2

* Update pro version to 2.2.2

* Fix for user enrichment call (updating to @budibase/nano fork) (#9038)

* Fix for #9029 - this should fix the issue users have been experiencing with user enrichment calls in apps, essentially it utilises a fork of the nano library we use to interact with CouchDB, which has been updated to use a POST request rather than a GET request as it supports a larger set of data being sent as query parameters.

* Incrementing Nano version to attempt to fix yarn registry issues.

* v2.2.3

* Update pro version to 2.2.3

* Fix SQL table `_id` filtering (#9030)

* Re-add support for filtering on _id using external SQL tables and fix filter key prefixes not working with _id field

* Remove like operator from internal tables and only allow basic operators on SQL table _id column

* Update data section filtering to respect new rules

* Update automation section filtering to respect new rules

* Update dynamic filter component to respect new rules

* v2.2.4

* Update pro version to 2.2.4

* lock changes (#9047)

* v2.2.5

* Update pro version to 2.2.5

* Make looping arrow point in right direction (#9053)

* v2.2.6

* Update pro version to 2.2.6

* Types/attaching license to account (#9065)

* adding license type to account

* removing planDuration

* v2.2.7

* Update pro version to 2.2.7

* Environment variable type coercion fix (#9074)

* Environment variable type coercion fix

* Update .gitignore

* v2.2.8

* Update pro version to 2.2.8

* tests passing

* all tests passing, updates to public API response

* update unpublish call to return 204, openAPI spec and unit

* fixing API tests

Co-authored-by: Budibase Release Bot <>
Co-authored-by: mike12345567 <me@michaeldrury.co.uk>
Co-authored-by: Andrew Kingston <andrew@kingston.dev>
Co-authored-by: melohagan <101575380+melohagan@users.noreply.github.com>
Co-authored-by: Rory Powell <rory.codes@gmail.com>
2022-12-19 13:18:00 +00:00
Rory Powell 786039055e File authentication using presigned URLs (#8883)
* file auth wip

* Private plugin bucket wip

* Add etag to logo request, fix circular dependency

* Resolve cyclic dependency

* Ensure browser doesn't cache custom component

* Global file fixes

* File fixes / remove permaUrl

* Add ctx local storage

* Enable presigned url to work from any host

* Test fix

* Self hosting w/ S3 + other fixes

* Fix for serving dev app in multi tenant

* Fix backup restore and import attachment url processing, never store attachment urls

* Test fixes

* Unit tests WIP

* Replace file path with base64 encoded private key

* Multi tenancy tests for files

* Environment files fixes

* Post-merge build and test fixes

* Add debug conditional to all jest logging and revert/fix prod minio proxy_pass

* Re-add default '/' minio route :(

* Rename iconFile -> iconFileName

* Add cloudfront vars to k8s templates

* Remove public bucket policy

* Remove duplicated test
2022-12-15 11:35:22 +00:00
Peter Clement 9d841bc947 Server and Worker tests (#8928)
* automation unit tests

* row processor tests

* update executeQuery test

* update groups assertion

* some more worker tests

* plugin tests and tidying up

* linting

* temporarily disable group tests

* more tests

* fix import

* fix backup tests

* add pro mocks to worker

* check for app existence in import test

* test new tsconfig

* testing changes

* Pro test utils (#9020)

* Pro test utils changes

* Add test fixes

* Remove ts-ignore

Co-authored-by: mike12345567 <me@michaeldrury.co.uk>
Co-authored-by: Rory Powell <rory.codes@gmail.com>
2022-12-12 22:02:32 +00:00
mike12345567 0809c025d1 Adding unit test. 2022-12-07 18:37:23 +00:00
mike12345567 472454aef4 build fixes. 2022-12-07 18:04:20 +00:00
mike12345567 20984e8072 Some fixes based on test failure. 2022-12-07 17:33:26 +00:00
mike12345567 85dd6f2880 Extension on fix for user self assignment, don't allow users to change their admin/builder status. 2022-12-07 12:42:14 +00:00
Rory Powell dd452666b0 lint 2022-12-01 15:02:05 +00:00
Rory Powell cd2eb2d283 test fix 2022-12-01 15:00:56 +00:00
Rory Powell 11a15b27d3 build fix 2022-12-01 14:44:56 +00:00
Rory Powell 7a7bbd1857 Merge branch 'master' into develop 2022-12-01 14:39:05 +00:00
Mel O'Hagan 6fe2c38bce Move custom rbac from controller to routes 2022-11-30 09:29:56 +00:00
Rory Powell 98084a9a31 Fix default env processing typescript error 2022-11-29 22:11:44 +00:00
Mel O'Hagan 0e0157c888 lint 2022-11-29 17:23:54 +00:00
Mel O'Hagan 197699b2ad refactor 2022-11-29 16:38:44 +00:00
Mel O'Hagan d0909392d7 Added unit tests 2022-11-29 16:11:53 +00:00
Michael Drury 3dad683cb9 Adding back prod check. 2022-11-29 15:43:44 +00:00
Michael Drury f65a6171d8 Fixing sentry init. 2022-11-29 15:38:25 +00:00
Mel O'Hagan 89db22858a lint 2022-11-29 15:14:29 +00:00
Mel O'Hagan c476b20ac1 Fix unit tests 2022-11-29 15:13:58 +00:00
Mel O'Hagan 376e17cae1 Only allow admin to create new user 2022-11-29 11:36:24 +00:00
mike12345567 d6e9380c06 General work after running some tests in CI - general refactoring as well. 2022-11-28 17:54:04 +00:00
Mel O'Hagan 0b3d84b63d Invite is adminOnly 2022-11-28 16:02:49 +00:00
Mel O'Hagan bc68b16526 Allow developers to manage user access 2022-11-28 16:01:27 +00:00
mike12345567 90362b65c1 Disabling js interop in Typescript build of backend-core and worker, fixing build issues. 2022-11-26 14:46:01 +00:00
mike12345567 3ce9df0d25 Merge branch 'develop' of github.com:Budibase/budibase into refactor/backend-core-worker 2022-11-26 13:51:19 +00:00
mike12345567 a3bb2e0d77 Automation overhaul to Typescript, plus type updates. 2022-11-25 19:57:07 +00:00
Rory Powell e095e40d2e Environment variable type coercion fix 2022-11-25 12:55:58 +00:00
Rory Powell f748cbc853 Environment variable type coercion fix 2022-11-25 12:52:50 +00:00
mike12345567 d3c4c99e16 Complete conversion of backend-core to Typescript. 2022-11-24 18:48:51 +00:00
mike12345567 bfaef13768 Refactoring worker, converting all controllers/routes to Typescript and all imports of backend-core to new style. 2022-11-23 18:25:20 +00:00
Dean 0441704c57 Import fixes for backend core constants. Minor name change for default data source from Test DB to Sample Data 2022-11-21 12:47:36 +00:00
mike12345567 58e59bfacc Updating PouchLike to be an interface in types, with its impl stored in backend-core, now called Database. 2022-11-17 14:35:03 +00:00
mike12345567 bc857d7bb8 PR comments - still experiencing build issues. 2022-11-17 13:31:54 +00:00
mike12345567 f5760b6601 Fixes post merge. 2022-11-16 18:28:45 +00:00
mike12345567 cdc25d7032 Some worker typescript conversions. 2022-11-16 18:13:34 +00:00
mike12345567 29dd98a7fc Merge branch 'develop' of github.com:Budibase/budibase into feature/replace-pouch 2022-11-16 18:12:31 +00:00
mike12345567 4328ed1b67 Updating middlewares to Typescript, as well as some fixes based on running tests. 2022-11-16 17:24:13 +00:00
mike12345567 535fab7997 Some major reworks towards higher levels of typescript. 2022-11-16 17:23:12 +00:00
Rory Powell adbf90887e Test fixes 2022-11-16 13:06:30 +00:00
Rory Powell 9c169087e6 Add copy button to sso callback urls, e2e unit testing for OIDC, stub out other auth tests 2022-11-16 11:34:16 +00:00