Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-12-01 13:43:23 +01:00
Code Issues Projects Releases Wiki Activity
3,191 Commits 301 Branches 181 Tags 68 MiB
0fb44eb641
Commit Graph

3191 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Vince Grassia
c07794e907
Change Release workflow to allow releases from 'rc' and 'hotfix' branches (#1690) 2021-11-08 13:39:32 -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
Joseph Flinn
68e20fe649
Updating the swashbuckle package in Api (#1685) 2021-11-04 09:29:19 -07:00
Thomas Rittson
0cb8da2fd8
Add Field.LinkedId (#1617) 2021-11-04 07:27:15 +10:00
Thomas Rittson
98c167b1c1
Improve local dev setup for SSO project (#1664) 
* Add default SSO appsettings for development

* Add Sso project to setup_secrets.ps1 script

* Use hashmap instead of array
 2021-11-03 07:12:43 +10:00
Thomas Rittson
e57bef6af4
Fix policy enforcement against invited users (#1680) 2021-11-03 07:08:13 +10:00
Chad Scharf
07b8e2a946
Self-Hosted Server Release v1.44.1 (#1683) 
Self-Hosted Server Release v1.44.1 with Web v2.24.2
 2021-11-02 13:22:17 -04:00
Joseph Flinn
630376400f
Dependency updates (#1681) 
* fix: util/Nginx/Dockerfile to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-DEBIAN10-LIBXML2-1277346
- https://snyk.io/vuln/SNYK-DEBIAN10-LIBXML2-1277349
- https://snyk.io/vuln/SNYK-DEBIAN10-LIBXML2-1277350
- https://snyk.io/vuln/SNYK-DEBIAN10-OPENSSL-1569403
- https://snyk.io/vuln/SNYK-DEBIAN10-OPENSSL-1569406

* fix: util/Nginx/Dockerfile-k8s to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-DEBIAN10-LIBXML2-1277346
- https://snyk.io/vuln/SNYK-DEBIAN10-LIBXML2-1277349
- https://snyk.io/vuln/SNYK-DEBIAN10-LIBXML2-1277350
- https://snyk.io/vuln/SNYK-DEBIAN10-OPENSSL-1569403
- https://snyk.io/vuln/SNYK-DEBIAN10-OPENSSL-1569406

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
 2021-11-02 09:49:00 -07:00
Thomas Rittson
7473a96b27
Update PR template to remind about EF migrations (#1679) 
* Update PR template to remind about EF migrations

* Update wording
 2021-11-02 08:22:17 +10:00
Justin Baur
4c9d9b248c
Fix bug in TaxInfo (#1682) 
* Fixed bug in TaxInfo

* Added a few more tests to TaxInfoTests

* Added tests for HasTaxId
 2021-11-01 12:13:31 -04:00
SudoEvan
dcc11e3819
Added unit tests for StrictEmailAddressListAttribute in Bit.Core.Utilities (#1652) 
* Added unit tests for StrictEmailAddressListAttribute in Bit.Core.Utilities

* Fixed list format; added a null test on StrictEmailAddressListAttribute in Utilities
 2021-10-29 12:24:53 -04:00
Justin Baur
114f58aa8e
Fix tests (#1675) 
* Fix SendServiceTests that arose from merge

* Fixed SendService tests to be inline with spec

* Reorder usings
 2021-10-28 15:47:58 -04:00
Justin Baur
d854332643
Unit Tests for hot spots (#1454) 
* Add TaxInfoTests

* Add UserTests

* Add SendServicTests

* Added IconFetchingServicesTests

* Add endline
 2021-10-28 14:30:41 -04:00
Joseph Flinn
7d6f7436a8
Version Bump 1.44.1 (#1674) 2021-10-27 15:35:55 -07:00
Joseph Flinn
19ca3ee374
Enabling deploys to the QA environment from branches with slashes in the name (#1673) 2021-10-27 12:44:54 -07:00
Matt Gibson
cb815c2f14
Allow managers to create self-assigned collections (#1672) 2021-10-27 13:06:23 -05:00