1
0
Fork 0
mirror of synced 2024-06-30 20:10:54 +12:00
Commit graph

75 commits

Author SHA1 Message Date
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 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
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 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
Martin McKeaveney fd8488d4d3 remove array of tenantIds 2023-03-07 09:56:12 +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 61ed62e6c4 Builder user onboarding 2023-02-28 09:37:03 +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
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 ae9979929a Enable higher concurrency and resiliency in worker tests 2023-02-13 11:57:30 +00:00
Dean d37c0e4b5d UI Onboarding UI/UX auth refactoring 2023-01-27 13:44:57 +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
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
mike12345567 d3c4c99e16 Complete conversion of backend-core to Typescript. 2022-11-24 18:48:51 +00:00
Rory Powell c6fba4de3d Test fixes 2022-11-11 15:43:41 +00:00
Rory Powell 29659813ef Add document and api types 2022-10-03 14:02:58 +01:00
Michael Drury 89f6f1174b PR comments. 2022-09-23 22:21:51 +01:00
mike12345567 7406086c12 Switching over app role assignment to use the new backend rather than being performed in the frontend. 2022-09-21 22:58:06 +01:00
mike12345567 f07ea5cc7e Updating user API to user a single bulk endpoint rather than case sensitive named endpoints. 2022-09-21 18:05:45 +01:00
mike12345567 e1272a6907 Removing un-necessary code now that groups automatically enrich from users. 2022-09-20 19:33:54 +01:00
mike12345567 4dc24b7559 Fixing typing. 2022-09-16 17:14:00 +01:00
mike12345567 1be71933ca Merge branch 'develop' of github.com:Budibase/budibase into group-fixes 2022-09-16 17:02:08 +01:00
mike12345567 fc8dc9f176 Fixing issue introduced by fix for #7683 - encoding the query string caused handlebars statements to break, this rectifies that. 2022-09-15 19:35:55 +01:00
Rory Powell 0f724f34b5 Apply validation to invite users by email + results modal 2022-09-01 07:58:05 +01:00
Rory Powell 59a53736ac update bulk create and bulk delete backend 2022-08-25 19:41:47 +01:00
Rory Powell d591acf2d3 User fixes wip 2022-08-23 09:37:13 +01:00
Andrew Kingston 6302ee5551 Fix users not being added to group when invited via email 2022-08-08 16:40:32 +01:00
Andrew Kingston 76948ee09a Remove log 2022-08-03 19:20:18 +01:00
Andrew Kingston c2fb17e948 Fix users invited by email not being able to take priveleged roles 2022-08-03 15:16:26 +01:00
mike12345567 1a62ec1cdd Adding API checks to stop deletion of self. 2022-08-02 14:58:18 +01:00
Peter Clement 8a77aca540 more efficient fetching of total users per app 2022-07-29 13:10:00 +01:00
Peter Clement dca37a61da adding tests and pr comments 2022-07-27 10:20:39 +01:00
Peter Clement 46a6fc5048 refactor groups into pro and some other pr comments 2022-07-26 20:04:29 +01:00
Peter Clement cd426a5ca7 adding limits for uploading users 2022-07-26 12:17:01 +01:00
Peter Clement 269701f97d moar bulkdocs 2022-07-25 17:36:57 +01:00
Peter Clement 25d13d4a72 move bulk update / delete functionality out of controller 2022-07-25 16:58:30 +01:00
Peter Clement ba74fa9500 update handling of group roles 2022-07-19 14:20:57 +01:00
Peter Clement fb7456fa33 lint 2022-07-18 12:33:56 +01:00
NEOLPAR 835c4e390d fixed issue bulkDelete losing context because of a forEach loop 2022-07-14 14:15:12 +01:00
Peter Clement 819ce4e360 Merge remote-tracking branch 'origin/develop' into feat/user-groups-tab 2022-07-14 13:32:51 +01:00
Peter Clement 10e046d8a2 Merge branch 'feat/user-groups-tab' of github.com:Budibase/budibase into feat/user-groups-tab 2022-07-14 09:19:08 +01:00
NEOLPAR 529d2c06da fixed duplicating users in user creation backend 2022-07-13 17:37:03 +01:00
Peter Clement f980d55af3 some user table fixes 2022-07-13 15:46:10 +01:00
Peter Clement eff78240a6 improve performance of adding users and groups 2022-07-11 15:29:39 +01:00
Peter Clement 2399dbceb9 linting and tidy 2022-07-07 08:55:32 +01:00
mike12345567 dae9ab94a4 Fixing issue which can block accessing platform - if error scenario occurs but admin user partially created. 2022-07-06 16:42:38 +01:00
Peter Clement 6df456411f fixing users api references 2022-07-06 08:45:22 +01:00