nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-04 20:50:21 -05:00
Code

fix import

Browse Source
This commit is contained in:
Brandon 2025-04-02 11:22:05 -04:00
parent b4cb84bd63
commit dd6adf25a1
No known key found for this signature in database
GPG Key ID: A0E0EF0B207BA40D
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,9 @@
using Bit.Core.Entities; using Bit.Core.Entities;
using Bit.Core.Enums; using Bit.Core.Enums;
using Bit.Core.Exceptions;
using Bit.Core.Models.Commands; using Bit.Core.Models.Commands;
using Bit.Core.Models.Data; using Bit.Core.Models.Data;
using Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces;
using Bit.Core.Repositories; using Bit.Core.Repositories;
using Bit.Core.Services; using Bit.Core.Services;
@ -25,11 +27,6 @@ public class InitPendingOrganizationCommand : IInitPendingOrganizationCommand
_organizationRepository = organizationRepository; _organizationRepository = organizationRepository;
} }
public const string OrgEnabled = "Organization is already enabled.";
public const string OrgNotPending = "Organization is not on a Pending status.";
public const string OrgHasPublicKey = "Organization already has a Public Key.";
public const string OrgHasPrivateKey = "Organization already has a Private Key.";
public async Task<CommandResult> InitPendingOrganizationAsync(Guid userId, Guid organizationId, Guid organizationUserId, string publicKey, string privateKey, string collectionName) public async Task<CommandResult> InitPendingOrganizationAsync(Guid userId, Guid organizationId, Guid organizationUserId, string publicKey, string privateKey, string collectionName)
{ {
await _organizationService.ValidateSignUpPoliciesAsync(userId); await _organizationService.ValidateSignUpPoliciesAsync(userId);
@ -38,22 +35,22 @@ public class InitPendingOrganizationCommand : IInitPendingOrganizationCommand
if (org.Enabled) if (org.Enabled)
{ {
return new CommandResult(OrgEnabled); throw new BadRequestException("Organization is already enabled.");
} }
if (org.Status != OrganizationStatusType.Pending) if (org.Status != OrganizationStatusType.Pending)
{ {
return new CommandResult(OrgNotPending); throw new BadRequestException("Organization is not on a Pending status.");
} }
if (!string.IsNullOrEmpty(org.PublicKey)) if (!string.IsNullOrEmpty(org.PublicKey))
{ {
return new CommandResult(OrgHasPublicKey); throw new BadRequestException("Organization already has a Public Key.");
} }
if (!string.IsNullOrEmpty(org.PrivateKey)) if (!string.IsNullOrEmpty(org.PrivateKey))
{ {
return new CommandResult(OrgHasPrivateKey); throw new BadRequestException("Organization already has a Private Key.");
} }
org.Enabled = true; org.Enabled = true;