1
0
Fork 0
mirror of synced 2024-10-01 09:38:55 +13:00
Commit graph

527 commits

Author SHA1 Message Date
mike12345567
6d24a30d91 Basic refactor work, the types required for the new API endpoints. 2023-07-05 18:28:04 +01:00
Dean
eaecd3ab68 Merge remote-tracking branch 'origin/develop' into merge-master 2023-06-27 09:31:35 +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
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
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
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
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
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
4f2696ed32 Use ctx.identity instead of passing it as param 2023-03-28 16:46:22 +01:00
adrinr
2072664294 Move user search to core 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
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
Dean
4de8333f80 Review updates 2023-03-27 18:00:57 +01:00
Dean
6db03768e6 Review updates 2023-03-27 17:28:12 +01: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
Dean
ce33afdeae Merge remote-tracking branch 'origin/develop' into feature/whitelabelling 2023-03-16 09:07:58 +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
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
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
5b9fbbc3b4 Various fixes for update self behaviour 2023-03-07 13:35:18 +00:00
Martin McKeaveney
fd8488d4d3 remove array of tenantIds 2023-03-07 09:56:12 +00:00