Merge branch 'main' into billing/pm-29067/remove-code-for-pm-24032

sbrown-livefront · web-flow · commit a320dacc0f90 · 2026-04-28T09:24:58.000-04:00
diff --git a/src/Api/AdminConsole/Authorization/AuthorizationHandlerCollectionExtensions.cs b/src/Api/AdminConsole/Authorization/AuthorizationHandlerCollectionExtensions.cs
@@ -1,5 +1,5 @@
-﻿using Bit.Api.AdminConsole.Authorization.Providers;
-using Bit.Api.Vault.AuthorizationHandlers.Collections;
+﻿using Bit.Api.AdminConsole.Authorization.Collections;
+using Bit.Api.AdminConsole.Authorization.Providers;
 using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Authorization;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.DependencyInjection.Extensions;
diff --git a/src/Api/AdminConsole/Authorization/Collections/BulkCollectionAuthorizationHandler.cs b/src/Api/AdminConsole/Authorization/Collections/BulkCollectionAuthorizationHandler.cs
@@ -10,7 +10,7 @@
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 
-namespace Bit.Api.Vault.AuthorizationHandlers.Collections;
+namespace Bit.Api.AdminConsole.Authorization.Collections;
 
 /// <summary>
 /// Handles authorization logic for Collection objects, including access permissions for users and groups.
diff --git a/src/Api/AdminConsole/Authorization/Collections/BulkCollectionOperations.cs b/src/Api/AdminConsole/Authorization/Collections/BulkCollectionOperations.cs
@@ -1,6 +1,6 @@
 ﻿using Microsoft.AspNetCore.Authorization.Infrastructure;
 
-namespace Bit.Api.Vault.AuthorizationHandlers.Collections;
+namespace Bit.Api.AdminConsole.Authorization.Collections;
 
 public class BulkCollectionOperationRequirement : OperationAuthorizationRequirement { }
 
diff --git a/src/Api/AdminConsole/Authorization/Collections/CollectionAuthorizationHandler.cs b/src/Api/AdminConsole/Authorization/Collections/CollectionAuthorizationHandler.cs
@@ -4,7 +4,7 @@
 using Bit.Core.Services;
 using Microsoft.AspNetCore.Authorization;
 
-namespace Bit.Api.Vault.AuthorizationHandlers.Collections;
+namespace Bit.Api.AdminConsole.Authorization.Collections;
 
 /// <summary>
 /// Handles authorization logic for Collection operations.
diff --git a/src/Api/AdminConsole/Authorization/Collections/CollectionOperations.cs b/src/Api/AdminConsole/Authorization/Collections/CollectionOperations.cs
@@ -1,6 +1,6 @@
 ﻿using Microsoft.AspNetCore.Authorization.Infrastructure;
 
