CREDENTIAL: Cleanup 'request credential'.

Closes #289.

Author: mikewest

specs/credentialmanagement/index.html

@@ -1751,13 +1751,42 @@ <h4 class="heading settled" data-level="4.1.1" id="request-credential"><span cla
 
 
      <li>
-      Let <var>type</var> be lowest common ancestor interface of the types
-      referenced in <var>types</var>.
+      Let <var>types</var> be an empty set.
+    
+     
+    
+     <li>
+      For each <var>key</var> in <var>options</var>:
+
+      
+      <ol>
+        
+       <li>
+          Let <var>interface</var> be the interface whose name is
+          <var>key</var>, or <code>null</code> if no interface’s name
+          matches.
+        
+       
+        
+       <li>
+          If <var>interface</var> is not <code>null</code>, insert
+          <var>interface</var> into <var>possible types</var>.
+        
+       
+      
+      </ol>
+      
+    
+     
+    
+     <li>
+      Let <var>type</var> be the lowest common ancestor interface of the
+      interfaces contained in <var>types</var>.
 
 
-      <p class="issue" id="issue-6005a2a4"><a class="self-link" href="#issue-6005a2a4"></a> This is terribly hand-wavey. The intent is
-      clear, but I need to do the work to walk through the list of DOMStrings
-      and convert them to interfaces and etc. Busywork for later. <a href="https://github.com/w3c/webappsec/issues/289">&lt;https://github.com/w3c/webappsec/issues/289></a></p>
+      <p class="note" role="note">Note: That is, given a set containing <code class="idl"><a data-link-type="idl" href="#passwordcredential">PasswordCredential</a></code> and
+      <code class="idl"><a data-link-type="idl" href="#federatedcredential">FederatedCredential</a></code>, <var>type</var> will be
+      <code class="idl"><a data-link-type="idl" href="#originboundcredential">OriginBoundCredential</a></code>.</p>
 
 
 
@@ -1784,9 +1813,15 @@ <h4 class="heading settled" data-level="4.1.1" id="request-credential"><span cla
 
       <dl>
 
+       <dt><code class="idl"><a data-link-type="idl" href="#federatedcredential">FederatedCredential</a></code>
+       
+        
        <dt><code class="idl"><a data-link-type="idl" href="#originboundcredential">OriginBoundCredential</a></code>
 
 
+       <dt><code class="idl"><a data-link-type="idl" href="#passwordcredential">PasswordCredential</a></code>
+       
+        
        <dd>
 
         <ol>
@@ -2103,7 +2138,7 @@ <h4 class="heading settled" data-level="4.2.2" id="request-originboundcredential
   </span><a class="self-link" href="#request-originboundcredential-without-mediation"></a></h4>
 
 
-    <p>This algorithm accepts an <a data-link-type="dfn" href="https://tools.ietf.org/html/rfc6454#section-3.2">origin</a> (<var>origin</var>), a sequence of
+    <p>This algorithm accepts an <a data-link-type="dfn" href="https://tools.ietf.org/html/rfc6454#section-3.2">origin</a> (<var>origin</var>), a set of
   type names (<var>types</var>) and an <code class="idl"><a data-link-type="idl" href="#dictdef-credentialrequestoptions">CredentialRequestOptions</a></code> dictionary
   (<var>options</var>), and returns either a single <code class="idl"><a data-link-type="idl" href="#originboundcredential">OriginBoundCredential</a></code>
   object <strong>if and only if</strong> one can be provided without user
@@ -2167,7 +2202,7 @@ <h4 class="heading settled" data-level="4.2.3" id="request-originboundcredential
   </span><a class="self-link" href="#request-originboundcredential-with-mediation"></a></h4>
 
 
-    <p>This algorithm accepts an <a data-link-type="dfn" href="https://tools.ietf.org/html/rfc6454#section-3.2">origin</a> (<var>origin</var>), a sequence of
+    <p>This algorithm accepts an <a data-link-type="dfn" href="https://tools.ietf.org/html/rfc6454#section-3.2">origin</a> (<var>origin</var>), a set of
   type names (<var>types</var>) and an <code class="idl"><a data-link-type="idl" href="#dictdef-credentialrequestoptions">CredentialRequestOptions</a></code> dictionary
   (<var>options</var>), and returns either a single <code class="idl"><a data-link-type="idl" href="#originboundcredential">OriginBoundCredential</a></code>
   object, or <code>null</code> if none can be provided.</p>
