Remove base-class

passwordless-lib · Jul 15, 2024 · 8ac3524 · 8ac3524
1 parent df37692
commit 8ac3524
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 68 deletions.
diff --git a/BlazorWasmDemo/Client/Shared/UserService.cs b/BlazorWasmDemo/Client/Shared/UserService.cs
@@ -134,11 +134,6 @@ public async Task<string> LoginAsync(string? username)
                 return "No options received";
             }
 
-            if (options.Status != "ok")
-            {
-                return options.ErrorMessage ?? string.Empty;
-            }
-
             // Present options to user and get response (usernameless users will be asked by their authenticator, which credential they want to use to sign the challenge)
             var assertion = await _webAuthn.VerifyAsync(options);
 

diff --git a/BlazorWasmDemo/Server/Controllers/UserController.cs b/BlazorWasmDemo/Server/Controllers/UserController.cs
@@ -126,9 +126,9 @@ public CredentialCreateOptions GetCredentialOptions(
             // 6. return options to client
             return options;
         }
-        catch (Exception e)
+        catch (Exception)
         {
-            return new CredentialCreateOptions { Status = "error", ErrorMessage = FormatException(e) };
+            throw;
         }
     }
 
@@ -152,11 +152,6 @@ public async Task<string> CreateCredentialAsync([FromRoute] string username, [Fr
             // 3. Verify and make the credentials
             var result = await _fido2.MakeNewCredentialAsync(attestationResponse, options, CredentialIdUniqueToUserAsync, cancellationToken: cancellationToken);
 
-            if (result.Status is "error" || result.Result is null)
-            {
-                return result.ErrorMessage ?? string.Empty;
-            }
-
             // 4. Store the credentials in db
             _demoStorage.AddCredentialToUser(options.User, new StoredCredential
             {
@@ -229,9 +224,9 @@ public AssertionOptions MakeAssertionOptions([FromRoute] string? username, [From
             // 5. return options to client
             return options;
         }
-        catch (Exception e)
+        catch (Exception)
         {
-            return new AssertionOptions { Status = "error", ErrorMessage = FormatException(e) };
+            throw;
         }
     }
 
@@ -281,18 +276,12 @@ public async Task<string> MakeAssertionAsync([FromBody] AuthenticatorAssertionRa
                 cancellationToken: cancellationToken);
 
             // 4. Store the updated counter
-            if (res.Status is "ok")
-            {
-                _demoStorage.UpdateCounter(res.CredentialId, res.SignCount);
-                if (res.DevicePublicKey is not null)
-                {
-                    creds.DevicePublicKeys.Add(res.DevicePublicKey);
-                }
-            }
-            else
+            _demoStorage.UpdateCounter(res.CredentialId, res.SignCount);
+            if (res.DevicePublicKey is not null)
             {
-                return $"Error: {res.ErrorMessage}";
+                creds.DevicePublicKeys.Add(res.DevicePublicKey);
             }
+
 
             // 5. return result to client
             var handler = new JwtSecurityTokenHandler();

diff --git a/Demo/Controller.cs b/Demo/Controller.cs
@@ -81,7 +81,7 @@ public JsonResult MakeCredentialOptions([FromForm] string username,
         }
         catch (Exception e)
         {
-            return Json(new CredentialCreateOptions { Status = "error", ErrorMessage = FormatException(e) });
+            return Json(new  { Status = "error", ErrorMessage = FormatException(e) });
         }
     }
 
@@ -132,7 +132,7 @@ public async Task<JsonResult> MakeCredential([FromBody] AuthenticatorAttestation
         }
         catch (Exception e)
         {
-            return Json(new MakeNewCredentialResult(status: "error", errorMessage: FormatException(e), result: null));
+            return Json(new { status = "error", errorMessage = FormatException(e)});
         }
     }
 
@@ -177,7 +177,7 @@ public ActionResult AssertionOptionsPost([FromForm] string username, [FromForm]
 
         catch (Exception e)
         {
-            return Json(new AssertionOptions { Status = "error", ErrorMessage = FormatException(e) });
+            return Json(new  { Status = "error", ErrorMessage = FormatException(e) });
         }
     }
 
@@ -218,7 +218,7 @@ public async Task<JsonResult> MakeAssertion([FromBody] AuthenticatorAssertionRaw
         }
         catch (Exception e)
         {
-            return Json(new VerifyAssertionResult { Status = "error", ErrorMessage = FormatException(e) });
+            return Json(new { Status = "error", ErrorMessage = FormatException(e) });
         }
     }
 }
diff --git a/Src/Fido2.Models/AssertionOptions.cs b/Src/Fido2.Models/AssertionOptions.cs
@@ -9,7 +9,7 @@ namespace Fido2NetLib;
 /// <summary>
 /// Sent to the browser when we want to Assert credentials and authenticate a user
 /// </summary>
