Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Demo/Controller.cs
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public async Task<JsonResult> MakeCredential([FromBody] AuthenticatorAttestation
}
catch (Exception e)
{
return Json(new CredentialMakeResult(status: "error", errorMessage: FormatException(e), result: null));
return Json(new MakeNewCredentialResult(status: "error", errorMessage: FormatException(e), result: null));
}
}

Expand Down
20 changes: 20 additions & 0 deletions Src/Fido2.Models/Objects/MakeNewCredentialResult.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#nullable enable

namespace Fido2NetLib.Objects;

/// <summary>
/// Result of parsing and verifying attestation. Used to transport Public Key back to RP
/// </summary>
public sealed class MakeNewCredentialResult : Fido2ResponseBase
{
public MakeNewCredentialResult(string status, string errorMessage, RegisteredPublicKeyCredential? result)
{
Status = status;
ErrorMessage = errorMessage;
Result = result;
}

public RegisteredPublicKeyCredential? Result { get; }

// todo: add debuginfo?
}
21 changes: 2 additions & 19 deletions Src/Fido2/Fido2.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public CredentialCreateOptions RequestNewCredential(
/// <param name="isCredentialIdUniqueToUser"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
public async Task<CredentialMakeResult> MakeNewCredentialAsync(
public async Task<MakeNewCredentialResult> MakeNewCredentialAsync(
AuthenticatorAttestationRawResponse attestationResponse,
CredentialCreateOptions origChallenge,
IsCredentialIdUniqueToUserAsyncDelegate isCredentialIdUniqueToUser,
Expand All @@ -72,7 +72,7 @@ public async Task<CredentialMakeResult> MakeNewCredentialAsync(
var success = await parsedResponse.VerifyAsync(origChallenge, _config, isCredentialIdUniqueToUser, _metadataService, cancellationToken);

// todo: Set Errormessage etc.
return new CredentialMakeResult(
return new MakeNewCredentialResult(
status: "ok",
errorMessage: string.Empty,
result: success
Expand Down Expand Up @@ -119,23 +119,6 @@ public async Task<VerifyAssertionResult> MakeAssertionAsync(

return result;
}

/// <summary>
/// Result of parsing and verifying attestation. Used to transport Public Key back to RP
/// </summary>
public sealed class CredentialMakeResult : Fido2ResponseBase
{
public CredentialMakeResult(string status, string errorMessage, RegisteredPublicKeyCredential? result)
{
Status = status;
ErrorMessage = errorMessage;
Result = result;
}

public RegisteredPublicKeyCredential? Result { get; }

// todo: add debuginfo?
}
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion Src/Fido2/IFido2.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Task<VerifyAssertionResult> MakeAssertionAsync(
IsUserHandleOwnerOfCredentialIdAsync isUserHandleOwnerOfCredentialIdCallback,
CancellationToken cancellationToken = default);

Task<Fido2.CredentialMakeResult> MakeNewCredentialAsync(
Task<MakeNewCredentialResult> MakeNewCredentialAsync(
AuthenticatorAttestationRawResponse attestationResponse,
CredentialCreateOptions origChallenge,
IsCredentialIdUniqueToUserAsyncDelegate isCredentialIdUniqueToUser,
Expand Down
2 changes: 1 addition & 1 deletion Test/Attestation/None.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public async Task TestNone()

_attestationObject.Add("attStmt", new CborMap());
_credentialPublicKey = Fido2Tests.MakeCredentialPublicKey((keyType, alg, crv));
Fido2.CredentialMakeResult res;
MakeNewCredentialResult res;

res = await MakeAttestationResponseAsync();

Expand Down
2 changes: 1 addition & 1 deletion Test/Attestation/Packed.cs
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ public async Task TestFull()
DateTimeOffset notAfter = notBefore.AddDays(2);
var attDN = new X500DistinguishedName("CN=Testing, OU=Authenticator Attestation, O=FIDO2-NET-LIB, C=US");

Fido2.CredentialMakeResult res = null;
MakeNewCredentialResult res = null;

switch (type)
{
Expand Down
2 changes: 1 addition & 1 deletion Test/Fido2Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public Attestation()
idFidoGenCeAaGuidExt = new X509Extension(oidIdFidoGenCeAaGuid, _asnEncodedAaguid, false);
}

public async Task<Fido2.CredentialMakeResult> MakeAttestationResponseAsync()
public async Task<MakeNewCredentialResult> MakeAttestationResponseAsync()
{
_attestationObject.Set("authData", new CborByteString(_authData.ToByteArray()));

Expand Down