Commit Graph

1816 Commits

Author SHA1 Message Date
Lucas Smith 6e10947d00 Merge branch 'main' into feat/732-toggle-signup-form 2023-12-15 21:05:21 +11:00
Lucas Smith 682cb37786 fix: update auth-options 2023-12-15 20:41:54 +11:00
Catalin Pit 19736ce60b chore: implemented feedback 2023-12-14 11:05:39 +02:00
Mythie 1eeb5fb103 fix: tidy code and base on main 2023-12-14 15:28:27 +11:00
David Nguyen 88534fa1c6 feat: add multi subscription support (#734)
## Description

Previously we assumed that there can only be 1 subscription per user.
However, that will soon no longer the case with the introduction of the
Teams subscription.

This PR will apply the required migrations to support multiple
subscriptions.

## Changes Made

- Updated the Prisma schema to allow for multiple `Subscriptions` per
`User`
- Added a Stripe `customerId` field to the `User` model
- Updated relevant billing sections to support multiple subscriptions

## Testing Performed

- Tested running the Prisma migration on a demo database created on the
main branch

Will require a lot of additional testing.

## Checklist

- [ ] I have tested these changes locally and they work as expected.
- [ ] I have added/updated tests that prove the effectiveness of these
changes.
- [X] I have followed the project's coding style guidelines.

## Additional Notes

Added the following custom SQL statement to the migration:

> DELETE FROM "Subscription" WHERE "planId" IS NULL OR "priceId" IS
NULL;

Prior to deployment this will require changes to Stripe products:
- Adding `type` meta attribute

---------

Co-authored-by: Lucas Smith <me@lucasjamessmith.me>
2023-12-14 15:22:54 +11:00
Ephraim Atta-Duncan 31a9127c9e feat: templates 2023-12-14 12:24:56 +11:00
Catalin Pit e79d385534 Merge branch 'main' into feat/public-api 2023-12-11 14:44:29 +02:00
Catalin Pit 8ecd8a7d10 chore: implemented feedback + a small refactoring 2023-12-11 14:33:30 +02:00
Navindu Amarakoon 49736d2587 Merge branch 'documenso:main' into feat/732-toggle-signup-form 2023-12-09 11:55:55 +05:30
Navindu Amarakoon ee5ce78c82 chore: remove unused code 2023-12-09 11:48:46 +05:30
Navindu Amarakoon 78a1ee2af0 feat: disable oauth signup when DISABLE_SIGNUP is true 2023-12-09 11:35:45 +05:30
Navindu Amarakoon 323380d757 feat: env variable to disable signing up 2023-12-09 10:37:16 +05:30
Catalin Pit 66c0db91da chore: cleanup and feedback implementation 2023-12-08 13:28:34 +00:00
Catalin Pit 54401b94ae chore: split api contract
moved the schemas from the api contract to a separate file
2023-12-08 09:58:23 +00:00
Lucas Smith bc38009392 Merge branch 'main' into refactor-forms 2023-12-08 16:31:13 +11:00
Ephraim Atta-Duncan 38ad3a1922 refactor: download function to be reusable 2023-12-07 14:52:12 +00:00
Mythie 935601ad16 fix(ee): add handling for incomplete expired checkouts 2023-12-07 18:46:57 +11:00
Lucas Smith c313da5028 fix: update seal event 2023-12-07 16:29:20 +11:00
Lucas Smith 5b98bac53b Merge branch 'main' into feat/enhance-posthog-tracking 2023-12-07 16:28:15 +11:00
Mythie cd6184406d chore: add e2e test for stepper 2023-12-07 15:08:16 +11:00
Mythie 1a34f9fa7a fix: import updates and api route body sizes 2023-12-07 15:08:00 +11:00
Mythie 3ff7b188d7 fix(ui): tidy stepper code 2023-12-07 15:06:49 +11:00
Catalin Pit 11ae6d3c16 chore: small changes 2023-12-06 16:53:34 +00:00
Catalin Pit 6c5526dd49 chore: update routes
trying to add the route for creating documents
2023-12-06 15:27:30 +00:00
Catalin Pit 936e75fd30 chore: merged main 2023-12-06 13:18:59 +00:00
Lucas Smith e81183f324 Merge branch 'main' into main 2023-12-06 14:13:34 +11:00
Sushant bfc630aa6a feat: add document search to the command menu (#713) 2023-12-06 12:48:05 +11:00
Sushant 2068d980ff feat: allow for the deletion of any document (#711)
Allow for the deletion of any document with notifications of document cancellation for pending documents.
2023-12-06 11:11:51 +11:00
Ephraim Atta-Duncan 0baa2696b4 fix: removed unused code 2023-12-05 10:13:24 +00:00
Paul bfedabdc10 fix: increase e2e test timeout (#682) 2023-12-05 13:54:41 +11:00
mikezzb 859b789018 feat: isCompleting 2023-12-03 12:50:56 -05:00
mikezzb 340c929806 refactor: edit doc 2023-12-03 11:36:18 -05:00
mikezzb 43b1a14415 chore: let code breath 2023-12-03 11:21:51 -05:00
mikezzb 40a4ec4436 refactor: useContext & remove enum 2023-12-03 01:15:59 -05:00
mikezzb eccf63dcfd chore: refactor 2023-12-02 23:56:07 -05:00
mikezzb a98b429052 feat: stepper refactor example 2023-12-02 22:42:59 -05:00
mikezzb c46a69f865 feat: stepper component 2023-12-02 22:30:10 -05:00
nafees nazik 4733f1e84b refactor: password input component 2023-12-02 17:46:16 +05:30
nafees nazik ab0d38eaf4 Merge branch 'main' into refactor-forms 2023-12-02 17:24:06 +05:30
Mythie 7dac5072f7 fix: revert react-email tailwind canary 2023-12-02 13:34:03 +11:00
Mythie 486b1cbf62 fix: incorrect promise.all usages 2023-12-02 12:43:43 +11:00
Lucas Smith 39c01f4e8d fix: remove server actions (#684) 2023-12-02 09:38:24 +11:00
Nafees Nazik 792158c2cb feat: add two factor auth (#643)
Add two factor authentication for users who wish to enhance the security of their accounts.
2023-12-01 20:06:32 +11:00
Catalin Pit 6be4b7ae90 feat: add authorization for api calls 2023-11-30 14:39:31 +02:00
nafees nazik 231a307b89 feat: add loading text prop 2023-11-30 15:20:06 +05:30
nafees nazik 0b2dce2238 fix: type 2023-11-29 22:37:33 +05:30
nafees nazik 4ff8592e8f feat: add password input component 2023-11-29 22:11:55 +05:30
Tanay dad56b4929 fix: minor in file extension (#694) 2023-11-29 09:11:29 +11:00
Szymon Sus 7e4c44e820 perf(web, lib): do not await inside promise statements (#692) 2023-11-29 09:10:15 +11:00
Catalin Pit e1732de81d feat: show newly created token 2023-11-28 15:49:46 +02:00