1
0
mirror of https://github.com/bitwarden/server.git synced 2025-11-18 06:54:43 +01:00
Commit Graph

6428 Commits

Author SHA1 Message Date
Thomas Rittson
827672313c
Merge remote-tracking branch 'origin/main' into ac/pm-25913/web-server-msp-organization-owners-unable-to-rename-organization-linked-to-resale-provider 2025-11-18 15:38:26 +10:00
Thomas Rittson
cbc07c1bbd
dotnet format 2025-11-18 15:37:58 +10:00
Thomas Rittson
ccdabf0273
Update unit tests to use SutProvider 2025-11-18 15:36:49 +10:00
Thomas Rittson
bdc9c160be
Simplify implementation and integration tests 2025-11-18 15:29:45 +10:00
Thomas Rittson
75293111ee
Fix Org Billing authz logic 2025-11-18 13:39:23 +10:00
Kyle Denney
75d8250f3a
[PM-24298] milestone3 families 2025 (#6586)
* [PM-24298] milestone3 families2025

# Conflicts:
#	src/Billing/Services/Implementations/UpcomingInvoiceHandler.cs
#	test/Billing.Test/Services/UpcomingInvoiceHandlerTests.cs

* update test name
2025-11-17 16:03:35 -06:00
John Harrington
f52a630197
PM-27248 [Defect] An unhandled error is returned when a MSP tries to import data (#6563)
* Revert previous commits and implement logic to avoid null references:

• reverted previous commits and force pushed to remove inconsistent formatting
• implemented logic to avoid null reference access (with comments)

* fix typo in comment

* fix logical error and add test coverage

* extracted logic common to all code paths per review comment
2025-11-17 13:40:30 -07:00
rr-bw
c2075781ca
feat(marketing-initiated-premium): Auth [PM-27551] Create feature flag (#6581)
Create a `"pm-26140-marketing-initiated-premium-flow"` feature flag in `Constants.cs`
2025-11-17 11:25:22 -08:00
Github Actions
902fcb3704 Bumped version to 2025.11.1 2025-11-17 19:06:29 +00:00
Kyle Denney
a9bb01031a
remove hardcoded storage values (#6571) 2025-11-17 11:16:02 -06:00
Alex Morask
c620ec2aca
[PM-28250] Fix seat add on defect (#6580)
* Handle seat add on

* Remove old price instead
2025-11-17 10:50:10 -06:00
Thomas Rittson
6e242e40fa
Merge remote-tracking branch 'origin/main' into ac/pm-25913/web-server-msp-organization-owners-unable-to-rename-organization-linked-to-resale-provider 2025-11-15 14:53:10 +10:00
cd-bitwarden
1274fe6562
[SM-1575] Add ability to retrieve events based on projectId/SecretId (#6316)
* adding event filters

* allow user to see deleted secret event logs through public api

* nullable changes to event controller

* fixing tests

* fixing permissions issues with public API

* fix for bug

* Update src/Api/AdminConsole/Public/Controllers/EventsController.cs

Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com>

* Update src/Api/AdminConsole/Public/Controllers/EventsController.cs

Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com>

---------

Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com>
2025-11-14 18:21:48 -05:00
Patrick-Pimentel-Bitwarden
7eaca9bb7d
Revert "feat(prelogin): [Auth/PM-27062] Prelogin New Response (#6577)" (#6582)
This reverts commit 92e511284b.

Merged without feature flag code and before QA could get their review done.
2025-11-14 21:42:14 +00:00
Patrick-Pimentel-Bitwarden
92e511284b
feat(prelogin): [Auth/PM-27062] Prelogin New Response (#6577)
* feat(prelogin): [PM-27062] Prelogin New Response - Initial changes to support new data coming back from prelogin.

* test(prelogin): [PM-27062] Prelogin New Response - Added tests.
2025-11-14 19:33:31 +00:00
Brant DeBow
b4c7ab8773
Add FusionCache to service collection (#6575)
* Add FusionCache to service collection

* Refactored to it's own service collection extension, added full unit tests, added TryAdd style support

* Move to ExtendedCache instead of FusionCache, re-use exsting DistributedCache if present, expose backplane to DI

* Reworked builders to reuse multiplexer if present
2025-11-14 12:45:45 -05:00
Ike
9b3adf0ddc
[PM-21741] Welcome email updates (#6479)
feat(PM-21741): implement MJML welcome email templates with feature flag support

- Add MJML templates for individual, family, and organization welcome emails
- Track *.hbs artifacts from MJML build
- Implement feature flag for gradual rollout of new email templates
- Update RegisterUserCommand and HandlebarsMailService to support new templates
- Add text versions and sanitization for all welcome emails
- Fetch organization data from database for welcome emails
- Add comprehensive test coverage for registration flow

Co-authored-by: Rui Tomé <108268980+r-tome@users.noreply.github.com>
2025-11-14 07:46:33 -05:00
Stephon Brown
30ff175f8e
Milestone 2 Handler Update (#6564)
* fix(billing): update discount id

* test(billing) update test
2025-11-13 17:47:06 +00:00
Jared McCannon
e7b4837be9
[PM-26377] Add Auto Confirm Policy (#6552)
* First pass at adding Automatic User Confirmation Policy.
* Adding edge case tests. Adding side effect of updating organization feature. Removing account recovery restriction from validation.
* Added implementation for the vnext save
* Added documentation to different event types with remarks. Updated IPolicyValidator xml docs.
2025-11-13 11:33:24 -06:00
Alex Morask
59a64af345
[PM-26435] Milestone 3 / F19R (#6574)
* Re-organize UpcomingInvoiceHandler for readability

* Milestone 3 renewal

* Map premium access data from additonal data in pricing

* Feedback

* Fix test
2025-11-13 09:09:01 -06:00
Mick Letofsky
de4955a875
[PM-27181] - Grant additional permissions for review code (#6576) 2025-11-13 14:06:26 +00:00
Vince Grassia
a03994d16a
Update build workflow (#6572) 2025-11-13 13:52:26 +01:00
renovate[bot]
0311807951
[deps]: Update actions/upload-artifact action to v5 (#6558)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Daniel García <dani-garcia@users.noreply.github.com>
2025-11-13 11:31:52 +01:00
SmithThe4th
a836ada6a7
[PM-23059] Provider Users who are also Organization Members cannot edit or delete items via Admin Console when admins can manage all items (#6573)
* removed providers check

* Fixed lint issues
2025-11-12 17:56:17 -05:00
renovate[bot]
7f04830f77
[deps]: Update actions/setup-node action to v6 (#6499) 2025-11-12 14:49:15 -06:00
cyprain-okeke
f0ec201745
[PM 26682]milestone 2d display discount on subscription page (#6542)
* The discount badge implementation

* Address the claude pr comments

* Add more unit testing

* Add more test

* used existing flag

* Add the coupon Ids

* Add more code documentation

* Add some recommendation from claude

* Fix addition comments and prs

* Add more integration test

* Fix some comment and add more test

* rename the test methods

* Add more unit test and comments

* Resolve the null issues

* Add more test

* reword the comments

* Rename Variable

* Some code refactoring

* Change the coupon ID to milestone-2c

* Fix the failing Test
2025-11-12 20:38:21 +01:00
SmithThe4th
de90108e0f
[PM-27579] bw sync does not pull in new items stored in a collection (#6562)
* Updated sproc to update account revision date after cipher has been created in collection

* check response from update collection success

* removed the org check
2025-11-11 18:44:18 -05:00
Alex Morask
691047039b
[PM-27849] Check for sm-standalone on subscription (#6545)
* Fix coupon check

* Fixed in FF off scenario

* Run dotnet format
2025-11-11 16:01:48 -06:00
Nick Krantz
ea233580d2
add vault skeleton loader feature flag (#6566) 2025-11-11 14:29:55 -06:00
Stephon Brown
db36c52c62
Milestone 2C Update (#6560)
* fix(billing): milestone update

* tests(billing): update tests
2025-11-10 16:07:14 -05:00
Jared McCannon
4de10c830d
[PM-26636] Set Key when Confirming (#6550)
* When confirming a uesr, we need to set the key. :face_palm:

* Adding default value.
2025-11-10 14:46:52 -06:00
Brant DeBow
4fac635272
Remove EventBasedOrganizationIntegrations feature flag (#6538)
* Remove EventBasedOrganizationIntegrations feature flag

* Remove unnecessary nullable enable

* Refactored service collection extensions to follow a more direct path: ASB, RabbitMQ, Azure Queue, Repository, No-op

* Use TryAdd instead of Add
2025-11-10 14:57:04 -05:00
Brant DeBow
212f10d22b
Extend Unit Test Coverage of Event Integrations (#6517)
* Extend Unit Test Coverage of Event Integrations

* Expanded SlackService error handling and tests

* Cleaned up a few issues noted by Claude
2025-11-10 14:55:36 -05:00
Ike
746b413cff
[PM-21741] MJML welcome emails (#6549)
feat: Implement welcome email using MJML templating

- Implement MJML templates for welcome emails (individual, family, org)
- Create reusable MJML components (mj-bw-icon-row, mj-bw-learn-more-footer)
- Update documentation for MJML development process
2025-11-10 13:37:11 -05:00
Kyle Denney
b2543b5c0f
[PM-24284] - milestone 3 (#6543)
* new feature flag

* first pass at changes

* safeguard against billing-pricing not being deployed yet

* handle families pre migration plan

* wrong stripe id

* tests

* unit tests
2025-11-10 11:51:00 -06:00
Rui Tomé
e7f3b6b12f
[PM-26430] Remove Type property from PolicyRequestModel to use route parameter only (#6472)
* Enhance PolicyRequestModel and SavePolicyRequest with validation for policy data and metadata.

* Add integration tests for policy updates to validate handling of invalid data types in PolicyRequestModel and SavePolicyRequest.

* Add missing using

* Update PolicyRequestModel for null safety by making Data and ValidateAndSerializePolicyData nullable

* Add integration tests for public PoliciesController to validate handling of invalid data types in policy updates.

* Add PolicyDataValidator class for validating and serializing policy data and metadata based on policy type.

* Refactor PolicyRequestModel, SavePolicyRequest, and PolicyUpdateRequestModel to utilize PolicyDataValidator for data validation and serialization, removing redundant methods and improving code clarity.

* Update PolicyRequestModel and SavePolicyRequest to initialize Data and Metadata properties with empty dictionaries.

* Refactor PolicyDataValidator to remove null checks for input data in validation methods

* Rename test methods in SavePolicyRequestTests to reflect handling of empty data and metadata, and remove null assignments in test cases for improved clarity.

* Remove Type property from PolicyRequestModel to use route parameter only

* Run dotnet format

* Enhance error handling in PolicyDataValidator to include field-specific details in BadRequestException messages.

* Enhance PoliciesControllerTests to verify error messages for BadRequest responses by checking for specific field names in the response content.

* refactor: Update PolicyRequestModel and SavePolicyRequest to use nullable dictionaries for Data and Metadata properties; enhance validation methods in PolicyDataValidator to handle null cases.

* test: Add integration tests for handling policies with null data in PoliciesController

* fix: Catch specific JsonException in PolicyDataValidator to improve error handling

* test: Add unit tests for PolicyDataValidator to validate and serialize policy data and metadata

* test: Remove PolicyType from PolicyRequestModel in PoliciesControllerTests

* test: Update PolicyDataValidatorTests to validate organization data ownership metadata

* Refactor PoliciesControllerTests to include policy type in PutVNext method calls
2025-11-10 15:27:44 +00:00
Oscar Hinton
7d39efe29f
[PM-27575] Add support for loading Mailer templates from disk (#6520)
Adds support for overloading mail templates from disk.
2025-11-10 08:40:40 +01:00
Thomas Rittson
3162723171
dotnet format 2025-11-09 11:54:58 +10:00
Thomas Rittson
1667d039aa
Make name optional as well for consistency 2025-11-09 11:52:43 +10:00
Thomas Rittson
015fca540c
Review and update xmldoc 2025-11-09 11:40:28 +10:00
Thomas Rittson
7741eee661
Allow providers to update billing email 2025-11-09 11:35:01 +10:00
Thomas Rittson
0c05db9e53
Move StripeAdapter code into Billing ownership 2025-11-09 11:17:07 +10:00
Thomas Rittson
ceb6817165
Return updated organization 2025-11-09 10:44:17 +10:00
Thomas Rittson
dc91e030b1
Remove Business Name and restore selfhosted checks 2025-11-09 10:19:15 +10:00
Thomas Rittson
8830f17d0d
Revert "Use [InjectOrganization] to fetch and pass in org".
It is better for the command to fetch the org so that callers
do not mistakenly use it as a general purpose update method;
it is only to be used to update those properties in the request model.

This reverts commit 9df75c427b.
2025-11-09 09:44:52 +10:00
Thomas Rittson
8762a20f68
Merge remote-tracking branch 'origin/main' into ac/pm-25913/web-server-msp-organization-owners-unable-to-rename-organization-linked-to-resale-provider 2025-11-09 09:25:16 +10:00
Alex Morask
22fe50c67a
Expand coupon.applies_to (#6554) 2025-11-07 13:05:05 -06:00
Vincent Salucci
d1fecc2a0f
chore: remove custom permissions feature flag definition, refs PM-20168 (#6551) 2025-11-07 09:48:19 -06:00
Oscar Hinton
356e4263d2
Add feature flags for desktop-ui migration (#6548) 2025-11-07 11:04:27 +01:00
Patrick-Pimentel-Bitwarden
43d14971f5
fix(prevent-bad-existing-sso-user): [PM-24579] Fix Prevent Existing Non Confirmed and Accepted SSO Users (#6529)
* fix(prevent-bad-existing-sso-user): [PM-24579] Precent Existing Non Confirmed and Accepted SSO Users - Fixed bad code and added comments.

* test(prevent-bad-existing-sso-user): [PM-24579] Precent Existing Non Confirmed and Accepted SSO Users - Added new test to make sure invited users aren't allowed through at the appropriate time.
2025-11-06 13:24:59 -05:00