Justin Baur
1c9908afc8
Merge branch 'master' into feature/families-for-enterprise
2021-11-18 08:32:28 -05:00
Justin Baur
0b8cd5c22a
Skip test
2021-11-18 08:07:31 -05:00
Thomas Rittson
2dc29e51d1
Fix bug preventing user from leaving org ( #1721 )
2021-11-18 21:15:22 +10:00
Justin Baur
b0760b2134
Finish emails
2021-11-17 22:06:49 -05:00
Thomas Rittson
9f96e4ce90
Disable EA Takeover if grantor uses Key Connector ( #1718 )
2021-11-18 07:47:43 +10:00
Micaiah Martin
faa8abb3dc
Updated SETUP.md to direct user with correct file name. ( #1719 )
2021-11-17 07:54:38 -07:00
Oscar Hinton
f866b25e43
Key Connector feature toggle ( #1716 )
2021-11-17 11:46:35 +01:00
Matt Gibson
0a9d35c43f
Fix stripe subscription update
2021-11-16 17:26:45 -05:00
Joseph Flinn
3a22f91ff5
Enable key connector selfhost ( #1707 )
...
* initial commit
* Add code for Key Connector feature
* Add help URL to config
* Fix folders for key-connector service
* Fix paths for key-connector
* fixing the env file builder when disabling the key connector
* swapping a variable name
Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com>
2021-11-16 09:52:02 -08:00
Thomas Rittson
cdb622d4aa
Add ApiUseKeyConnector flag to token response ( #1710 )
2021-11-16 06:54:28 +10:00
Justin Baur
4f20911875
Add newline
2021-11-15 15:08:36 -05:00
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
Vince Grassia
c660f8bf00
Fix Docker Notary ( #1717 )
2021-11-15 13:53:53 -05:00
Vince Grassia
27351762de
Upload Docker images to AWS ECR Nonprod Repositories ( #1713 )
2021-11-15 13:23:51 -05:00
Thomas Rittson
e3143271d7
[Key Connector] Prevent user from leaving org ( #1715 )
...
* Block user from leaving org using Key Connector
* Add tests
2021-11-15 19:46:13 +10:00
Thomas Rittson
c2975b003d
[Key Connector] Fix policy checks and other pre-reqs ( #1711 )
...
* Require SSO Policy to enable Key Connector
* Require that SSO is enabled to use Key Connector
* Fix error messages
"Key Connector" instead of "KeyConnector"
* Refactor dependent policy checks to handle expansion
* Block disabling Sso Policy if using Key Connector
* Update tests for policies required by Key Connector
* Fix tests
* Add test for Key Connector to require Sso Policy
* Add test: Sso config must be enabled to use Key Connector
2021-11-15 19:25:10 +10: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
