diff --git a/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs b/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs index ac0a937e6b..dae4e2d51a 100644 --- a/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs +++ b/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs @@ -704,7 +704,7 @@ public class OrganizationUsersController : BaseAdminConsoleController [HttpPut("{id}/restore/vnext")] [Authorize] [RequireFeature(FeatureFlagKeys.DefaultUserCollectionRestore)] - public async Task RestoreAsync_vNext(Guid orgId, Guid id, OrganizationUserRestoreRequest request) + public async Task RestoreAsync_vNext(Guid orgId, Guid id, [FromBody] OrganizationUserRestoreRequest request) { await RestoreOrRevokeUserAsync(orgId, id, (orgUser, userId) => _restoreOrganizationUserCommand.RestoreUserAsync(orgUser, userId, request.DefaultUserCollectionName)); } diff --git a/src/Api/AdminConsole/Models/Request/Organizations/OrganizationUserRequestModels.cs b/src/Api/AdminConsole/Models/Request/Organizations/OrganizationUserRequestModels.cs index 524f1541c2..06fe654b73 100644 --- a/src/Api/AdminConsole/Models/Request/Organizations/OrganizationUserRequestModels.cs +++ b/src/Api/AdminConsole/Models/Request/Organizations/OrganizationUserRequestModels.cs @@ -121,6 +121,9 @@ public class OrganizationUserBulkRequestModel { [Required, MinLength(1)] public IEnumerable Ids { get; set; } = new List(); + + [EncryptedString] + [EncryptedStringLength(1000)] public string? DefaultUserCollectionName { get; set; } } #nullable disable diff --git a/src/Api/AdminConsole/Models/Request/Organizations/OrganizationUserRestoreRequest.cs b/src/Api/AdminConsole/Models/Request/Organizations/OrganizationUserRestoreRequest.cs index 66310a1ef5..ff5f877b3a 100644 --- a/src/Api/AdminConsole/Models/Request/Organizations/OrganizationUserRestoreRequest.cs +++ b/src/Api/AdminConsole/Models/Request/Organizations/OrganizationUserRestoreRequest.cs @@ -1,9 +1,13 @@ -namespace Bit.Api.AdminConsole.Models.Request.Organizations; +using Bit.Core.Utilities; + +namespace Bit.Api.AdminConsole.Models.Request.Organizations; public class OrganizationUserRestoreRequest { /// /// This is the encrypted default collection name to be used for restored users if required /// - public string DefaultUserCollectionName { get; set; } = string.Empty; + [EncryptedString] + [EncryptedStringLength(1000)] + public string? DefaultUserCollectionName { get; set; } }