Fix namespaces

src/Core/AdminConsole/Repositories/IOrganizationUserRepository.cs

@@ -1,7 +1,7 @@
 using Bit.Core.AdminConsole.Enums;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.KeyManagement.UserFeatures.UserKey;
+using Bit.Core.KeyManagement.UserKey;
 using Bit.Core.Models.Data;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
 

src/Core/Auth/Repositories/IEmergencyAccessRepository.cs

@@ -1,6 +1,6 @@
 using Bit.Core.Auth.Entities;
 using Bit.Core.Auth.Models.Data;
-using Bit.Core.KeyManagement.UserFeatures.UserKey;
+using Bit.Core.KeyManagement.UserKey;
 
 #nullable enable
 

src/Core/Auth/Repositories/IWebAuthnCredentialRepository.cs

@@ -1,6 +1,6 @@
 using Bit.Core.Auth.Entities;
 using Bit.Core.Auth.Models.Data;
-using Bit.Core.KeyManagement.UserFeatures.UserKey;
+using Bit.Core.KeyManagement.UserKey;
 using Bit.Core.Repositories;
 
 #nullable enable

src/Core/Auth/UserFeatures/UserServiceCollectionExtensions.cs

@@ -9,8 +9,8 @@ using Bit.Core.Auth.UserFeatures.UserMasterPassword;
 using Bit.Core.Auth.UserFeatures.UserMasterPassword.Interfaces;
 using Bit.Core.Auth.UserFeatures.WebAuthnLogin;
 using Bit.Core.Auth.UserFeatures.WebAuthnLogin.Implementations;
-using Bit.Core.KeyManagement.UserFeatures.UserKey;
-using Bit.Core.KeyManagement.UserFeatures.UserKey.Implementations;
+using Bit.Core.KeyManagement.UserKey;
+using Bit.Core.KeyManagement.UserKey.Implementations;
 using Bit.Core.Services;
 using Bit.Core.Settings;
 using Microsoft.Extensions.DependencyInjection;

src/Core/KeyManagement/UserKey/IRotateUserKeyCommand.cs

@@ -3,7 +3,7 @@ using Bit.Core.KeyManagement.Models.Data;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Data.SqlClient;
 
-namespace Bit.Core.KeyManagement.UserFeatures.UserKey;
+namespace Bit.Core.KeyManagement.UserKey;
 
 /// <summary>
 /// Responsible for rotation of a user key and updating database with re-encrypted data

src/Core/KeyManagement/UserKey/Implementations/RotateUserKeyCommand.cs

@@ -7,7 +7,7 @@ using Bit.Core.Tools.Repositories;
 using Bit.Core.Vault.Repositories;
 using Microsoft.AspNetCore.Identity;
 
-namespace Bit.Core.KeyManagement.UserFeatures.UserKey.Implementations;
+namespace Bit.Core.KeyManagement.UserKey.Implementations;
 
 /// <inheritdoc />
 public class RotateUserKeyCommand : IRotateUserKeyCommand

src/Core/Repositories/IUserRepository.cs

@@ -1,5 +1,5 @@
 using Bit.Core.Entities;
-using Bit.Core.KeyManagement.UserFeatures.UserKey;
+using Bit.Core.KeyManagement.UserKey;
 using Bit.Core.Models.Data;
 
 #nullable enable

src/Core/Tools/Repositories/ISendRepository.cs

@@ -1,6 +1,6 @@
 #nullable enable
 
-using Bit.Core.KeyManagement.UserFeatures.UserKey;
+using Bit.Core.KeyManagement.UserKey;
 using Bit.Core.Repositories;
 using Bit.Core.Tools.Entities;
 

src/Core/Vault/Repositories/ICipherRepository.cs

@@ -1,5 +1,5 @@
 using Bit.Core.Entities;
-using Bit.Core.KeyManagement.UserFeatures.UserKey;
+using Bit.Core.KeyManagement.UserKey;
 using Bit.Core.Repositories;
 using Bit.Core.Vault.Entities;
 using Bit.Core.Vault.Models.Data;

src/Core/Vault/Repositories/IFolderRepository.cs

@@ -1,4 +1,4 @@
-using Bit.Core.KeyManagement.UserFeatures.UserKey;
+using Bit.Core.KeyManagement.UserKey;
 using Bit.Core.Repositories;
 using Bit.Core.Vault.Entities;
 

src/Infrastructure.Dapper/AdminConsole/Repositories/OrganizationUserRepository.cs

@@ -4,7 +4,7 @@ using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Enums;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
-using Bit.Core.KeyManagement.UserFeatures.UserKey;
+using Bit.Core.KeyManagement.UserKey;
 using Bit.Core.Models.Data;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
 using Bit.Core.Repositories;

src/Infrastructure.Dapper/Auth/Repositories/EmergencyAccessRepository.cs

@@ -1,7 +1,7 @@
 using System.Data;
 using Bit.Core.Auth.Entities;
 using Bit.Core.Auth.Models.Data;
-using Bit.Core.KeyManagement.UserFeatures.UserKey;
+using Bit.Core.KeyManagement.UserKey;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
 using Bit.Infrastructure.Dapper.Auth.Helpers;

src/Infrastructure.Dapper/Auth/Repositories/WebAuthnCredentialRepository.cs

@@ -2,7 +2,7 @@
 using Bit.Core.Auth.Entities;
 using Bit.Core.Auth.Models.Data;
 using Bit.Core.Auth.Repositories;
