From 9e8648a20259b6d4bbb6fdf5b09396ccfab7a208 Mon Sep 17 00:00:00 2001 From: Thomas Rittson Date: Wed, 20 May 2026 15:46:09 +1000 Subject: [PATCH] Move remaining Admin Password Reset code to AC Team --- .../AdminConsole/Controllers/OrganizationUsersController.cs | 1 - .../OrganizationUserResetPasswordRequestModel.cs | 2 +- .../Models/Request/Accounts/UpdateTempPasswordRequestModel.cs | 2 +- .../Models/Mail/AdminResetPasswordViewModel.cs | 4 +++- ...er_ReadManyAccountRecoveryDetailsByOrganizationUserIds.sql | 0 .../OrganizationUsersControllerPutResetPasswordTests.cs | 2 +- .../Controllers/OrganizationUsersControllerTests.cs | 1 - 7 files changed, 6 insertions(+), 6 deletions(-) rename src/Api/{ => AdminConsole}/Models/Request/Organizations/OrganizationUserResetPasswordRequestModel.cs (92%) rename src/Core/{ => AdminConsole}/Models/Mail/AdminResetPasswordViewModel.cs (75%) rename src/Sql/dbo/{ => AdminConsole}/Stored Procedures/OrganizationUser_ReadManyAccountRecoveryDetailsByOrganizationUserIds.sql (100%) diff --git a/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs b/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs index 010b3e2b27e1..daa6baf80e7f 100644 --- a/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs +++ b/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs @@ -8,7 +8,6 @@ using Bit.Api.AdminConsole.Authorization.Requirements; using Bit.Api.AdminConsole.Models.Request.Organizations; using Bit.Api.AdminConsole.Models.Response.Organizations; -using Bit.Api.Models.Request.Organizations; using Bit.Api.Models.Response; using Bit.Core; using Bit.Core.AdminConsole.Models.Data; diff --git a/src/Api/Models/Request/Organizations/OrganizationUserResetPasswordRequestModel.cs b/src/Api/AdminConsole/Models/Request/Organizations/OrganizationUserResetPasswordRequestModel.cs similarity index 92% rename from src/Api/Models/Request/Organizations/OrganizationUserResetPasswordRequestModel.cs rename to src/Api/AdminConsole/Models/Request/Organizations/OrganizationUserResetPasswordRequestModel.cs index a257e62ea24a..ec52ceaf33e8 100644 --- a/src/Api/Models/Request/Organizations/OrganizationUserResetPasswordRequestModel.cs +++ b/src/Api/AdminConsole/Models/Request/Organizations/OrganizationUserResetPasswordRequestModel.cs @@ -2,7 +2,7 @@ using Bit.Core.AdminConsole.OrganizationFeatures.AccountRecovery.v2; using Bit.Core.Entities; -namespace Bit.Api.Models.Request.Organizations; +namespace Bit.Api.AdminConsole.Models.Request.Organizations; public class OrganizationUserResetPasswordRequestModel { diff --git a/src/Api/Auth/Models/Request/Accounts/UpdateTempPasswordRequestModel.cs b/src/Api/Auth/Models/Request/Accounts/UpdateTempPasswordRequestModel.cs index e071726edf8f..fdf400ae9dc4 100644 --- a/src/Api/Auth/Models/Request/Accounts/UpdateTempPasswordRequestModel.cs +++ b/src/Api/Auth/Models/Request/Accounts/UpdateTempPasswordRequestModel.cs @@ -2,7 +2,7 @@ #nullable disable using System.ComponentModel.DataAnnotations; -using Bit.Api.Models.Request.Organizations; +using Bit.Api.AdminConsole.Models.Request.Organizations; namespace Bit.Api.Auth.Models.Request.Accounts; diff --git a/src/Core/Models/Mail/AdminResetPasswordViewModel.cs b/src/Core/AdminConsole/Models/Mail/AdminResetPasswordViewModel.cs similarity index 75% rename from src/Core/Models/Mail/AdminResetPasswordViewModel.cs rename to src/Core/AdminConsole/Models/Mail/AdminResetPasswordViewModel.cs index aa7c4dee25f0..86c3301fa65a 100644 --- a/src/Core/Models/Mail/AdminResetPasswordViewModel.cs +++ b/src/Core/AdminConsole/Models/Mail/AdminResetPasswordViewModel.cs @@ -1,4 +1,6 @@ -namespace Bit.Core.Models.Mail; +using Bit.Core.Models.Mail; + +namespace Bit.Core.AdminConsole.Models.Mail; public class AdminResetPasswordViewModel : BaseMailModel { diff --git a/src/Sql/dbo/Stored Procedures/OrganizationUser_ReadManyAccountRecoveryDetailsByOrganizationUserIds.sql b/src/Sql/dbo/AdminConsole/Stored Procedures/OrganizationUser_ReadManyAccountRecoveryDetailsByOrganizationUserIds.sql similarity index 100% rename from src/Sql/dbo/Stored Procedures/OrganizationUser_ReadManyAccountRecoveryDetailsByOrganizationUserIds.sql rename to src/Sql/dbo/AdminConsole/Stored Procedures/OrganizationUser_ReadManyAccountRecoveryDetailsByOrganizationUserIds.sql diff --git a/test/Api.IntegrationTest/AdminConsole/Controllers/OrganizationUsersControllerPutResetPasswordTests.cs b/test/Api.IntegrationTest/AdminConsole/Controllers/OrganizationUsersControllerPutResetPasswordTests.cs index 13d4b18ea09e..10dfadebc1b7 100644 --- a/test/Api.IntegrationTest/AdminConsole/Controllers/OrganizationUsersControllerPutResetPasswordTests.cs +++ b/test/Api.IntegrationTest/AdminConsole/Controllers/OrganizationUsersControllerPutResetPasswordTests.cs @@ -1,8 +1,8 @@ using System.Net; using Bit.Api.AdminConsole.Authorization; +using Bit.Api.AdminConsole.Models.Request.Organizations; using Bit.Api.IntegrationTest.Factories; using Bit.Api.IntegrationTest.Helpers; -using Bit.Api.Models.Request.Organizations; using Bit.Core.AdminConsole.Entities; using Bit.Core.AdminConsole.Entities.Provider; using Bit.Core.AdminConsole.Enums; diff --git a/test/Api.Test/AdminConsole/Controllers/OrganizationUsersControllerTests.cs b/test/Api.Test/AdminConsole/Controllers/OrganizationUsersControllerTests.cs index ee27bccb3a10..e0820a56109b 100644 --- a/test/Api.Test/AdminConsole/Controllers/OrganizationUsersControllerTests.cs +++ b/test/Api.Test/AdminConsole/Controllers/OrganizationUsersControllerTests.cs @@ -3,7 +3,6 @@ using Bit.Api.AdminConsole.Authorization.Collections; using Bit.Api.AdminConsole.Controllers; using Bit.Api.AdminConsole.Models.Request.Organizations; -using Bit.Api.Models.Request.Organizations; using Bit.Core; using Bit.Core.AdminConsole.Entities; using Bit.Core.AdminConsole.Models.Data.Organizations.Policies;