admin/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2026-01-31 14:13:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Enhance InitPendingOrganizationCommand for null safety and error handling

Browse Source 
- Removed nullable disable directive to enable null safety checks.
- Added a null check for the organization retrieval, throwing a BadRequestException if not found.
- Updated validation methods to return nullable Error types, improving error handling in the organization initialization process.
This commit is contained in:
Rui Tome
2026-01-30 14:10:11 +00:00
parent 36f2a6878d
commit 278ee76f7f
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Core/AdminConsole/OrganizationFeatures/Organizations/InitPendingOrganizationCommand.cs
View File

@@ -1,7 +1,4 @@
// FIXME: Update this file to be null safe and then delete the line below
#nullable disable
using Bit.Core.AdminConsole.Entities;
using Bit.Core.AdminConsole.Entities;
using Bit.Core.AdminConsole.Enums;
using Bit.Core.AdminConsole.OrganizationFeatures.Organizations;
using Bit.Core.AdminConsole.OrganizationFeatures.Policies;
@@ -30,7 +27,6 @@ namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers;
public class InitPendingOrganizationCommand : IInitPendingOrganizationCommand
{
private readonly IOrganizationService _organizationService;
private readonly ICollectionRepository _collectionRepository;
private readonly IOrganizationRepository _organizationRepository;
@@ -106,6 +102,10 @@ public class InitPendingOrganizationCommand : IInitPendingOrganizationCommand
}
var org = await _organizationRepository.GetByIdAsync(organizationId);
if (org == null)
{
throw new BadRequestException("Organization not found.");
}
if (org.Enabled)
{
@@ -232,7 +232,7 @@ public class InitPendingOrganizationCommand : IInitPendingOrganizationCommand
return new None();
}
private static Error ValidateUserEmail(OrganizationUser orgUser, User user)
private static Error? ValidateUserEmail(OrganizationUser orgUser, User user)
{
if (string.IsNullOrWhiteSpace(orgUser.Email) ||
!orgUser.Email.Equals(user.Email, StringComparison.InvariantCultureIgnoreCase))
@@ -243,7 +243,7 @@ public class InitPendingOrganizationCommand : IInitPendingOrganizationCommand
return null;
}
private static Error ValidateOrganizationState(Organization org)
private static Error? ValidateOrganizationState(Organization org)
{
if (org.Enabled)
{
@@ -263,7 +263,7 @@ public class InitPendingOrganizationCommand : IInitPendingOrganizationCommand
return null;
}
private async Task<Error> ValidatePoliciesAsync(User user, Guid organizationId, Organization org, OrganizationUser orgUser)
private async Task<Error?> ValidatePoliciesAsync(User user, Guid organizationId, Organization org, OrganizationUser orgUser)
{
// Enforce Automatic User Confirmation Policy (when feature flag is enabled)
if (_featureService.IsEnabled(FeatureFlagKeys.AutomaticConfirmUsers))