Deprecate CredentialRequestOptions.unmediated in favor mediation enum

third_party/WebKit/Source/modules/credentialmanager/CredentialsContainer.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/credentialmanager/CredentialsContainer.h"
 
 #include <memory>
 #include <utility>
 #include "bindings/core/v8/Dictionary.h"
 #include "bindings/core/v8/ScriptPromise.h"
@@ skipping 10 matching lines @@
 #include "modules/credentialmanager/CredentialRequestOptions.h"
 #include "modules/credentialmanager/FederatedCredential.h"
 #include "modules/credentialmanager/FederatedCredentialRequestOptions.h"
 #include "modules/credentialmanager/PasswordCredential.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "platform/wtf/PtrUtil.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebCredential.h"
 #include "public/platform/WebCredentialManagerClient.h"
 #include "public/platform/WebCredentialManagerError.h"
+#include "public/platform/WebCredentialMediationRequirement.h"
 #include "public/platform/WebFederatedCredential.h"
 #include "public/platform/WebPasswordCredential.h"
 
 namespace blink {
 
 static void RejectDueToCredentialManagerError(
     ScriptPromiseResolver* resolver,
     WebCredentialManagerError reason) {
   switch (reason) {
     case kWebCredentialManagerDisabledError:
@@ skipping 129 matching lines @@
 
   Vector<KURL> providers;
   if (options.hasFederated() && options.federated().hasProviders()) {
     for (const auto& string : options.federated().providers()) {
       KURL url = KURL(KURL(), string);
       if (url.IsValid())
         providers.push_back(std::move(url));
     }
   }
 
-  UseCounter::Count(ExecutionContext::From(script_state),
-                    options.unmediated()
-                        ? UseCounter::kCredentialManagerGetWithoutUI
-                        : UseCounter::kCredentialManagerGetWithUI);
+  // Set the default mediation option if none is provided.
+  if (!options.hasUnmediated() && !options.hasMediation()) {
+    options.mediation() = "optional";
+  } else if (options.hasUnmediated() && !options.hasMediation()) {
+    options.mediation() = options.unmediated() ? "silent" : "optional";
+  } else if (options.hasUnmediated() && options.hasMediation()) {
+    // Show a warning that unmediated will be ignored?

[vasilii, 2017/05/18 12:34:03]

Should be an exception I think.

[jdoerrie, 2017/05/18 14:57:25]

Done.

+  }
+
+  UseCounter::Feature feature;
+  WebCredentialMediationRequirement mediation;
+
+  if (options.mediation() == "silent") {
+    feature = UseCounter::kCredentialManagerGetMediationSilent;
+    mediation = kWebCredentialManagerMediationRequirementSilent;
+  } else if (options.mediation() == "optional") {
+    feature = UseCounter::kCredentialManagerGetMediationOptional;
+    mediation = kWebCredentialManagerMediationRequirementOptional;
+  } else {

[vasilii, 2017/05/18 12:34:03]

What about an exception in case of random trash string?

[jdoerrie, 2017/05/18 14:57:25]

The generated code already includes a call to IsValidEnum:
https://codesearch.chromium.org/chromium/src/third_party/WebKit/Source/bindin...

This is sufficient for user facing exceptions:
$ navigator.credentials.get({mediation: "foobar"})

Uncaught (in promise) TypeError: Failed to execute 'get' on
'CredentialsContainer': The provided value 'foobar' is not a valid enum value of
type CredentialMediationRequirement.

I added a DCHECK to guard against programmer errors, however.

+    feature = UseCounter::kCredentialManagerGetMediationRequired;
+    mediation = kWebCredentialManagerMediationRequirementRequired;
+  }
+
+  UseCounter::Count(ExecutionContext::From(script_state), feature);
 
   CredentialManagerClient::From(ExecutionContext::From(script_state))
-      ->DispatchGet(options.unmediated(), options.password(), providers,
+      ->DispatchGet(mediation, options.password(), providers,
                     new RequestCallbacks(resolver));
   return promise;
 }
 
 ScriptPromise CredentialsContainer::store(ScriptState* script_state,
                                           Credential* credential) {
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::Create(script_state);
   ScriptPromise promise = resolver->Promise();
   if (!CheckBoilerplate(resolver))
     return promise;
@@ skipping 11 matching lines @@
   ScriptPromise promise = resolver->Promise();
   if (!CheckBoilerplate(resolver))
     return promise;
 
   CredentialManagerClient::From(ExecutionContext::From(script_state))
       ->DispatchRequireUserMediation(new NotificationCallbacks(resolver));
   return promise;
 }
 
 }  // namespace blink