nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-10 06:02:24 -05:00
Code

fix imports

Browse Source
This commit is contained in:
Brandon 2025-05-09 16:35:28 -04:00
parent 15cff6c507
commit 99e405a4aa
No known key found for this signature in database
GPG Key ID: A0E0EF0B207BA40D
3 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bitwarden_license/src/Scim/Models/ScimUserRequestModel.cs
View File

@ -3,9 +3,9 @@ using Bit.Core.AdminConsole.Models.Business;
using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers.Models; using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers.Models;
using Bit.Core.Enums; using Bit.Core.Enums;
using Bit.Core.Exceptions; using Bit.Core.Exceptions;
using Bit.Core.Models.Business;
using Bit.Core.Models.Data; using Bit.Core.Models.Data;
using Bit.Core.Utilities; using Bit.Core.Utilities;
using OrganizationUserInvite = Bit.Core.Models.Business.OrganizationUserInvite;
namespace Bit.Scim.Models; namespace Bit.Scim.Models;
@ -44,7 +44,7 @@ public class ScimUserRequestModel : BaseScimUserModel
return new InviteOrganizationUsersRequest( return new InviteOrganizationUsersRequest(
invites: invites:
[ [
new Core.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers.Models.OrganizationUserInvite( new OrganizationUserInviteCommandModel(
email: email, email: email,
externalId: ExternalIdForInvite() externalId: ExternalIdForInvite()
) )

21
test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/InviteOrganizationUserCommandTests.cs
View File

@ -30,7 +30,6 @@ using NSubstitute;
using NSubstitute.ExceptionExtensions; using NSubstitute.ExceptionExtensions;
using Xunit; using Xunit;
using static Bit.Core.Test.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers.Helpers.InviteUserOrganizationValidationRequestHelpers; using static Bit.Core.Test.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers.Helpers.InviteUserOrganizationValidationRequestHelpers;
using OrganizationUserInvite = Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers.Models.OrganizationUserInvite;
namespace Bit.Core.Test.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers; namespace Bit.Core.Test.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers;
@ -54,7 +53,7 @@ public class InviteOrganizationUserCommandTests
var request = new InviteOrganizationUsersRequest( var request = new InviteOrganizationUsersRequest(
invites: [ invites: [
new OrganizationUserInvite( new OrganizationUserInviteCommandModel(
email: user.Email, email: user.Email,
assignedCollections: [], assignedCollections: [],
groups: [], groups: [],
@ -112,7 +111,7 @@ public class InviteOrganizationUserCommandTests
var request = new InviteOrganizationUsersRequest( var request = new InviteOrganizationUsersRequest(
invites: [ invites: [
new OrganizationUserInvite( new OrganizationUserInviteCommandModel(
email: orgUser.Email, email: orgUser.Email,
assignedCollections: [], assignedCollections: [],
groups: [], groups: [],
@ -174,7 +173,7 @@ public class InviteOrganizationUserCommandTests
var request = new InviteOrganizationUsersRequest( var request = new InviteOrganizationUsersRequest(
invites: [ invites: [
new OrganizationUserInvite( new OrganizationUserInviteCommandModel(
email: user.Email, email: user.Email,
assignedCollections: [], assignedCollections: [],
groups: [], groups: [],
@ -241,7 +240,7 @@ public class InviteOrganizationUserCommandTests
var request = new InviteOrganizationUsersRequest( var request = new InviteOrganizationUsersRequest(
invites: [ invites: [
new OrganizationUserInvite( new OrganizationUserInviteCommandModel(
email: user.Email, email: user.Email,
assignedCollections: [], assignedCollections: [],
groups: [], groups: [],
@ -310,7 +309,7 @@ public class InviteOrganizationUserCommandTests
var request = new InviteOrganizationUsersRequest( var request = new InviteOrganizationUsersRequest(
invites: invites:
[ [
new OrganizationUserInvite( new OrganizationUserInviteCommandModel(
email: user.Email, email: user.Email,
assignedCollections: [], assignedCollections: [],
groups: [], groups: [],
@ -379,7 +378,7 @@ public class InviteOrganizationUserCommandTests
var request = new InviteOrganizationUsersRequest( var request = new InviteOrganizationUsersRequest(
invites: [ invites: [
new OrganizationUserInvite( new OrganizationUserInviteCommandModel(
email: user.Email, email: user.Email,
assignedCollections: [], assignedCollections: [],
groups: [], groups: [],
@ -452,7 +451,7 @@ public class InviteOrganizationUserCommandTests
var request = new InviteOrganizationUsersRequest( var request = new InviteOrganizationUsersRequest(
invites: [ invites: [
new OrganizationUserInvite( new OrganizationUserInviteCommandModel(
email: user.Email, email: user.Email,
assignedCollections: [], assignedCollections: [],
groups: [], groups: [],
@ -523,7 +522,7 @@ public class InviteOrganizationUserCommandTests
var request = new InviteOrganizationUsersRequest( var request = new InviteOrganizationUsersRequest(
invites: [ invites: [
new OrganizationUserInvite( new OrganizationUserInviteCommandModel(
email: user.Email, email: user.Email,
assignedCollections: [], assignedCollections: [],
groups: [], groups: [],
@ -618,7 +617,7 @@ public class InviteOrganizationUserCommandTests
var request = new InviteOrganizationUsersRequest( var request = new InviteOrganizationUsersRequest(
invites: [ invites: [
new OrganizationUserInvite( new OrganizationUserInviteCommandModel(
email: user.Email, email: user.Email,
assignedCollections: [], assignedCollections: [],
groups: [], groups: [],
@ -677,7 +676,7 @@ public class InviteOrganizationUserCommandTests
// Assert // Assert
Assert.IsType<Success<ScimInviteOrganizationUsersResponse>>(result); Assert.IsType<Success<ScimInviteOrganizationUsersResponse>>(result);
sutProvider.GetDependency<IMailService>().Received(1) await sutProvider.GetDependency<IMailService>().Received(1)
.SendOrganizationMaxSeatLimitReachedEmailAsync(organization, 2, .SendOrganizationMaxSeatLimitReachedEmailAsync(organization, 2,
Arg.Is<IEnumerable<string>>(emails => emails.Any(email => email == "provider@email.com"))); Arg.Is<IEnumerable<string>>(emails => emails.Any(email => email == "provider@email.com")));
} }

21
test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Validation/InviteOrganizationUsersValidatorTests.cs
View File

@ -14,7 +14,6 @@ using Bit.Test.Common.AutoFixture.Attributes;
using NSubstitute; using NSubstitute;
using NSubstitute.ExceptionExtensions; using NSubstitute.ExceptionExtensions;
using Xunit; using Xunit;
using OrganizationUserInvite = Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers.Models.OrganizationUserInvite;
namespace Bit.Core.Test.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers.Validation; namespace Bit.Core.Test.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers.Validation;
@ -36,13 +35,13 @@ public class InviteOrganizationUsersValidatorTests
{ {
Invites = Invites =
[ [
new OrganizationUserInvite( new OrganizationUserInviteCommandModel(
email: "test@email.com", email: "test@email.com",
externalId: "test-external-id"), externalId: "test-external-id"),
new OrganizationUserInvite( new OrganizationUserInviteCommandModel(
email: "test2@email.com", email: "test2@email.com",
externalId: "test-external-id2"), externalId: "test-external-id2"),
new OrganizationUserInvite( new OrganizationUserInviteCommandModel(
email: "test3@email.com", email: "test3@email.com",
externalId: "test-external-id3") externalId: "test-external-id3")
], ],
@ -61,7 +60,7 @@ public class InviteOrganizationUsersValidatorTests
_ = await sutProvider.Sut.ValidateAsync(request); _ = await sutProvider.Sut.ValidateAsync(request);
sutProvider.GetDependency<IUpdateSecretsManagerSubscriptionCommand>() await sutProvider.GetDependency<IUpdateSecretsManagerSubscriptionCommand>()
.Received(1) .Received(1)
.ValidateUpdateAsync(Arg.Is<SecretsManagerSubscriptionUpdate>(x => .ValidateUpdateAsync(Arg.Is<SecretsManagerSubscriptionUpdate>(x =>
x.SmSeatsChanged == true && x.SmSeats == 12)); x.SmSeatsChanged == true && x.SmSeats == 12));
@ -82,13 +81,13 @@ public class InviteOrganizationUsersValidatorTests
{ {
Invites = Invites =
[ [
new OrganizationUserInvite( new OrganizationUserInviteCommandModel(
email: "test@email.com", email: "test@email.com",
externalId: "test-external-id"), externalId: "test-external-id"),
new OrganizationUserInvite( new OrganizationUserInviteCommandModel(
email: "test2@email.com", email: "test2@email.com",
externalId: "test-external-id2"), externalId: "test-external-id2"),
new OrganizationUserInvite( new OrganizationUserInviteCommandModel(
email: "test3@email.com", email: "test3@email.com",
externalId: "test-external-id3") externalId: "test-external-id3")
], ],
@ -126,13 +125,13 @@ public class InviteOrganizationUsersValidatorTests
{ {
Invites = Invites =
[ [
new OrganizationUserInvite( new OrganizationUserInviteCommandModel(
email: "test@email.com", email: "test@email.com",
externalId: "test-external-id"), externalId: "test-external-id"),
new OrganizationUserInvite( new OrganizationUserInviteCommandModel(
email: "test2@email.com", email: "test2@email.com",
externalId: "test-external-id2"), externalId: "test-external-id2"),
new OrganizationUserInvite( new OrganizationUserInviteCommandModel(
email: "test3@email.com", email: "test3@email.com",
externalId: "test-external-id3") externalId: "test-external-id3")
], ],