Resolve StoredCredential.Descriptor at access(?) (#528)

* Just resolve the descriptor at runtime * Missing ; * Update StoredCredential.cs
passwordless-lib · Jul 16, 2024 · 184f70f · 184f70f
1 parent df37692
commit 184f70f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/BlazorWasmDemo/Server/Controllers/UserController.cs b/BlazorWasmDemo/Server/Controllers/UserController.cs
@@ -162,7 +162,6 @@ public async Task<string> CreateCredentialAsync([FromRoute] string username, [Fr
             {
                 AttestationFormat = result.Result.AttestationFormat,
                 Id = result.Result.Id,
-                Descriptor = new PublicKeyCredentialDescriptor(result.Result.Id),
                 PublicKey = result.Result.PublicKey,
                 UserHandle = result.Result.User.Id,
                 SignCount = result.Result.SignCount,

diff --git a/Demo/Controller.cs b/Demo/Controller.cs
@@ -112,7 +112,6 @@ public async Task<JsonResult> MakeCredential([FromBody] AuthenticatorAttestation
             DemoStorage.AddCredentialToUser(options.User, new StoredCredential
             {
                 Id = success.Result.Id,
-                Descriptor = new PublicKeyCredentialDescriptor(success.Result.Id),
                 PublicKey = success.Result.PublicKey,
                 UserHandle = success.Result.User.Id,
                 SignCount = success.Result.SignCount,

diff --git a/Demo/TestController.cs b/Demo/TestController.cs
@@ -96,7 +96,7 @@ public async Task<JsonResult> MakeCredentialResultTestAsync([FromBody] Authentic
         // 3. Store the credentials in db
         _demoStorage.AddCredentialToUser(options.User, new StoredCredential
         {
-            Descriptor = new PublicKeyCredentialDescriptor(success.Result.Id),
+            Id = success.Result.Id,
             PublicKey = success.Result.PublicKey,
             UserHandle = success.Result.User.Id,
             SignCount = success.Result.SignCount

diff --git a/Src/Fido2.Development/StoredCredential.cs b/Src/Fido2.Development/StoredCredential.cs
@@ -9,7 +9,7 @@ public class StoredCredential
     /// <summary>
     /// The Credential ID of the public key credential source.
     /// </summary>
-    public byte[] Id { get; set; }
+    public required byte[] Id { get; set; }
 
     /// <summary>
     /// The credential public key of the public key credential source.
@@ -52,7 +52,10 @@ public class StoredCredential
 
     public byte[] UserId { get; set; }
 
-    public PublicKeyCredentialDescriptor Descriptor { get; set; }
+    /// <summary>
+    /// Exposes an Descriptor Object for this credential, used as input to the library for certain operations.
+    /// </summary>
+    public PublicKeyCredentialDescriptor Descriptor => new(PublicKeyCredentialType.PublicKey, Id, Transports);
 
     public byte[] UserHandle { get; set; }