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

Attempt to fix tests

Browse Source
This commit is contained in:
Bernd Schoolmann 2025-06-05 17:40:24 +02:00
parent 0fc9824f88
commit a0c25e12e4
No known key found for this signature in database
3 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Api/KeyManagement/Models/Response/PrivateKeysResponseModel.cs
View File

@ -1,5 +1,4 @@
using System.Text.Json.Serialization; using Bit.Core.KeyManagement.Models.Data;
using Bit.Core.KeyManagement.Models.Data;
using Bit.Core.Models.Api; using Bit.Core.Models.Api;
namespace Bit.Api.KeyManagement.Models.Response; namespace Bit.Api.KeyManagement.Models.Response;
@ -14,11 +13,10 @@ namespace Bit.Api.KeyManagement.Models.Response;
/// </summary> /// </summary>
public class PrivateKeysResponseModel : ResponseModel public class PrivateKeysResponseModel : ResponseModel
{ {
[JsonConstructor]
[System.Diagnostics.CodeAnalysis.SetsRequiredMembersAttribute] [System.Diagnostics.CodeAnalysis.SetsRequiredMembersAttribute]
public PrivateKeysResponseModel(UserAccountKeysData accountKeys) : base("privateKeys") public PrivateKeysResponseModel(UserAccountKeysData accountKeys) : base("privateKeys")
{ {
PublicKeyEncryptionKeyPair = accountKeys.PublicKeyEncryptionKeyPairData; PublicKeyEncryptionKeyPair = new PublicKeyEncryptionKeyPairModel(accountKeys.PublicKeyEncryptionKeyPairData);
if (accountKeys == null) if (accountKeys == null)
{ {
throw new ArgumentNullException(nameof(accountKeys)); throw new ArgumentNullException(nameof(accountKeys));
@ -26,12 +24,12 @@ public class PrivateKeysResponseModel : ResponseModel
if (accountKeys.SignatureKeyPairData != null) if (accountKeys.SignatureKeyPairData != null)
{ {
SignatureKeyPair = accountKeys.SignatureKeyPairData; SignatureKeyPair = new SignatureKeyPairResponseModel(accountKeys.SignatureKeyPairData);
} }
} }
// Not all accounts have signature keys, but all accounts have public encryption keys. // Not all accounts have signature keys, but all accounts have public encryption keys.
public SignatureKeyPairData? SignatureKeyPair { get; set; } public SignatureKeyPairResponseModel? SignatureKeyPair { get; set; }
public required PublicKeyEncryptionKeyPairData PublicKeyEncryptionKeyPair { get; set; } public required PublicKeyEncryptionKeyPairModel PublicKeyEncryptionKeyPair { get; set; }
} }

14
src/Api/KeyManagement/Models/Response/PublicKeyEncryptionKeyPairResponseModel.cs Normal file
View File

@ -0,0 +1,14 @@
using Bit.Core.KeyManagement.Models.Data;
using Bit.Core.Models.Api;
namespace Bit.Api.KeyManagement.Models.Response;
[method: System.Diagnostics.CodeAnalysis.SetsRequiredMembersAttribute]
#nullable enable
public class PublicKeyEncryptionKeyPairModel(PublicKeyEncryptionKeyPairData keyPair) : ResponseModel("publicKeyEncryptionKeyPair")
{
public required string WrappedPrivateKey { get; set; } = keyPair.WrappedPrivateKey;
public required string PublicKey { get; set; } = keyPair.PublicKey;
public string? SignedPublicKey { get; set; } = keyPair.SignedPublicKey;
}

13
src/Api/KeyManagement/Models/Response/SignatureKeyPairResponseModel.cs Normal file
View File

@ -0,0 +1,13 @@
using Bit.Core.KeyManagement.Models.Data;
using Bit.Core.Models.Api;
namespace Bit.Api.KeyManagement.Models.Response;
[method: System.Diagnostics.CodeAnalysis.SetsRequiredMembersAttribute]
#nullable enable
public class SignatureKeyPairResponseModel(SignatureKeyPairData signatureKeyPair) : ResponseModel("signatureKeyPair")
{
public required string WrappedSigningKey { get; set; } = signatureKeyPair.WrappedSigningKey;
public required string VerifyingKey { get; set; } = signatureKeyPair.VerifyingKey;
}