nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-06 13:38:13 -05:00
Code

[EC-1003] feat: remove externalId from PUT/POST (#2589)

Browse Source
This commit is contained in:
Andreas Coroiu 2023-02-06 10:27:40 +01:00 committed by GitHub
parent 6514bdbb7e
commit 55cc022d9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Api/Models/Request/GroupRequestModel.cs
View File

@ -10,8 +10,6 @@ public class GroupRequestModel
public string Name { get; set; } public string Name { get; set; }
[Required] [Required]
public bool? AccessAll { get; set; } public bool? AccessAll { get; set; }
[StringLength(300)]
public string ExternalId { get; set; }
public IEnumerable<SelectionReadOnlyRequestModel> Collections { get; set; } public IEnumerable<SelectionReadOnlyRequestModel> Collections { get; set; }
public IEnumerable<Guid> Users { get; set; } public IEnumerable<Guid> Users { get; set; }
@ -27,7 +25,6 @@ public class GroupRequestModel
{ {
existingGroup.Name = Name; existingGroup.Name = Name;
existingGroup.AccessAll = AccessAll.Value; existingGroup.AccessAll = AccessAll.Value;
existingGroup.ExternalId = ExternalId;
return existingGroup; return existingGroup;
} }
} }

6
test/Api.Test/Controllers/GroupsControllerTests.cs
View File

@ -29,7 +29,7 @@ public class GroupsControllerTests
await sutProvider.GetDependency<ICreateGroupCommand>().Received(1).CreateGroupAsync( await sutProvider.GetDependency<ICreateGroupCommand>().Received(1).CreateGroupAsync(
Arg.Is<Group>(g => Arg.Is<Group>(g =>
g.OrganizationId == organization.Id && g.Name == groupRequestModel.Name && g.OrganizationId == organization.Id && g.Name == groupRequestModel.Name &&
g.AccessAll == groupRequestModel.AccessAll && g.ExternalId == groupRequestModel.ExternalId), g.AccessAll == groupRequestModel.AccessAll),
organization, organization,
Arg.Any<IEnumerable<CollectionAccessSelection>>(), Arg.Any<IEnumerable<CollectionAccessSelection>>(),
Arg.Any<IEnumerable<Guid>>()); Arg.Any<IEnumerable<Guid>>());
@ -38,7 +38,6 @@ public class GroupsControllerTests
Assert.Equal(groupRequestModel.Name, response.Name); Assert.Equal(groupRequestModel.Name, response.Name);
Assert.Equal(organization.Id.ToString(), response.OrganizationId); Assert.Equal(organization.Id.ToString(), response.OrganizationId);
Assert.Equal(groupRequestModel.AccessAll, response.AccessAll); Assert.Equal(groupRequestModel.AccessAll, response.AccessAll);
Assert.Equal(groupRequestModel.ExternalId, response.ExternalId);
} }
[Theory] [Theory]
@ -57,7 +56,7 @@ public class GroupsControllerTests
await sutProvider.GetDependency<IUpdateGroupCommand>().Received(1).UpdateGroupAsync( await sutProvider.GetDependency<IUpdateGroupCommand>().Received(1).UpdateGroupAsync(
Arg.Is<Group>(g => Arg.Is<Group>(g =>
g.OrganizationId == organization.Id && g.Name == groupRequestModel.Name && g.OrganizationId == organization.Id && g.Name == groupRequestModel.Name &&
g.AccessAll == groupRequestModel.AccessAll && g.ExternalId == groupRequestModel.ExternalId), g.AccessAll == groupRequestModel.AccessAll),
Arg.Is<Organization>(o => o.Id == organization.Id), Arg.Is<Organization>(o => o.Id == organization.Id),
Arg.Any<IEnumerable<CollectionAccessSelection>>(), Arg.Any<IEnumerable<CollectionAccessSelection>>(),
Arg.Any<IEnumerable<Guid>>()); Arg.Any<IEnumerable<Guid>>());
@ -66,6 +65,5 @@ public class GroupsControllerTests
Assert.Equal(groupRequestModel.Name, response.Name); Assert.Equal(groupRequestModel.Name, response.Name);
Assert.Equal(organization.Id.ToString(), response.OrganizationId); Assert.Equal(organization.Id.ToString(), response.OrganizationId);
Assert.Equal(groupRequestModel.AccessAll, response.AccessAll); Assert.Equal(groupRequestModel.AccessAll, response.AccessAll);
Assert.Equal(groupRequestModel.ExternalId, response.ExternalId);
} }
} }