1
0
Fork 0
mirror of synced 2024-09-19 02:39:37 +12:00
Commit graph

1076 commits

Author SHA1 Message Date
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