-using Bit.Core.KeyManagement.UserFeatures.UserKey;
+using Bit.Core.KeyManagement.UserKey;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Bit.Infrastructure.Dapper.Repositories;

src/Infrastructure.Dapper/Repositories/UserRepository.cs

@@ -2,7 +2,7 @@
 using System.Text.Json;
 using Bit.Core;
 using Bit.Core.Entities;
-using Bit.Core.KeyManagement.UserFeatures.UserKey;
+using Bit.Core.KeyManagement.UserKey;
 using Bit.Core.Models.Data;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;

src/Infrastructure.Dapper/Tools/Repositories/SendRepository.cs

@@ -1,7 +1,7 @@
 #nullable enable
 
 using System.Data;
-using Bit.Core.KeyManagement.UserFeatures.UserKey;
+using Bit.Core.KeyManagement.UserKey;
 using Bit.Core.Settings;
 using Bit.Core.Tools.Entities;
 using Bit.Core.Tools.Repositories;

src/Infrastructure.Dapper/Vault/Repositories/CipherRepository.cs

@@ -1,7 +1,7 @@
 using System.Data;
 using System.Text.Json;
 using Bit.Core.Entities;
-using Bit.Core.KeyManagement.UserFeatures.UserKey;
+using Bit.Core.KeyManagement.UserKey;
 using Bit.Core.Settings;
 using Bit.Core.Tools.Entities;
 using Bit.Core.Vault.Entities;

src/Infrastructure.Dapper/Vault/Repositories/FolderRepository.cs

@@ -1,5 +1,5 @@
 using System.Data;
-using Bit.Core.KeyManagement.UserFeatures.UserKey;
+using Bit.Core.KeyManagement.UserKey;
 using Bit.Core.Settings;
 using Bit.Core.Vault.Entities;
 using Bit.Core.Vault.Repositories;

src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs

@@ -1,7 +1,7 @@
 using AutoMapper;
 using Bit.Core.AdminConsole.Enums;
 using Bit.Core.Enums;
-using Bit.Core.KeyManagement.UserFeatures.UserKey;
+using Bit.Core.KeyManagement.UserKey;
 using Bit.Core.Models.Data;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
 using Bit.Core.Repositories;

src/Infrastructure.EntityFramework/Auth/Repositories/EmergencyAccessRepository.cs

@@ -1,7 +1,7 @@
 using AutoMapper;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models.Data;
-using Bit.Core.KeyManagement.UserFeatures.UserKey;
+using Bit.Core.KeyManagement.UserKey;
 using Bit.Core.Repositories;
 using Bit.Infrastructure.EntityFramework.Auth.Models;
 using Bit.Infrastructure.EntityFramework.Auth.Repositories.Queries;

src/Infrastructure.EntityFramework/Auth/Repositories/WebAuthnCredentialRepository.cs

@@ -1,7 +1,7 @@
 using AutoMapper;
 using Bit.Core.Auth.Models.Data;
 using Bit.Core.Auth.Repositories;
-using Bit.Core.KeyManagement.UserFeatures.UserKey;
+using Bit.Core.KeyManagement.UserKey;
 using Bit.Infrastructure.EntityFramework.Auth.Models;
 using Bit.Infrastructure.EntityFramework.Repositories;
 using Microsoft.EntityFrameworkCore;

src/Infrastructure.EntityFramework/Repositories/UserRepository.cs

@@ -1,5 +1,5 @@
 using AutoMapper;
-using Bit.Core.KeyManagement.UserFeatures.UserKey;
+using Bit.Core.KeyManagement.UserKey;
 using Bit.Core.Repositories;
 using Bit.Infrastructure.EntityFramework.Models;
 using Microsoft.EntityFrameworkCore;

src/Infrastructure.EntityFramework/Tools/Repositories/SendRepository.cs

@@ -1,7 +1,7 @@
 #nullable enable
 
 using AutoMapper;
-using Bit.Core.KeyManagement.UserFeatures.UserKey;
+using Bit.Core.KeyManagement.UserKey;
 using Bit.Core.Tools.Repositories;
 using Bit.Infrastructure.EntityFramework.Models;
 using Bit.Infrastructure.EntityFramework.Repositories;

src/Infrastructure.EntityFramework/Vault/Repositories/CipherRepository.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using AutoMapper;
-using Bit.Core.KeyManagement.UserFeatures.UserKey;
+using Bit.Core.KeyManagement.UserKey;
 using Bit.Core.Utilities;
 using Bit.Core.Vault.Enums;
 using Bit.Core.Vault.Models.Data;

src/Infrastructure.EntityFramework/Vault/Repositories/FolderRepository.cs

@@ -1,5 +1,5 @@
 using AutoMapper;
-using Bit.Core.KeyManagement.UserFeatures.UserKey;
+using Bit.Core.KeyManagement.UserKey;
 using Bit.Core.Vault.Repositories;
 using Bit.Infrastructure.EntityFramework.Repositories;
 using Bit.Infrastructure.EntityFramework.Vault.Models;

test/Api.Test/Auth/Controllers/AccountsControllerTests.cs

@@ -19,7 +19,7 @@ using Bit.Core.Billing.Services;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Exceptions;
-using Bit.Core.KeyManagement.UserFeatures.UserKey;
+using Bit.Core.KeyManagement.UserKey;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;