Justin Baur
50398fe0f8
Skip local test
2021-11-15 14:54:06 -05:00
Justin Baur
6dab6d3428
Fix tests
2021-11-15 14:47:23 -05:00
Justin Baur
afa53fcccd
Update emails
2021-11-15 14:34:12 -05:00
Justin Baur
85225790d6
Fix build error
2021-11-12 22:40:04 -05:00
Justin Baur
252b558fe1
Merge branch 'master' into feature/families-for-enterprise
2021-11-12 22:33:58 -05:00
Justin Baur
dba01a2c4e
Merge branch 'feature/families-for-enterprise' of https://github.com/bitwarden/server into feature/families-for-enterprise
2021-11-12 20:52:47 -05:00
Matt Gibson
9c41e149b9
Fix sproc
2021-11-12 20:49:00 -05:00
Matt Gibson
c70195c882
Test org sponsorship service
2021-11-12 20:49:00 -05:00
Matt Gibson
5e20c3ff2d
Fix organization delete sponsorship hooks
2021-11-12 20:49:00 -05:00
Matt Gibson
0fb44eb641
Add sponsorship validation to upcoming invoice webhook
2021-11-12 20:49:00 -05:00
Matt Gibson
1d34c276e7
Add sponsorship validation to upcoming invoice webhook
2021-11-12 20:49:00 -05:00
Matt Gibson
be6ab1883c
Add is sponsored item to subscription response
2021-11-12 20:49:00 -05:00
Matt Gibson
3d28ae1547
Fix sponsorship upgrade options
2021-11-12 20:49:00 -05:00
Matt Gibson
de5a0cb463
Fix double email send
2021-11-12 20:49:00 -05:00
Matt Gibson
32333048b4
Add resend sponsorship offer api endpoint
2021-11-12 20:49:00 -05:00
Matt Gibson
a605dc7286
Use organization and auth to find organization sponsorship
2021-11-12 20:49:00 -05:00
Matt Gibson
9ec8bbb8bb
Use upgrade path to change sponsorship
...
Sponsorships need to be annual to match the GB add-on charge rate
2021-11-12 20:49:00 -05:00
Matt Gibson
a2467ea6ea
Add product type to organization details
2021-11-12 20:49:00 -05:00
Matt Gibson
76c5ddb611
Populate user in current context
2021-11-12 20:49:00 -05:00
Matt Gibson
8c9067f6b3
Universal sponsorship redeem api
2021-11-12 20:49:00 -05:00
Matt Gibson
8e1ed6a364
Fix Stripe org default tax rates
2021-11-12 20:49:00 -05:00
Matt Gibson
1b933769db
Simplify names of f4e mail messages
2021-11-12 20:49:00 -05:00
Matt Gibson
094de41c0e
Send f4e offer email
2021-11-12 20:48:59 -05:00
Matt Gibson
8480379e32
Use userId to find org users
2021-11-12 20:48:59 -05:00
Matt Gibson
1516b9dd8e
Add sponsorship service to DI
2021-11-12 20:48:59 -05:00
Matt Gibson
d8e986b27b
Add sponsorship available boolean to orgDetails
2021-11-12 20:48:59 -05:00
Matt Gibson
45f6ec1781
Families for enterprise/stripe integrations ( #1699 )
...
* Add PlanSponsorshipType to static store
* Add sponsorship type to token and creates sponsorship
* PascalCase properties
* Require sponsorship for remove
* Create subscription sponsorship helper class
* Handle Sponsored subscription changes
* Add sponsorship id to subscription metadata
* Make sponsoring references nullable
This state indicates that a sponsorship has lapsed, but was not able to
be reverted for billing reasons
* WIP: Validate and remove subscriptions
* Update sponsorships on organization and org user delete
* Add friendly name to organization sponsorship
2021-11-12 20:48:59 -05:00
Justin Baur
143be4273b
Initial scaffolding of emails ( #1686 )
...
* Initial scaffolding of emails
* Work on adding models for FamilyForEnterprise emails
* Switch verbage
* Put preliminary copy in emails
* Skip test
2021-11-12 20:48:59 -05:00
Matt Gibson
005774102a
Write valid json for test entries
2021-11-12 20:48:59 -05:00
Matt Gibson
77bea5755e
Add PlanSponsorshipType to db model
2021-11-12 20:48:59 -05:00
Matt Gibson
199b8ed887
Initial db work ( #1687 )
...
* Add organization sponsorship databases to all providers
* Generalize create and update for database, specialize in code
2021-11-12 20:48:59 -05:00
Matt Gibson
1b6d1b52a3
Create sponsorship offer ( #1688 )
2021-11-12 20:48:59 -05:00
Matt Gibson
d7642d692b
Fix broken tests
2021-11-12 20:48:59 -05:00
Matt Gibson
0d9c0bdaea
WIP: scaffolding for families for enterprise sponsorship flow
2021-11-12 20:48:59 -05:00
Matt Gibson
f9fd83d809
Add Attribute to use the Bit Autodata dependency chain
...
BitAutoDataAttribute is used to mark a Theory as autopopulating
parameters.
Extract common attribute methods to to a helper class. Cannot
inherit a common base, since both require inheriting from different
Xunit base classes to work.
2021-11-12 20:48:59 -05:00
Matt Gibson
fcbf0f094e
WIP: Organization sponsorship flow
2021-11-12 20:48:59 -05:00
Matt Gibson
192df467ce
Workaround for broken MemberAutoDataAttribute
...
https://github.com/AutoFixture/AutoFixture/pull/1164 shows that only
the first test case is pulled for this attribute.
This is a workaround that populates the provided parameters, left to
right, using AutoFixture to populate any remaining.
2021-11-12 20:48:59 -05:00
Matt Gibson
013ae570ae
Enable testing of ASP.net MVC controllers
...
Controller properties have all kinds of validations in the background.
In general, we don't user properties on our Controllers, so the easiest
way to allow for Autofixture-based testing of our Controllers is to just
omit setting all properties on them.
2021-11-12 20:48:59 -05:00
Matt Gibson
5f4a6887fe
Add helpers to further type PlanTypes
2021-11-12 20:48:59 -05:00
Matt Gibson
019529a0c2
Create common test infrastructure project
2021-11-12 20:48:05 -05:00
Matt Gibson
79f9bd4545
Fix sproc
2021-11-12 17:55:39 -05:00
Matt Gibson
f1832e899f
Test org sponsorship service
2021-11-12 11:37:13 -05:00
Oscar Hinton
f1c41257b3
Allow disabling key connector if no user is enrolled ( #1712 )
2021-11-12 14:38:31 +01:00
Matt Gibson
1d11dac2cc
Fix organization delete sponsorship hooks
2021-11-11 15:00:16 -05:00
Justin Baur
85c90acc1b
Merge branch 'feature/families-for-enterprise' of https://github.com/bitwarden/server into feature/families-for-enterprise
2021-11-11 14:51:36 -05:00
Matt Gibson
da4388be4c
Add sponsorship validation to upcoming invoice webhook
2021-11-11 14:38:50 -05:00
Matt Gibson
ff55cd5a21
Add sponsorship validation to upcoming invoice webhook
2021-11-11 14:13:45 -05:00
Matt Gibson
77fe21a332
Add is sponsored item to subscription response
2021-11-10 18:05:31 -05:00
Matt Gibson
0ae3f1c67e
Fix sponsorship upgrade options
2021-11-10 18:05:00 -05:00
Matt Gibson
750c573557
Fix double email send
2021-11-10 17:33:16 -05:00
