Review feedback

Firstyear · Dec 29, 2023 · 1f122c8 · 1f122c8
1 parent 5e11578
commit 1f122c8
Show file tree

Hide file tree

Showing 8 changed files with 275 additions and 226 deletions.
diff --git a/compat_tester/webauthn-rs-demo/src/actors.rs b/compat_tester/webauthn-rs-demo/src/actors.rs
@@ -326,19 +326,18 @@ impl WebauthnActor {
 
         let user_unique_id = Uuid::new_v4();
 
-        let (ccr, rs) = self.wan.generate_challenge_register(
-            user_unique_id.as_bytes(),
-            &username,
-            &username,
-            attestation.unwrap_or(AttestationConveyancePreference::None),
-            uv,
-            None,
-            extensions,
-            algorithm.unwrap_or_else(|| vec![COSEAlgorithm::ES256, COSEAlgorithm::RS256]),
-            false,
-            attachment,
-            false,
-        )?;
+        let builder = self
+            .wan
+            .new_challenge_register_builder(user_unique_id.as_bytes(), &username, &username)?
+            .attestation(attestation.unwrap_or(AttestationConveyancePreference::None))
+            .user_verification_policy(uv.unwrap_or_default())
+            .extensions(extensions)
+            .authenticator_attachment(attachment)
+            .credential_algorithms(
+                algorithm.unwrap_or_else(|| vec![COSEAlgorithm::ES256, COSEAlgorithm::RS256]),
+            );
+
+        let (ccr, rs) = self.wan.generate_challenge_register(builder)?;
 
         debug!("complete ChallengeRegister -> {:?}", ccr);
         Ok((ccr, rs))

diff --git a/webauthn-authenticator-rs/examples/authenticate.rs b/webauthn-authenticator-rs/examples/authenticate.rs
@@ -247,21 +247,13 @@ async fn main() {
     ];
     let name = "william";
 
-    let (chal, reg_state) = wan
-        .generate_challenge_register(
-            &unique_id,
-            name,
-            name,
-            AttestationConveyancePreference::None,
-            Some(opt.verification_policy.into()),
-            None,
-            None,
-            COSEAlgorithm::secure_algs(),
-            false,
-            None,
-            false,
-        )
-        .unwrap();
+    let builder = wan
+        .new_challenge_register_builder(&unique_id, name, name)
+        .unwrap()
+        .attestation(AttestationConveyancePreference::None)
+        .user_verification_policy(opt.verification_policy.into());
+
+    let (chal, reg_state) = wan.generate_challenge_register(builder).unwrap();
 
     info!("🍿 challenge -> {:x?}", chal);
 

diff --git a/webauthn-authenticator-rs/src/softpasskey.rs b/webauthn-authenticator-rs/src/softpasskey.rs
@@ -548,21 +548,13 @@ mod tests {
         ];
         let name = "william";
 
-        let (chal, reg_state) = wan
-            .generate_challenge_register(
-                &unique_id,
-                name,
-                name,
-                AttestationConveyancePreference::Direct,
-                Some(UserVerificationPolicy::Preferred),
-                None,
-                None,
-                COSEAlgorithm::secure_algs(),
-                false,
-                None,
-                false,
-            )
-            .unwrap();
+        let builder = wan
+            .new_challenge_register_builder(&unique_id, name, name)
+            .unwrap()
+            .attestation(AttestationConveyancePreference::Direct)
+            .user_verification_policy(UserVerificationPolicy::Preferred);
+
+        let (chal, reg_state) = wan.generate_challenge_register(builder).unwrap();
 
         info!("🍿 challenge -> {:x?}", chal);
 

diff --git a/webauthn-authenticator-rs/src/softtoken.rs b/webauthn-authenticator-rs/src/softtoken.rs
@@ -899,21 +899,13 @@ mod tests {
         ];
         let name = "william";
 
-        let (chal, reg_state) = wan
-            .generate_challenge_register(
-                &unique_id,
-                name,
-                name,
-                AttestationConveyancePreference::Direct,
-                Some(UserVerificationPolicy::Preferred),
-                None,
-                None,
-                COSEAlgorithm::secure_algs(),
-                false,
-                None,
-                false,
-            )
-            .unwrap();
+        let builder = wan
+            .new_challenge_register_builder(&unique_id, name, name)
+            .unwrap()
+            .attestation(AttestationConveyancePreference::Direct)
+            .user_verification_policy(UserVerificationPolicy::Preferred);
+
+        let (chal, reg_state) = wan.generate_challenge_register(builder).unwrap();
 
         info!("🍿 challenge -> {:x?}", chal);
 
@@ -979,21 +971,13 @@ mod tests {
         ];
         let name = "william";
 
-        let (chal, reg_state) = wan
-            .generate_challenge_register(
-                &unique_id,
-                name,
-                name,
-                AttestationConveyancePreference::Direct,
-                Some(UserVerificationPolicy::Preferred),
-                None,
-                None,
-                COSEAlgorithm::secure_algs(),
-                false,
-                None,
-                false,
-            )
-            .unwrap();
+        let builder = wan
+            .new_challenge_register_builder(&unique_id, name, name)
+            .unwrap()
+            .attestation(AttestationConveyancePreference::Direct)
+            .user_verification_policy(UserVerificationPolicy::Preferred);
+
+        let (chal, reg_state) = wan.generate_challenge_register(builder).unwrap();
 
         info!("🍿 challenge -> {:x?}", chal);