1
0
Fork 0
mirror of synced 2024-09-15 16:59:43 +12:00
Commit graph

1144 commits

Author SHA1 Message Date
mike12345567
31f9693185 Quick update to SCIM now that user functionality is available from backend-core. 2023-07-31 17:10:27 +01:00
mike12345567
8522cb94d3 Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-28 17:10:43 +01:00
Adria Navarro
95f66ebd9d Fix types 2023-07-28 17:11:48 +02:00
mike12345567
72438f531d Update for worker, get builder endpoints working for app builders. 2023-07-28 15:39:59 +01:00
mike12345567
1403bf26c6 Quick fixes based on raising PR, types and tests. 2023-07-28 13:58:20 +01:00
mike12345567
454f832b75 Updates after running through tests, adding mocking of app builders feature for test cases to work. 2023-07-28 12:58:05 +01:00
mike12345567
2080126da2 Final cleanup when running services. 2023-07-27 18:58:09 +01:00
mike12345567
c8712eda00 Fixing some missing functions. 2023-07-27 18:53:58 +01:00
mike12345567
812f1af5ca Moving app builder API into pro, along with the changes involved with achieving this. 2023-07-27 18:46:55 +01:00
mike12345567
d8f50f139e Frontend update for app builders, handling when in the builder portal and don't have any app access, as well as allowing viewing of apps from the portal. 2023-07-27 17:52:56 +01:00
mike12345567
eefac0fe08 Quick updates based on latest lerna version, as well as some fixes after running through flows (post refactoring). 2023-07-26 18:13:18 +01:00
mike12345567
64a5426d36 Updates to remove app builder concept, denying access to app creation for app builders. 2023-07-26 17:32:21 +01:00
mike12345567
8253ad0a2e Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-26 14:24:29 +01:00
mike12345567
43bfb943a3 Some fixes post testing. 2023-07-25 18:52:59 +01:00
mike12345567
66fbdfe4e8 Breaking out pro components back into the worker user SDK, and attempting to separate the pro components as much as possible from the user SDK itself, so that it can be easily re-created in other services. 2023-07-25 18:39:40 +01:00
mike12345567
90371b9d69 Refactoring users core to move into backend, allowing app builder endpoints to move into pro. 2023-07-25 17:48:57 +01:00
Rory Powell
8590f865b5 Merge branch 'master' into merge-master 2023-07-25 15:32:16 +01:00
Rory Powell
143e6597db Fix issues with tests when running with pro from npm 2023-07-25 13:18:56 +01:00
mike12345567
d9c8e26f65 Re-writing APIs based on most recent discussion about RBAC and per app builders. 2023-07-24 18:29:46 +01:00
mike12345567
c375f860ba Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-24 13:46:49 +01:00
Rory Powell
5c4d29e349 Merge branch 'develop' into feature/offline-license 2023-07-24 10:06:04 +01:00
mike12345567
87d80e08f5 Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-21 17:34:27 +01:00
Rory Powell
c8fc67d230 Lint 2023-07-20 21:24:19 +01:00
Rory Powell
34d9f1c4f8 Request / response renames 2023-07-20 21:22:54 +01:00
Rory Powell
90e869dc04 /api/global/license/offline/identifier API 2023-07-20 21:21:39 +01:00
Rory Powell
c0568b9153 api / license.spec.ts updates 2023-07-20 21:21:39 +01:00
Rory Powell
20c87b44b1 Allow pro to be mocked in worker 2023-07-20 21:21:39 +01:00
Rory Powell
6c3d01375b Move license keys to their own module 2023-07-20 21:21:39 +01:00
Rory Powell
7c18a7a443 db / licenseInfo.spec.ts 2023-07-20 21:21:39 +01:00
Rory Powell
8e2a551a15 Be more explicit about offline license vs offline license token 2023-07-20 21:21:39 +01:00
Rory Powell
0e80766125 Update license endpoints to provide consistent pattern for offline license and license key (create, read, delete) 2023-07-20 21:21:39 +01:00
Rory Powell
6aeb31c355 Move OFFLINE_MODE to backend-core environment 2023-07-20 21:21:39 +01:00
Rory Powell
5ac024a655 Merge branch 'develop' into feature/offline-license 2023-07-20 12:27:04 +01:00
mike12345567
85dea47a31 Moving user admin/builder functions to shared-core for frontend to use. 2023-07-19 16:19:34 +01:00
mike12345567
39746e0bf0 Main body of work to handle the new approach of per app builders support. 2023-07-18 16:57:48 +01:00
Andrew Kingston
cd8414e6a1 Fix getting started checklist links 2023-07-18 16:14:59 +01:00
mike12345567
e30509c4f9 Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-18 11:32:38 +01:00
Adria Navarro
2698e47ec4 Type internal db.get 2023-07-18 11:41:51 +02:00
mike12345567
a04443c059 Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7052 2023-07-17 18:06:04 +01:00
Rory Powell
4a38d55ce8 Lint 2023-07-14 16:55:48 +01:00
Adria Navarro
6e2a8e0ab9 Rename .log extensions 2023-07-11 13:09:51 +02:00
Adria Navarro
0b5717cde5 Renamings 2023-07-11 10:44:10 +02:00
Adria Navarro
fd0018c1bc Download logs section 2023-07-11 10:44:10 +02:00
Adria Navarro
b64ea43d20 System logs only for self hosted 2023-07-11 10:44:10 +02:00
Adria Navarro
bb28d09eab Add logs endpoint 2023-07-11 10:44:09 +02:00
Rory Powell
7c4fe15781 Request / response renames 2023-07-10 16:12:19 +01:00
Rory Powell
574c361f6b /api/global/license/offline/identifier API 2023-07-08 13:07:10 +01:00
Rory Powell
7831579e98 api / license.spec.ts updates 2023-07-07 21:15:40 +01:00
Rory Powell
19d3e12177 Allow pro to be mocked in worker 2023-07-07 16:55:11 +01:00
Rory Powell
1fa5cd519c Move license keys to their own module 2023-07-07 11:48:12 +01:00
Rory Powell
700d8131d1 db / licenseInfo.spec.ts 2023-07-07 11:34:10 +01:00
Rory Powell
d02f474fd1 Be more explicit about offline license vs offline license token 2023-07-06 21:26:46 +01:00
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