1
0
mirror of https://github.com/bitwarden/server.git synced 2024-11-25 12:45:18 +01:00
Commit Graph

3175 Commits

Author SHA1 Message Date
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
Matt Gibson
e820aac719 Use userId to find org users 2021-11-09 10:53:23 -05: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
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
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
Matt Gibson
079adc60b6
Initial db work (#1687)
* Add organization sponsorship databases to all providers

* Generalize create and update for database, specialize in code
2021-11-04 10:46:49 -05:00
Matt Gibson
ee46a6d63b
Create sponsorship offer (#1688) 2021-11-04 08:25:40 -05:00
Matt Gibson
aefcbcbe7d Fix broken tests 2021-10-30 13:47:21 -04:00
Matt Gibson
0255a2ea15 WIP: scaffolding for families for enterprise sponsorship flow 2021-10-30 13:34:03 -04:00
Matt Gibson
dea366828b 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-10-30 13:32:15 -04:00
Matt Gibson
b8fdbbcb9f WIP: Organization sponsorship flow 2021-10-30 13:20:35 -04:00
Matt Gibson
0cbeb75b29 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-10-30 13:20:35 -04:00
Matt Gibson
d08e9359af 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-10-30 13:20:35 -04:00
Matt Gibson
3a11101c30 Add helpers to further type PlanTypes 2021-10-30 13:20:35 -04:00
Matt Gibson
53b82d7d06 Create common test infrastructure project 2021-10-30 13:19:40 -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
Joseph Flinn
52d1bade06
Hotfix/release workflow (#1671)
* fixing release workflow app service deploys

* adding the release branch as a conditional to the docker-stub build

* Add in missing 'if' statement for 'release' branch in Docker Stub step

Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com>
2021-10-27 08:45:33 -07:00
Thomas Rittson
818b3b5d9d
Add PR template (#1668) 2021-10-27 19:01:00 +10:00
Joseph Flinn
8683cbfe33
fixing parameter mismatch (#1670) 2021-10-26 19:18:54 -07:00
Joseph Flinn
fa1989bfed
fixing the error in the release workflow (#1669) 2021-10-26 18:56:06 -07:00
Joseph Flinn
e2c8fa7002
Replacing the DCT setup. There was a sneaky line that was different which is making our build of the EventsProcessor image break (#1667) 2021-10-26 15:02:19 -07:00
Joseph Flinn
9a629a410c
Allow Docker access to new release branching strategy (#1666)
* allowing the new release branch to push its docker images

* Switching to our action to set up DCT
2021-10-26 14:22:47 -07:00
Joseph Flinn
f783770fcd
Version bump to 1.44.0 (#1665) 2021-10-26 13:47:34 -07:00
Matt Gibson
8f0115e62f
Check canScale when scaling for sso (#1661)
* Check canScale when scaling for sso

* PR review

Use AutoAddSeats to add seats in a consistent way.
This requires moving user check out of that method.

* User logic moved out of method
2021-10-25 10:19:37 -05:00
Oscar Hinton
c5d5601464
Add support for crypto agent (#1623) 2021-10-25 15:09:14 +02:00
Daniel James Smith
dea694193f
Add teams trial button to Edit Org Page (#1662)
* Add teams trial button to Edit Org Page

* Fix formatting
2021-10-25 14:28:17 +02:00
Joseph Flinn
f3d6a43025
Change protected release branch to release (#1656)
* Adding a contraint around the new release branch strategy

* Adding a constraint on what CI code can be used to release the release branch

* updating the self host docker image building and releasing

* removing master branch release ci code execution

* updating some verbiage
2021-10-22 08:41:38 -07:00
Vince Grassia
7da15af92f
Add New Relic monitoring package to Notifications project (#1643) 2021-10-22 10:22:25 -04:00
Matt Gibson
e744ffe499
Default autoscaling to off (#1659)
* Default autoscaling to off

* Update util/Migrator/DbScripts/2021-10-21_00_DefaultAutoscaleLimitToCurrentSeats.sql

Co-authored-by: Chad Scharf <3904944+cscharf@users.noreply.github.com>

* Update util/Migrator/DbScripts/2021-10-21_00_DefaultAutoscaleLimitToCurrentSeats.sql

Co-authored-by: Chad Scharf <3904944+cscharf@users.noreply.github.com>

* Update util/MySqlMigrations/Scripts/2021-10-21_00_SetMaxAutoscaleSeatCount.sql

Co-authored-by: Chad Scharf <3904944+cscharf@users.noreply.github.com>
2021-10-22 08:11:14 -05:00
Ben Gray
4edc75d21d
Fix proper naming and download link (#1660) 2021-10-22 09:59:09 +02:00
Joseph Flinn
423ff99bda
Disabling the temporary prod-deploy workflow (#1655) 2021-10-21 10:31:26 -07:00
Matt Gibson
5d163eb5bd
Only check assigned collections if lacking privs for all (#1657) 2021-10-20 16:17:40 -05:00