Justin Baur
de2a43e6ca
Switch naming convention
2021-11-18 09:30:24 -05:00
Justin Baur
b46b378ebb
Switch naming convention
2021-11-18 09:30:10 -05:00
Justin Baur
da80a16b9f
Remove reconfirmation template
2021-11-18 09:27:46 -05:00
Justin Baur
bff256ec6b
Remove ending email
2021-11-18 09:26:42 -05:00
Justin Baur
1a1ad081ec
Switch to handlebars ifs
2021-11-18 09:22:50 -05:00
Justin Baur
1c9908afc8
Merge branch 'master' into feature/families-for-enterprise
2021-11-18 08:32:28 -05: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
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
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
afa53fcccd
Update emails
2021-11-15 14:34:12 -05: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
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
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
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
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
0d9c0bdaea
WIP: scaffolding for families for enterprise sponsorship flow
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
5f4a6887fe
Add helpers to further type PlanTypes
2021-11-12 20:48:59 -05:00
Oscar Hinton
f1c41257b3
Allow disabling key connector if no user is enrolled ( #1712 )
2021-11-12 14:38:31 +01:00
Kyle Spearrin
327e784336
Added middleware for general security headers ( #1700 )
2021-11-09 11:37:14 -05:00
Kyle Spearrin
2f0638ce8c
sanitize notification hub tag inputs ( #1697 )
2021-11-09 11:25:18 -05:00
Oscar Hinton
fd37cb5a12
Add support for Key Connector OTP and account migration ( #1663 )
...
Co-authored-by: Thomas Rittson <trittson@bitwarden.com >
2021-11-09 16:37:32 +01:00
Kyle Spearrin
7cc7b84eaf
use fixed-time comparison of secrets ( #1698 )
2021-11-08 15:55:42 -05:00
Kyle Spearrin
5aa492e886
validate service url schema ( #1695 )
2021-11-08 11:47:03 -05:00
Oscar Hinton
1aa25f2712
Add checks for vault timeout policy ( #1694 )
2021-11-08 14:37:40 +01:00
Kyle Spearrin
10c5a29c47
Prevent XSS possibility from SSO SAML Service URLs ( #1691 )
...
* validate sso service urls for HTML meta chars
* also check for double quotes
2021-11-05 14:49:45 -04:00
Thomas Rittson
0cb8da2fd8
Add Field.LinkedId ( #1617 )
2021-11-04 07:27:15 +10:00
Thomas Rittson
e57bef6af4
Fix policy enforcement against invited users ( #1680 )
2021-11-03 07:08:13 +10:00
