Merge pull request #4 from Wesseldr/authenticatorSelection-bugfix-wes…

…seldr Authenticator selection bugfix wesseldr
FIDO-Tools · Apr 14, 2020 · 26d87f2 · 26d87f2
2 parents fc49348 + 614e9b6
commit 26d87f2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/lib/main.js b/lib/main.js
@@ -207,10 +207,10 @@ class Fido2Lib {
         if (this.config.authenticatorAttachment !== undefined ||
             this.config.authenticatorRequireResidentKey !== undefined ||
             this.config.authenticatorUserVerification !== undefined) {
-            options.authenticatorSelectionCriteria = {};
-            setOpt(options.authenticatorSelectionCriteria, "attachment", this.config.authenticatorAttachment);
-            setOpt(options.authenticatorSelectionCriteria, "requireResidentKey", this.config.authenticatorRequireResidentKey);
-            setOpt(options.authenticatorSelectionCriteria, "userVerification", this.config.authenticatorUserVerification);
+            options.authenticatorSelection = {};
+            setOpt(options.authenticatorSelection, "authenticatorAttachment", this.config.authenticatorAttachment);
+            setOpt(options.authenticatorSelection, "requireResidentKey", this.config.authenticatorRequireResidentKey);
+            setOpt(options.authenticatorSelection, "userVerification", this.config.authenticatorUserVerification);
         }
         setOpt(options, "rawChallenge", rawChallenge);
 

diff --git a/test/mainTest.js b/test/mainTest.js
@@ -428,13 +428,13 @@ describe("Fido2Lib", function() {
                 ]);
                 assert.isNumber(opts.timeout);
                 assert.strictEqual(opts.timeout, 42);
-                assert.isObject(opts.authenticatorSelectionCriteria);
-                assert.isString(opts.authenticatorSelectionCriteria.attachment);
-                assert.strictEqual(opts.authenticatorSelectionCriteria.attachment, "platform");
-                assert.isBoolean(opts.authenticatorSelectionCriteria.requireResidentKey);
-                assert.strictEqual(opts.authenticatorSelectionCriteria.requireResidentKey, false);
-                assert.isString(opts.authenticatorSelectionCriteria.userVerification);
-                assert.strictEqual(opts.authenticatorSelectionCriteria.userVerification, "required");
+                assert.isObject(opts.authenticatorSelection);
+                assert.isString(opts.authenticatorSelection.authenticatorAttachment);
+                assert.strictEqual(opts.authenticatorSelection.authenticatorAttachment, "platform");
+                assert.isBoolean(opts.authenticatorSelection.requireResidentKey);
+                assert.strictEqual(opts.authenticatorSelection.requireResidentKey, false);
+                assert.isString(opts.authenticatorSelection.userVerification);
+                assert.strictEqual(opts.authenticatorSelection.userVerification, "required");
                 assert.isString(opts.attestation);
                 assert.strictEqual(opts.attestation, "none");
             });