1
0
mirror of https://github.com/bitwarden/server synced 2025-12-23 11:43:23 +00:00
Commit Graph

3265 Commits

Author SHA1 Message Date
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
Matt Gibson
61d91ad6c0 Add resend sponsorship offer api endpoint 2021-11-10 17:00:48 -05:00
Matt Gibson
5cb6930fd7 Use organization and auth to find organization sponsorship 2021-11-10 15:39:39 -05:00
Matt Gibson
339248ffaf Use upgrade path to change sponsorship
Sponsorships need to be annual to match the GB add-on charge rate
2021-11-10 14:10:30 -05:00
Matt Gibson
dc790dbdaf Add product type to organization details 2021-11-09 21:12:27 -05:00
Matt Gibson
991fb40007 Populate user in current context 2021-11-09 21:12:13 -05:00
Matt Gibson
68e1aacda9 Universal sponsorship redeem api 2021-11-09 19:42:31 -05:00
Matt Gibson
2ad7c2894b Fix Stripe org default tax rates 2021-11-09 19:39:41 -05:00
Matt Gibson
234800d969 Simplify names of f4e mail messages 2021-11-09 18:27:51 -05:00
Matt Gibson
455e486eda Send f4e offer email 2021-11-09 17:51:36 -05:00
Addison Beck
6b629feb03 [bug] Drop unused db column UsesCryptoAgent (#1704) 2021-11-09 12:33:18 -05:00
Kyle Spearrin
77f9f5fe72 remove dynamic names from admin confirm dialogs (#1703) 2021-11-09 12:13:23 -05:00
Kyle Spearrin
327e784336 Added middleware for general security headers (#1700) 2021-11-09 11:37:14 -05:00
Kyle Spearrin
f26a235964 set MaxResponseContentBufferSize to 5 MB (#1702) 2021-11-09 11:32:23 -05:00
Kyle Spearrin
2f0638ce8c sanitize notification hub tag inputs (#1697) 2021-11-09 11:25:18 -05:00
Kyle Spearrin
fcc1a4e10c add missing csrf token validation to admin (#1696) 2021-11-09 11:22:08 -05:00
Kyle Spearrin
9582e94232 add ::ffff: to internal ip check (#1701)
* add ::ffff: to internal ip check

* check StartsWith
2021-11-09 11:16:54 -05:00
Matt Gibson
e820aac719 Use userId to find org users 2021-11-09 10:53:23 -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
Matt Gibson
e0768ef6c7 Add sponsorship service to DI 2021-11-08 20:29:07 -05:00
Matt Gibson
b61227d87e Add sponsorship available boolean to orgDetails 2021-11-08 19:06:32 -05:00
Matt Gibson
6357514064 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-08 17:01:09 -06:00
Thomas Rittson
f6bc35b2d0 Fix typos in EF migrations (#1693)
* Fix typos in postgres migrations

* Fix extension of migration script
2021-11-09 07:40:01 +10:00
Kyle Spearrin
7cc7b84eaf use fixed-time comparison of secrets (#1698) 2021-11-08 15:55:42 -05:00
Vince Grassia
c07794e907 Change Release workflow to allow releases from 'rc' and 'hotfix' branches (#1690) 2021-11-08 13:39:32 -05:00
Justin Baur
cba0196859 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-08 11:47:58 -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
Donald Nairn
7837a850eb Fix minor typos in docs (#1692) 2021-11-08 12:43:14 +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
Matt Gibson
5d5febc94b Write valid json for test entries 2021-11-04 14:46:59 -04:00
Matt Gibson
d93fcf432f Add PlanSponsorshipType to db model 2021-11-04 12:51:22 -04:00