-namespace Bit.Api.Vault.AuthorizationHandlers.Collections;
+namespace Bit.Api.AdminConsole.Authorization.Collections;
 
 public class CollectionOperationRequirement : OperationAuthorizationRequirement
 {
diff --git a/src/Api/AdminConsole/Controllers/CollectionsController.cs b/src/Api/AdminConsole/Controllers/CollectionsController.cs
@@ -1,22 +1,23 @@
 ﻿// FIXME: Update this file to be null safe and then delete the line below
 #nullable disable
 
-using Bit.Api.Models.Request;
+using Bit.Api.AdminConsole.Authorization.Collections;
+using Bit.Api.AdminConsole.Models.Request;
+using Bit.Api.AdminConsole.Models.Response;
 using Bit.Api.Models.Response;
-using Bit.Api.Vault.AuthorizationHandlers.Collections;
+using Bit.Core.AdminConsole.OrganizationFeatures.Collections.Interfaces;
 using Bit.Core.AdminConsole.Services;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data;
-using Bit.Core.OrganizationFeatures.OrganizationCollections.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Api.Controllers;
+namespace Bit.Api.AdminConsole.Controllers;
 
 [Route("organizations/{orgId}/collections")]
 [Authorize("Application")]
diff --git a/src/Api/AdminConsole/Controllers/GroupsController.cs b/src/Api/AdminConsole/Controllers/GroupsController.cs
@@ -2,11 +2,11 @@
 #nullable disable
 
 using Bit.Api.AdminConsole.Authorization;
+using Bit.Api.AdminConsole.Authorization.Collections;
 using Bit.Api.AdminConsole.Authorization.Requirements;
 using Bit.Api.AdminConsole.Models.Request;
 using Bit.Api.AdminConsole.Models.Response;
 using Bit.Api.Models.Response;
-using Bit.Api.Vault.AuthorizationHandlers.Collections;
 using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Interfaces;
 using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.AdminConsole.Services;
diff --git a/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs b/src/Api/AdminConsole/Controllers/OrganizationUsersController.cs
@@ -3,12 +3,12 @@
 #nullable disable
 
 using Bit.Api.AdminConsole.Authorization;
+using Bit.Api.AdminConsole.Authorization.Collections;
 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.Api.Vault.AuthorizationHandlers.Collections;
 using Bit.Core;
 using Bit.Core.AdminConsole.Models.Data;
 using Bit.Core.AdminConsole.OrganizationFeatures.AccountRecovery;
diff --git a/src/Api/AdminConsole/Models/Public/CollectionBaseModel.cs b/src/Api/AdminConsole/Models/Public/CollectionBaseModel.cs
@@ -3,7 +3,7 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Api.Models.Public;
+namespace Bit.Api.AdminConsole.Models.Public;
 
 public abstract class CollectionBaseModel
 {
diff --git a/src/Api/AdminConsole/Models/Public/Request/CollectionUpdateRequestModel.cs b/src/Api/AdminConsole/Models/Public/Request/CollectionUpdateRequestModel.cs
@@ -4,7 +4,7 @@
 using Bit.Api.AdminConsole.Public.Models.Request;
 using Bit.Core.Entities;
 
-namespace Bit.Api.Models.Public.Request;
+namespace Bit.Api.AdminConsole.Models.Public.Request;
 
 public class CollectionUpdateRequestModel : CollectionBaseModel
 {
diff --git a/src/Api/AdminConsole/Models/Public/Response/CollectionResponseModel.cs b/src/Api/AdminConsole/Models/Public/Response/CollectionResponseModel.cs
@@ -4,10 +4,11 @@
 using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 using Bit.Api.AdminConsole.Public.Models.Response;
+using Bit.Api.Models.Public.Response;
 using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 
-namespace Bit.Api.Models.Public.Response;
+namespace Bit.Api.AdminConsole.Models.Public.Response;
 
 /// <summary>
 /// A collection.
diff --git a/src/Api/AdminConsole/Models/Request/BulkCollectionAccessRequestModel.cs b/src/Api/AdminConsole/Models/Request/BulkCollectionAccessRequestModel.cs
@@ -1,7 +1,9 @@
 ﻿// FIXME: Update this file to be null safe and then delete the line below
 #nullable disable
 
-namespace Bit.Api.Models.Request;
+using Bit.Api.Models.Request;
+
+namespace Bit.Api.AdminConsole.Models.Request;
 
 public class BulkCollectionAccessRequestModel
 {
diff --git a/src/Api/AdminConsole/Models/Request/CollectionRequestModel.cs b/src/Api/AdminConsole/Models/Request/CollectionRequestModel.cs
@@ -2,10 +2,11 @@
 #nullable disable
 
 using System.ComponentModel.DataAnnotations;
+using Bit.Api.Models.Request;
 using Bit.Core.Entities;
 using Bit.Core.Utilities;
 
-namespace Bit.Api.Models.Request;
+namespace Bit.Api.AdminConsole.Models.Request;
 
 public class CreateCollectionRequestModel
 {
diff --git a/src/Api/AdminConsole/Models/Response/CollectionResponseModel.cs b/src/Api/AdminConsole/Models/Response/CollectionResponseModel.cs
@@ -1,12 +1,13 @@
 ﻿// FIXME: Update this file to be null safe and then delete the line below
 #nullable disable
 
+using Bit.Api.Models.Response;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 using Bit.Core.Models.Data;
 
-namespace Bit.Api.Models.Response;
+namespace Bit.Api.AdminConsole.Models.Response;
 
 public class CollectionResponseModel : ResponseModel
 {
diff --git a/src/Api/AdminConsole/Public/Controllers/CollectionsController.cs b/src/Api/AdminConsole/Public/Controllers/CollectionsController.cs
@@ -2,16 +2,17 @@
 #nullable disable
 
 using System.Net;
-using Bit.Api.Models.Public.Request;
+using Bit.Api.AdminConsole.Models.Public.Request;
+using Bit.Api.AdminConsole.Models.Public.Response;
 using Bit.Api.Models.Public.Response;
+using Bit.Core.AdminConsole.OrganizationFeatures.Collections.Interfaces;
 using Bit.Core.Context;
 using Bit.Core.Enums;
-using Bit.Core.OrganizationFeatures.OrganizationCollections.Interfaces;
 using Bit.Core.Repositories;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Api.Public.Controllers;
+namespace Bit.Api.AdminConsole.Public.Controllers;
 
 [Route("public/collections")]
 [Authorize("Organization")]
diff --git a/src/Api/Tools/Controllers/ImportCiphersController.cs b/src/Api/Tools/Controllers/ImportCiphersController.cs
@@ -1,6 +1,6 @@
-﻿using Bit.Api.Tools.Models.Request.Accounts;
+﻿using Bit.Api.AdminConsole.Authorization.Collections;
+using Bit.Api.Tools.Models.Request.Accounts;
 using Bit.Api.Tools.Models.Request.Organizations;
-using Bit.Api.Vault.AuthorizationHandlers.Collections;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Exceptions;
diff --git a/src/Api/Tools/Models/Request/Organizations/ImportOrganizationCiphersRequestModel.cs b/src/Api/Tools/Models/Request/Organizations/ImportOrganizationCiphersRequestModel.cs
@@ -1,4 +1,4 @@
-﻿using Bit.Api.Models.Request;
+﻿using Bit.Api.AdminConsole.Models.Request;
 using Bit.Api.Vault.Models.Request;
 
 namespace Bit.Api.Tools.Models.Request.Organizations;
diff --git a/src/Api/Tools/Models/Response/OrganizationExportResponseModel.cs b/src/Api/Tools/Models/Response/OrganizationExportResponseModel.cs
@@ -1,6 +1,7 @@
 ﻿// FIXME: Update this file to be null safe and then delete the line below
 #nullable disable
 
+using Bit.Api.AdminConsole.Models.Response;
 using Bit.Api.Models.Response;
 using Bit.Api.Vault.Models.Response;
 using Bit.Core.Entities;
diff --git a/src/Api/Vault/Models/Response/SyncResponseModel.cs b/src/Api/Vault/Models/Response/SyncResponseModel.cs
@@ -1,6 +1,7 @@
 ﻿// FIXME: Update this file to be null safe and then delete the line below
 #nullable disable
 
+using Bit.Api.AdminConsole.Models.Response;
 using Bit.Api.AdminConsole.Models.Response.Organizations;
 using Bit.Api.Models.Response;
 using Bit.Api.Tools.Models.Response;
diff --git a/src/Core/AdminConsole/OrganizationFeatures/Collections/BulkAddCollectionAccessCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/Collections/BulkAddCollectionAccessCommand.cs
@@ -1,13 +1,13 @@
-﻿using Bit.Core.AdminConsole.Repositories;
+﻿using Bit.Core.AdminConsole.OrganizationFeatures.Collections.Interfaces;
+using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data;
-using Bit.Core.OrganizationFeatures.OrganizationCollections.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationCollections;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.Collections;
 
 public class BulkAddCollectionAccessCommand : IBulkAddCollectionAccessCommand
 {
diff --git a/src/Core/AdminConsole/OrganizationFeatures/Collections/CreateCollectionCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/Collections/CreateCollectionCommand.cs
@@ -1,15 +1,15 @@
 ﻿// FIXME: Update this file to be null safe and then delete the line below
 #nullable disable
 
+using Bit.Core.AdminConsole.OrganizationFeatures.Collections.Interfaces;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data;
-using Bit.Core.OrganizationFeatures.OrganizationCollections.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationCollections;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.Collections;
 
 public class CreateCollectionCommand : ICreateCollectionCommand
 {
@@ -72,7 +72,7 @@ public async Task<Collection> CreateAsync(Collection collection, IEnumerable<Col
         }
 
         await _collectionRepository.CreateAsync(collection, org.UseGroups ? groupsList : null, usersList);
-        await _eventService.LogCollectionEventAsync(collection, Enums.EventType.Collection_Created);
+        await _eventService.LogCollectionEventAsync(collection, EventType.Collection_Created);
 
         return collection;
     }
diff --git a/src/Core/AdminConsole/OrganizationFeatures/Collections/DeleteCollectionCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/Collections/DeleteCollectionCommand.cs
@@ -1,12 +1,12 @@
-﻿using Bit.Core.Entities;
+﻿using Bit.Core.AdminConsole.OrganizationFeatures.Collections.Interfaces;
+using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.OrganizationFeatures.OrganizationCollections.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Microsoft.Extensions.Logging;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationCollections;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.Collections;
 
 public class DeleteCollectionCommand : IDeleteCollectionCommand
 {
@@ -35,7 +35,7 @@ public async Task DeleteAsync(Collection collection)
 
         try
         {
-            await _eventService.LogCollectionEventAsync(collection, Enums.EventType.Collection_Deleted, DateTime.UtcNow);
+            await _eventService.LogCollectionEventAsync(collection, EventType.Collection_Deleted, DateTime.UtcNow);
         }
         catch (Exception ex)
         {
@@ -52,7 +52,7 @@ public async Task DeleteManyAsync(IEnumerable<Guid> collectionIds)
 
     public async Task DeleteManyAsync(IEnumerable<Collection> collections)
     {
-        if (collections.Any(c => c.Type == Enums.CollectionType.DefaultUserCollection))
+        if (collections.Any(c => c.Type == CollectionType.DefaultUserCollection))
         {
             throw new BadRequestException("You cannot delete collections with the type as DefaultUserCollection.");
         }
@@ -61,7 +61,7 @@ public async Task DeleteManyAsync(IEnumerable<Collection> collections)
 
         try
         {
-            await _eventService.LogCollectionEventsAsync(collections.Select(c => (c, Enums.EventType.Collection_Deleted, (DateTime?)DateTime.UtcNow)));
+            await _eventService.LogCollectionEventsAsync(collections.Select(c => (c, EventType.Collection_Deleted, (DateTime?)DateTime.UtcNow)));
         }
         catch (Exception ex)
         {
diff --git a/src/Core/AdminConsole/OrganizationFeatures/Collections/Interfaces/IBulkAddCollectionAccessCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/Collections/Interfaces/IBulkAddCollectionAccessCommand.cs
@@ -1,7 +1,7 @@
 ﻿using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationCollections.Interfaces;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.Collections.Interfaces;
 
 public interface IBulkAddCollectionAccessCommand
 {
diff --git a/src/Core/AdminConsole/OrganizationFeatures/Collections/Interfaces/ICreateCollectionCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/Collections/Interfaces/ICreateCollectionCommand.cs
@@ -4,7 +4,7 @@
 using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationCollections.Interfaces;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.Collections.Interfaces;
 
 public interface ICreateCollectionCommand
 {
diff --git a/src/Core/AdminConsole/OrganizationFeatures/Collections/Interfaces/IDeleteCollectionCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/Collections/Interfaces/IDeleteCollectionCommand.cs
@@ -1,6 +1,6 @@
 ﻿using Bit.Core.Entities;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationCollections.Interfaces;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.Collections.Interfaces;
 
 public interface IDeleteCollectionCommand
 {
diff --git a/src/Core/AdminConsole/OrganizationFeatures/Collections/Interfaces/IUpdateCollectionCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/Collections/Interfaces/IUpdateCollectionCommand.cs
@@ -4,7 +4,7 @@
 using Bit.Core.Entities;
 using Bit.Core.Models.Data;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationCollections.Interfaces;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.Collections.Interfaces;
 
 public interface IUpdateCollectionCommand
 {
diff --git a/src/Core/AdminConsole/OrganizationFeatures/Collections/UpdateCollectionCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/Collections/UpdateCollectionCommand.cs
@@ -1,15 +1,15 @@
 ﻿// FIXME: Update this file to be null safe and then delete the line below
 #nullable disable
 
+using Bit.Core.AdminConsole.OrganizationFeatures.Collections.Interfaces;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data;
-using Bit.Core.OrganizationFeatures.OrganizationCollections.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 
-namespace Bit.Core.OrganizationFeatures.OrganizationCollections;
+namespace Bit.Core.AdminConsole.OrganizationFeatures.Collections;
 
 public class UpdateCollectionCommand : IUpdateCollectionCommand
 {
@@ -80,7 +80,7 @@ public async Task<Collection> UpdateAsync(Collection collection, IEnumerable<Col
 
         collection.RevisionDate = _timeProvider.GetUtcNow().UtcDateTime;
         await _collectionRepository.ReplaceAsync(collection, org.UseGroups ? groupsList : null, usersList);
-        await _eventService.LogCollectionEventAsync(collection, Enums.EventType.Collection_Updated);
+        await _eventService.LogCollectionEventAsync(collection, EventType.Collection_Updated);
 
         return collection;
     }
diff --git a/src/Core/OrganizationFeatures/OrganizationServiceCollectionExtensions.cs b/src/Core/OrganizationFeatures/OrganizationServiceCollectionExtensions.cs
@@ -1,6 +1,8 @@
 ﻿using Bit.Core.AdminConsole.OrganizationAuth;
 using Bit.Core.AdminConsole.OrganizationAuth.Interfaces;
 using Bit.Core.AdminConsole.OrganizationFeatures.AccountRecovery;
+using Bit.Core.AdminConsole.OrganizationFeatures.Collections;
+using Bit.Core.AdminConsole.OrganizationFeatures.Collections.Interfaces;
 using Bit.Core.AdminConsole.OrganizationFeatures.Groups;
 using Bit.Core.AdminConsole.OrganizationFeatures.Groups.Interfaces;
 using Bit.Core.AdminConsole.OrganizationFeatures.Import;
@@ -27,8 +29,6 @@
 using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.RestoreUser.v1;
 using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.SelfRevokeUser;
 using Bit.Core.Models.Business.Tokenables;
-using Bit.Core.OrganizationFeatures.OrganizationCollections;
-using Bit.Core.OrganizationFeatures.OrganizationCollections.Interfaces;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Cloud;
 using Bit.Core.OrganizationFeatures.OrganizationSponsorships.FamiliesForEnterprise.Interfaces;
diff --git a/test/Api.IntegrationTest/AdminConsole/Controllers/CollectionsControllerTests.cs b/test/Api.IntegrationTest/AdminConsole/Controllers/CollectionsControllerTests.cs
@@ -1,7 +1,8 @@
-﻿using Bit.Api.AdminConsole.Public.Models.Request;
+﻿using Bit.Api.AdminConsole.Models.Public.Request;
+using Bit.Api.AdminConsole.Models.Public.Response;
+using Bit.Api.AdminConsole.Public.Models.Request;
 using Bit.Api.IntegrationTest.Factories;
 using Bit.Api.IntegrationTest.Helpers;
-using Bit.Api.Models.Public.Request;
 using Bit.Api.Models.Public.Response;
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Repositories;
diff --git a/test/Api.Test/AdminConsole/Authorization/BulkCollectionAuthorizationHandlerTests.cs b/test/Api.Test/AdminConsole/Authorization/BulkCollectionAuthorizationHandlerTests.cs
diff --git a/test/Api.Test/AdminConsole/Authorization/CollectionAuthorizationHandlerTests.cs b/test/Api.Test/AdminConsole/Authorization/CollectionAuthorizationHandlerTests.cs
diff --git a/test/Api.Test/AdminConsole/Controllers/AdminConsoleControllersAuthorizationTests.cs b/test/Api.Test/AdminConsole/Controllers/AdminConsoleControllersAuthorizationTests.cs
diff --git a/test/Api.Test/AdminConsole/Controllers/CollectionsControllerTests.cs b/test/Api.Test/AdminConsole/Controllers/CollectionsControllerTests.cs
diff --git a/test/Api.Test/AdminConsole/Controllers/GroupsControllerPutTests.cs b/test/Api.Test/AdminConsole/Controllers/GroupsControllerPutTests.cs
diff --git a/test/Api.Test/AdminConsole/Controllers/GroupsControllerTests.cs b/test/Api.Test/AdminConsole/Controllers/GroupsControllerTests.cs
diff --git a/test/Api.Test/AdminConsole/Controllers/OrganizationUserControllerPutTests.cs b/test/Api.Test/AdminConsole/Controllers/OrganizationUserControllerPutTests.cs
diff --git a/test/Api.Test/AdminConsole/Controllers/OrganizationUsersControllerTests.cs b/test/Api.Test/AdminConsole/Controllers/OrganizationUsersControllerTests.cs
diff --git a/test/Api.Test/Public/Controllers/CollectionsControllerTests.cs b/test/Api.Test/Public/Controllers/CollectionsControllerTests.cs
diff --git a/test/Api.Test/Tools/Controllers/ImportCiphersControllerTests.cs b/test/Api.Test/Tools/Controllers/ImportCiphersControllerTests.cs
diff --git a/test/Core.Test/AdminConsole/OrganizationFeatures/Collections/BulkAddCollectionAccessCommandTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/Collections/BulkAddCollectionAccessCommandTests.cs
diff --git a/test/Core.Test/AdminConsole/OrganizationFeatures/Collections/CreateCollectionCommandTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/Collections/CreateCollectionCommandTests.cs
diff --git a/test/Core.Test/AdminConsole/OrganizationFeatures/Collections/DeleteCollectionCommandTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/Collections/DeleteCollectionCommandTests.cs
diff --git a/test/Core.Test/AdminConsole/OrganizationFeatures/Collections/UpdateCollectionCommandTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/Collections/UpdateCollectionCommandTests.cs

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using Microsoft.AspNetCore.Authorization.Infrastructure;`
`2`	`2`
`3`		`-namespace Bit.Api.Vault.AuthorizationHandlers.Collections;`
	`3`	`+namespace Bit.Api.AdminConsole.Authorization.Collections;`
`4`	`4`
`5`	`5`	`public class CollectionOperationRequirement : OperationAuthorizationRequirement`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`using System.ComponentModel.DataAnnotations;`
`5`	`5`
`6`		`-namespace Bit.Api.Models.Public;`
	`6`	`+namespace Bit.Api.AdminConsole.Models.Public;`
`7`	`7`
`8`	`8`	`public abstract class CollectionBaseModel`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using Bit.Api.AdminConsole.Public.Models.Request;`
`5`	`5`	`using Bit.Core.Entities;`
`6`	`6`
`7`		`-namespace Bit.Api.Models.Public.Request;`
	`7`	`+namespace Bit.Api.AdminConsole.Models.Public.Request;`
`8`	`8`
`9`	`9`	`public class CollectionUpdateRequestModel : CollectionBaseModel`
`10`	`10`	`{`