Backed out changeset d45b16f97f9f (bug 1718228) for causing failures at test_webauthn_loopback.html. CLOSED TREE

dom/webauthn/WebAuthnManager.cpp

@@ -76,6 +76,8 @@ static nsresult AssembleClientData(
   clientDataObject.mType.Assign(aType);
   clientDataObject.mChallenge.Assign(challengeBase64);
   clientDataObject.mOrigin.Assign(aOrigin);
+  clientDataObject.mHashAlgorithm.AssignLiteral(u"SHA-256");
+  clientDataObject.mClientExtensions = aExtensions;
 
   nsAutoString temp;
   if (NS_WARN_IF(!clientDataObject.ToJSON(temp))) {

dom/webauthn/tests/test_webauthn_loopback.html

@@ -66,10 +66,12 @@ function() {
     let clientData = JSON.parse(buffer2string(aCredInfo.response.clientDataJSON));
     is(clientData.challenge, bytesToBase64UrlSafe(gCredentialChallenge), "Challenge is correct");
     is(clientData.origin, window.location.origin, "Origin is correct");
+    is(clientData.hashAlgorithm, "SHA-256", "Hash algorithm is correct");
     is(clientData.type, "webauthn.create", "Type is correct");
 
     let extensions = aCredInfo.getClientExtensionResults();
     is(extensions.appid, undefined, "appid extension wasn't used");
+    is(clientData.clientExtensions.appid, undefined, "appid extension wasn't sent");
 
     return webAuthnDecodeCBORAttestation(aCredInfo.response.attestationObject)
     .then(function(aAttestationObj) {

dom/webidl/WebAuthentication.webidl

@@ -140,16 +140,13 @@ dictionary CollectedClientData {
     required DOMString           type;
     required DOMString           challenge;
     required DOMString           origin;
-    TokenBinding                 tokenBinding;
+    required DOMString           hashAlgorithm;
+    DOMString                    tokenBindingId;
+    // FIXME: bug 1493860: should this "= {}" be here?
+    AuthenticationExtensionsClientInputs clientExtensions = {};
+    AuthenticationExtensionsAuthenticatorInputs authenticatorExtensions;
 };
 
-dictionary TokenBinding {
-    required DOMString status;
-    DOMString id;
-};
-
-enum TokenBindingStatus { "present", "supported" };
-
 enum PublicKeyCredentialType {
     "public-key"
 };