nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-20 02:48:03 -05:00
Code

Cleanup and move query to core

Browse Source
This commit is contained in:
Bernd Schoolmann 2025-06-12 15:51:47 +02:00
parent 1cf8c7865e
commit 70bafb5121
No known key found for this signature in database
7 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Api/Auth/Controllers/AccountsController.cs
View File

@ -4,7 +4,7 @@ using Bit.Api.Auth.Models.Request;
using Bit.Api.Auth.Models.Request.Accounts; using Bit.Api.Auth.Models.Request.Accounts;
using Bit.Api.Auth.Models.Request.WebAuthn; using Bit.Api.Auth.Models.Request.WebAuthn;
using Bit.Api.KeyManagement.Models.Response; using Bit.Api.KeyManagement.Models.Response;
using Bit.Api.KeyManagement.Queries; using Bit.Api.KeyManagement.Queries.Interfaces;
using Bit.Api.KeyManagement.Validators; using Bit.Api.KeyManagement.Validators;
using Bit.Api.Models.Request.Accounts; using Bit.Api.Models.Request.Accounts;
using Bit.Api.Models.Response; using Bit.Api.Models.Response;

2
src/Api/Billing/Controllers/AccountsController.cs
View File

@ -1,7 +1,7 @@
#nullable enable #nullable enable
using Bit.Api.KeyManagement.Models.Response; using Bit.Api.KeyManagement.Models.Response;
using Bit.Api.KeyManagement.Queries; using Bit.Api.KeyManagement.Queries.Interfaces;
using Bit.Api.Models.Request; using Bit.Api.Models.Request;
using Bit.Api.Models.Request.Accounts; using Bit.Api.Models.Request.Accounts;
using Bit.Api.Models.Response; using Bit.Api.Models.Response;

2
src/Api/KeyManagement/Controllers/UsersController.cs
View File

@ -1,5 +1,5 @@
using Bit.Api.KeyManagement.Models.Response; using Bit.Api.KeyManagement.Models.Response;
using Bit.Api.KeyManagement.Queries; using Bit.Api.KeyManagement.Queries.Interfaces;
using Bit.Core.Exceptions; using Bit.Core.Exceptions;
using Bit.Core.Repositories; using Bit.Core.Repositories;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;

3
src/Api/KeyManagement/Registrations.cs
View File

@ -1,4 +1,5 @@
using Bit.Api.KeyManagement.Queries; using Bit.Api.KeyManagement.Queries.Interfaces;
using Bit.Core.KeyManagement.Queries;
namespace Bit.Api.KeyManagement; namespace Bit.Api.KeyManagement;

2
src/Api/Vault/Controllers/SyncController.cs
View File

@ -1,5 +1,5 @@
using Bit.Api.KeyManagement.Models.Response; using Bit.Api.KeyManagement.Models.Response;
using Bit.Api.KeyManagement.Queries; using Bit.Api.KeyManagement.Queries.Interfaces;
using Bit.Api.Vault.Models.Response; using Bit.Api.Vault.Models.Response;
using Bit.Core; using Bit.Core;
using Bit.Core.AdminConsole.Entities; using Bit.Core.AdminConsole.Entities;

11
src/Core/KeyManagement/Queries/Interfaces/IUserAcountKeysQuery.cs Normal file
View File

@ -0,0 +1,11 @@
#nullable enable
using Bit.Core.Entities;
using Bit.Core.KeyManagement.Models.Data;
namespace Bit.Api.KeyManagement.Queries.Interfaces;
public interface IUserAccountKeysQuery
{
Task<UserAccountKeysData> Run(User user);
}

7
src/Api/KeyManagement/Queries/UserAccountKeysQuery.cs → src/Core/KeyManagement/Queries/UserAccountKeysQuery.cs
View File

@ -1,15 +1,12 @@
#nullable enable #nullable enable
using Bit.Api.KeyManagement.Queries.Interfaces;
using Bit.Core.Entities; using Bit.Core.Entities;
using Bit.Core.KeyManagement.Models.Data; using Bit.Core.KeyManagement.Models.Data;
using Bit.Core.KeyManagement.Repositories; using Bit.Core.KeyManagement.Repositories;
namespace Bit.Api.KeyManagement.Queries; namespace Bit.Core.KeyManagement.Queries;
public interface IUserAccountKeysQuery
{
Task<UserAccountKeysData> Run(User user);
}
public class UserAccountKeysQuery(IUserSignatureKeyPairRepository signatureKeyPairRepository) : IUserAccountKeysQuery public class UserAccountKeysQuery(IUserSignatureKeyPairRepository signatureKeyPairRepository) : IUserAccountKeysQuery
{ {