@@ -3647,9 +3682,6 @@ <h2 class="no-num heading settled" id="issues-index"><span class="content">Issue
    <div class="issue"> Monkey-patching! Hooray! Talk with Anne, et al.<a href="#issue-020f94b2"> ↵ </a></div>
    <div class="issue"> Currently, we’re not protecting requests with opaque bodies from
   Service Worker interception. Should we?<a href="#issue-be0db764"> ↵ </a></div>
-   <div class="issue"> This is terribly hand-wavey. The intent is
-      clear, but I need to do the work to walk through the list of DOMStrings
-      and convert them to interfaces and etc. Busywork for later. <a href="https://github.com/w3c/webappsec/issues/289">&lt;https://github.com/w3c/webappsec/issues/289></a><a href="#issue-6005a2a4"> ↵ </a></div>
    <div class="issue"> Add some thoughts here about when and how the API
   should be used, especially with regard to <code class="idl"><a data-link-type="idl" href="#dom-credentialrequestoptions-suppressui">suppressUI</a></code>. <a href="https://github.com/w3c/webappsec/issues/290">&lt;https://github.com/w3c/webappsec/issues/290></a><a href="#issue-e1d9f1af"> ↵ </a></div>
    <div class="issue">

specs/credentialmanagement/index.src.html

@@ -1102,12 +1102,30 @@ <h4 id="request-credential">
       </ol>
     </li>
     <li>
-      Let <var>type</var> be lowest common ancestor interface of the types
-      referenced in <var>types</var>.
+      Let <var>types</var> be an empty set.
+    </li>
+    <li>
+      For each <var>key</var> in <var>options</var>:
 
-      ISSUE(w3c/webappsec#289): This is terribly hand-wavey. The intent is
-      clear, but I need to do the work to walk through the list of DOMStrings
-      and convert them to interfaces and etc. Busywork for later.
+      <ol>
+        <li>
+          Let <var>interface</var> be the interface whose name is
+          <var>key</var>, or <code>null</code> if no interface's name
+          matches.
+        </li>
+        <li>
+          If <var>interface</var> is not <code>null</code>, insert
+          <var>interface</var> into <var>possible types</var>.
+        </li>
+      </ol>
+    </li>
+    <li>
+      Let <var>type</var> be the lowest common ancestor interface of the
+      interfaces contained in <var>types</var>.
+
+      Note: That is, given a set containing {{PasswordCredential}} and
+      {{FederatedCredential}}, <var>type</var> will be
+      {{OriginBoundCredential}}.
     </li>
     <li>
       Return a <code>Promise</code> rejected with <code>TypeMismatchError</code>
@@ -1123,7 +1141,9 @@ <h4 id="request-credential">
       Switch on <var>type</var>, and execute the associated steps:
 
       <dl>
+        <dt>{{FederatedCredential}}</dt>
         <dt>{{OriginBoundCredential}}</dt>
+        <dt>{{PasswordCredential}}</dt>
         <dd>
           <ol>
             <li>
@@ -1331,7 +1351,7 @@ <h4 id="request-originboundcredential-without-mediation">
     Request a <code>OriginBoundCredential</code> <em>without</em> user mediation
   </h4>
 
-  This algorithm accepts an <a>origin</a> (<var>origin</var>), a sequence of
+  This algorithm accepts an <a>origin</a> (<var>origin</var>), a set of
   type names (<var>types</var>) and an {{CredentialRequestOptions}} dictionary
   (<var>options</var>), and returns either a single {{OriginBoundCredential}}
   object <strong>if and only if</strong> one can be provided without user
@@ -1376,7 +1396,7 @@ <h4 id="request-originboundcredential-with-mediation">
     Request a <code>OriginBoundCredential</code> with user mediation
   </h4>
 
-  This algorithm accepts an <a>origin</a> (<var>origin</var>), a sequence of
+  This algorithm accepts an <a>origin</a> (<var>origin</var>), a set of
   type names (<var>types</var>) and an {{CredentialRequestOptions}} dictionary
   (<var>options</var>), and returns either a single {{OriginBoundCredential}}
   object, or <code>null</code> if none can be provided.