-public class AssertionOptions : Fido2ResponseBase
+public class AssertionOptions
 {
     /// <summary>
     /// This member represents a challenge that the selected authenticator signs, along with other data, when producing an authentication assertion.
@@ -71,8 +71,6 @@ public static AssertionOptions Create(
     {
         return new AssertionOptions()
         {
-            Status = "ok",
-            ErrorMessage = string.Empty,
             Challenge = challenge,
             Timeout = config.Timeout,
             RpId = config.ServerDomain,

diff --git a/Src/Fido2.Models/CredentialCreateOptions.cs b/Src/Fido2.Models/CredentialCreateOptions.cs
@@ -6,7 +6,7 @@
 
 namespace Fido2NetLib;
 
-public sealed class CredentialCreateOptions : Fido2ResponseBase
+public sealed class CredentialCreateOptions
 {
     /// <summary>
     /// 
@@ -117,8 +117,6 @@ public static CredentialCreateOptions Create(
     {
         return new CredentialCreateOptions
         {
-            Status = "ok",
-            ErrorMessage = string.Empty,
             Challenge = challenge,
             Rp = new PublicKeyCredentialRpEntity(config.ServerDomain, config.ServerName, config.ServerIcon),
             Timeout = config.Timeout,

diff --git a/Src/Fido2.Models/Fido2ResponseBase.cs b/Src/Fido2.Models/Fido2ResponseBase.cs
diff --git a/Src/Fido2.Models/Objects/MakeNewCredentialResult.cs b/Src/Fido2.Models/Objects/MakeNewCredentialResult.cs
@@ -5,16 +5,9 @@ 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 sealed class MakeNewCredentialResult(RegisteredPublicKeyCredential result)
 {
-    public MakeNewCredentialResult(string status, string errorMessage, RegisteredPublicKeyCredential? result)
-    {
-        Status = status;
-        ErrorMessage = errorMessage;
-        Result = result;
-    }
-
-    public RegisteredPublicKeyCredential? Result { get; }
+    public RegisteredPublicKeyCredential Result { get; } = result;
 
     // todo: add debuginfo?
 }
diff --git a/Src/Fido2.Models/Objects/RegisteredPublicKeyCredential.cs b/Src/Fido2.Models/Objects/RegisteredPublicKeyCredential.cs
@@ -5,7 +5,7 @@ namespace Fido2NetLib.Objects;
 /// <summary>
 /// Holds parsed credential data
 /// </summary>
-public class RegisteredPublicKeyCredential : Fido2ResponseBase
+public class RegisteredPublicKeyCredential
 {
     /// <summary>
     /// The type of the public key credential source.

diff --git a/Src/Fido2.Models/Objects/VerifyAssertionResult.cs b/Src/Fido2.Models/Objects/VerifyAssertionResult.cs
@@ -3,7 +3,7 @@
 /// <summary>
 /// Result of the MakeAssertion verification
 /// </summary>
-public class VerifyAssertionResult : Fido2ResponseBase
+public class VerifyAssertionResult
 {
     public byte[] CredentialId { get; init; }
 

diff --git a/Src/Fido2/AuthenticatorAssertionResponse.cs b/Src/Fido2/AuthenticatorAssertionResponse.cs
@@ -176,7 +176,6 @@ public async Task<VerifyAssertionResult> VerifyAsync(
 
         return new VerifyAssertionResult
         {
-            Status = "ok",
             CredentialId = Raw.Id,
             SignCount = authData.SignCount,
             IsBackedUp = authData.IsBackedUp,

diff --git a/Src/Fido2/Fido2.cs b/Src/Fido2/Fido2.cs
@@ -78,8 +78,6 @@ public async Task<MakeNewCredentialResult> MakeNewCredentialAsync(
 
         // todo: Set Errormessage etc.
         return new MakeNewCredentialResult(
-            status: "ok",
-            errorMessage: string.Empty,
             result: success
         );
     }

diff --git a/Test/Attestation/AndroidKey.cs b/Test/Attestation/AndroidKey.cs
@@ -64,15 +64,11 @@ public AndroidKey()
     public async Task TestAndroidKey()
     {
         var res = await MakeAttestationResponseAsync();
-        Assert.Equal(string.Empty, res.ErrorMessage);
-        Assert.Equal("ok", res.Status);
         Assert.Equal(_aaguid, res.Result.AaGuid);
         Assert.Equal(_signCount, res.Result.SignCount);
         Assert.Equal("android-key", res.Result.AttestationFormat);
         Assert.Equal(_credentialID, res.Result.Id);
-        Assert.Null(res.Result.ErrorMessage);
         Assert.Equal(_credentialPublicKey.GetBytes(), res.Result.PublicKey);
-        Assert.Null(res.Result.Status);
         Assert.Equal("Test User", res.Result.User.DisplayName);
         Assert.Equal("testuser"u8.ToArray(), res.Result.User.Id);
         Assert.Equal("testuser", res.Result.User.Name);

diff --git a/Test/AuthenticatorResponse.cs b/Test/AuthenticatorResponse.cs
@@ -97,13 +97,11 @@ public async Task TestAuthenticatorOriginsAsync(string origin, string expectedOr
                 UserVerification = UserVerificationRequirement.Discouraged,
             },
             Challenge = challenge,
-            ErrorMessage = "",
             PubKeyCredParams =
             [
                 PubKeyCredParam.ES256
             ],
             Rp = new PublicKeyCredentialRpEntity(rp, rp, ""),
-            Status = "ok",
             User = new Fido2User
             {
                 Name = "testuser",