WebOTP: Update API shape to spec

This change updates the WebOTP API shape to the latest spec.
It adds the following changes.

1. Adds `code` field for the one-time-code
2. Updates `id` to be undefined for OTPCredentials
3. Updates OtpCredentials to be OTPCredentials

WebOTP Explainer: https://github.com/samuelgoto/WebOTP/blob/master/explainer.md

Bug: 1053594
Change-Id: I747446b2fffc8f00afef105db3a5bcb35b124890
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2068300Reviewed-by: Vasilii Sukhanov <vasilii@chromium.org>
Reviewed-by: Victor Costan <pwnall@chromium.org>
Commit-Queue: Ayu Ishii <ayui@chromium.org>
Cr-Commit-Position: refs/heads/master@{#745092}

content/browser/sms/sms_browsertest.cc

@@ -149,7 +149,7 @@ IN_PROC_BROWSER_TEST_F(SmsBrowserTest, Receive) {
   std::string script = R"(
     (async () => {
       let cred = await navigator.credentials.get({otp: {transport: ["sms"]}});
-      return cred.id;
+      return cred.code;
     }) ();
   )";
 
@@ -194,8 +194,8 @@ IN_PROC_BROWSER_TEST_F(SmsBrowserTest, AtMostOneSmsRequestPerOrigin) {
           return name;
         });
       let secondRequest = navigator.credentials.get({otp: {transport: ["sms"]}})
-        .then(({id}) => {
-          return id;
+        .then(({code}) => {
+          return code;
         });
       return Promise.all([firstRequest, secondRequest]);
     }) ();
@@ -255,8 +255,8 @@ IN_PROC_BROWSER_TEST_F(SmsBrowserTest,
   // Make 1 request on tab2 to verify requests on tab1 have no affect on tab2.
   EXPECT_TRUE(ExecJs(tab2, R"(
         var request = navigator.credentials.get({otp: {transport: ["sms"]}})
-          .then(({id}) => {
-            return id;
+          .then(({code}) => {
+            return code;
           });
      )"));
 
@@ -265,8 +265,8 @@ IN_PROC_BROWSER_TEST_F(SmsBrowserTest,
   EXPECT_TRUE(ExecJs(tab1, R"(
         var secondRequest = navigator.credentials
           .get({otp: {transport: ["sms"]}})
-          .then(({id}) => {
-            return id;
+          .then(({code}) => {
+            return code;
           });
      )"));
 
@@ -417,8 +417,8 @@ IN_PROC_BROWSER_TEST_F(SmsBrowserTest, DISABLED_TwoTabsSameOrigin) {
 
   std::string script = R"(
     var otp = navigator.credentials.get({otp: {transport: ["sms"]}})
-      .then(({id}) => {
-        return id;
+      .then(({code}) => {
+        return code;
       });
   )";
 
@@ -498,8 +498,8 @@ IN_PROC_BROWSER_TEST_F(SmsBrowserTest, DISABLED_TwoTabsDifferentOrigin) {
 
   std::string script = R"(
     var otp = navigator.credentials.get({otp: {transport: ["sms"]}})
-      .then(({id}) => {
-        return id;
+      .then(({code}) => {
+        return code;
       });
   )";
 

third_party/blink/renderer/modules/credentialmanager/credential.cc

@@ -8,11 +8,15 @@
 
 namespace blink {
 
+namespace {
+constexpr char kOtpCredentialType[] = "otp";
+}
+
 Credential::~Credential() = default;
 
 Credential::Credential(const String& id, const String& type)
     : id_(id), type_(type) {
-  DCHECK(!id_.IsEmpty());
+  DCHECK(!id_.IsEmpty() || type == kOtpCredentialType);
   DCHECK(!type_.IsEmpty());
 }
 

third_party/blink/renderer/modules/credentialmanager/credential.h

@@ -25,7 +25,7 @@ class MODULES_EXPORT Credential : public ScriptWrappable {
   virtual bool IsPasswordCredential() const { return false; }
   virtual bool IsFederatedCredential() const { return false; }
   virtual bool IsPublicKeyCredential() const { return false; }
-  virtual bool IsOtpCredential() const { return false; }
+  virtual bool IsOTPCredential() const { return false; }
 
   // Credential.idl
   const String& id() const { return id_; }

third_party/blink/renderer/modules/credentialmanager/credential_request_options.idl

@@ -16,7 +16,7 @@ dictionary CredentialRequestOptions {
     boolean password = false;
     CredentialMediationRequirement mediation = "optional";
 
-    [RuntimeEnabled=SmsReceiver] OtpCredentialRequestOptions otp;
+    [RuntimeEnabled=SmsReceiver] OTPCredentialRequestOptions otp;
 
     PublicKeyCredentialRequestOptions publicKey;
     AbortSignal signal;

third_party/blink/renderer/modules/credentialmanager/credentials_container.cc

@@ -507,7 +507,7 @@ void OnSmsReceive(ScriptPromiseResolver* resolver,
   }
   RecordSmsSuccessTime(base::TimeTicks::Now() - start_time);
   RecordSmsOutcome(SMSReceiverOutcome::kSuccess, source_id, recorder);
-  resolver->Resolve(MakeGarbageCollected<OtpCredential>(otp));
+  resolver->Resolve(MakeGarbageCollected<OTPCredential>(otp));
 }
 
 }  // namespace

third_party/blink/renderer/modules/credentialmanager/otp_credential.cc

@@ -13,10 +13,10 @@ namespace {
 constexpr char kOtpCredentialType[] = "otp";
 }
 
-OtpCredential::OtpCredential(const String& id)
-    : Credential(id, kOtpCredentialType) {}
+OTPCredential::OTPCredential(const String& code)
+    : Credential(String(), kOtpCredentialType), code_(code) {}
 
-bool OtpCredential::IsOtpCredential() const {
+bool OTPCredential::IsOTPCredential() const {
   return true;
 }
 

third_party/blink/renderer/modules/credentialmanager/otp_credential.h

@@ -14,14 +14,20 @@ namespace blink {
 // OtpCredentials represents credentials for when the otp is requested
 // through the credential manager. It stores the one-time-passcode (otp) that
 // is retrieved from SMS by the browser.
-class MODULES_EXPORT OtpCredential final : public Credential {
+class MODULES_EXPORT OTPCredential final : public Credential {
   DEFINE_WRAPPERTYPEINFO();
 
  public:
-  explicit OtpCredential(const String& id);
+  explicit OTPCredential(const String& code);
 
   // Credential:
-  bool IsOtpCredential() const override;
+  bool IsOTPCredential() const override;
+
+  // OTPCredential.idl
+  const String& code() const { return code_; }
+
+ private:
+  String code_;
 };
 
 }  // namespace blink

third_party/blink/renderer/modules/credentialmanager/otp_credential.idl

@@ -7,5 +7,6 @@
     RuntimeEnabled=SmsReceiver,
     Exposed=Window,
     SecureContext
-] interface OtpCredential : Credential {
+] interface OTPCredential : Credential {
+    readonly attribute DOMString code;
 };

third_party/blink/renderer/modules/credentialmanager/otp_credential_request_options.idl

@@ -4,10 +4,10 @@
 
 // https://github.com/samuelgoto/WebOTP
 
-enum OtpCredentialTransportType {
+enum OTPCredentialTransportType {
   "sms"
 };
 
-dictionary OtpCredentialRequestOptions {
-    sequence<OtpCredentialTransportType> transport = [];
+dictionary OTPCredentialRequestOptions {
+    sequence<OTPCredentialTransportType> transport = [];
 };

third_party/blink/web_tests/http/tests/credentialmanager/credentialscontainer-get-basics.html

@@ -136,7 +136,8 @@ promise_test(_ => {
   mockSmsReceiver.setStatus(blink.mojom.SmsStatus.kSuccess);
   return navigator.credentials.get({otp: {transport: ["sms"]}}).then(r => {
     assert_equals(r.type, "otp", "type");
-    assert_equals(r.id, otp, "id");
+    assert_equals(r.id, "", "id");
+    assert_equals(r.code, otp, "code");
   });
 }, "Verify that mockSmsReceiver returns the values we give it.");
 

third_party/blink/web_tests/webexposed/global-interface-listing-expected.txt

@@ -5581,6 +5581,10 @@ interface Notification : EventTarget
     setter onclose
     setter onerror
     setter onshow
+interface OTPCredential : Credential
+    attribute @@toStringTag
+    getter code
+    method constructor
 interface OfflineAudioCompletionEvent : Event
     attribute @@toStringTag
     getter renderedBuffer
@@ -5718,9 +5722,6 @@ interface OscillatorNode : AudioScheduledSourceNode
     method constructor
     method setPeriodicWave
     setter type
-interface OtpCredential : Credential
-    attribute @@toStringTag
-    method constructor
 interface OverconstrainedError
     attribute @@toStringTag
     getter constraint