Lift IDL definitions into the normative Browser API section

w3c-fedid · Feb 13, 2023 · 666226b · 666226b
1 parent 43dc3f6
commit 666226b
Showing 1 changed file with 51 additions and 54 deletions.
diff --git a/spec/index.bs b/spec/index.bs
@@ -655,6 +655,30 @@ to keep their actual config files on an arbitary path while allowing the user ag
 path manipulation to fingerprint (for instance, by including the RP in the path). See
 [[#manifest-fingerprinting]].
 
+<xmp class="idl">
+dictionary IdentityProviderWellKnown {
+  required sequence<USVString> provider_urls;
+};
+
+dictionary IdentityProviderIcon {
+  required USVString url;
+  unsigned long size;
+};
+
+dictionary IdentityProviderBranding {
+  USVString background_color;
+  USVString color;
+  sequence<IdentityProviderIcon> icons;
+};
+
+dictionary IdentityProviderAPIConfig {
+  required USVString accounts_endpoint;
+  required USVString client_metadata_endpoint;
+  required USVString id_assertion_endpoint;
+  IdentityProviderBranding branding;
+};
+</xmp>
+
 <div algorithm>
 To <dfn>fetch the accounts list</dfn> given an {{IdentityProviderAPIConfig}} |config|, an
 {{IdentityProviderConfig}} |provider|, and |globalObject|, run the following steps. This returns an
@@ -705,6 +729,20 @@ To <dfn>fetch the accounts list</dfn> given an {{IdentityProviderAPIConfig}} |co
     1. Return |accountsList|.
 </div>
 
+<xmp class="idl">
+dictionary IdentityProviderAccount {
+  required USVString id;
+  required USVString name;
+  required USVString email;
+  USVString given_name;
+  USVString picture;
+  sequence<USVString> approved_clients;
+};
+dictionary IdentityProviderAccountList {
+  sequence<IdentityProviderAccount> accounts;
+};
+</xmp>
+
 <div algorithm>
 To <dfn>fetch the account picture</dfn> given an {{IdentityProviderAccount}} |account| and a
 |globalObject|, run the following steps:
@@ -786,6 +824,12 @@ To <dfn>fetch an identity assertion</dfn> given an [=AccountState=] |accountStat
     1. Return |credential|.
 </div>
 
+<xmp class="idl">
+dictionary IdentityProviderToken {
+  required USVString token;
+};
+</xmp>
+
 <div algorithm>
 When <dfn>computing the manifest URL</dfn> given an {{IdentityProviderConfig}} |provider|, a
 [=string=] |manifestString|, and |globalObject|, perform the following steps. This returns a
@@ -887,6 +931,13 @@ an {{IdentityProviderConfig}} |provider|, run the following steps. This returns
     1. Return |metadata|.
 </div>
 
+<xmp class="idl">
+dictionary IdentityProviderClientMetadata {
+  USVString privacy_policy_url;
+  USVString terms_of_service_url;
+};
+</xmp>
+
 <div algorithm>
 To <dfn>select an account</dfn> given an |accountsList|, run the following steps. This returns an
 {{IdentityProviderAccount}} or failure.
@@ -958,12 +1009,6 @@ Sec-Fetch-Dest: webidentity
 ```
 </div>
 
-<xmp class="idl">
-dictionary IdentityProviderWellKnown {
-  required sequence<USVString> provider_urls;
-};
-</xmp>
-
 The file is parsed expecting a {{IdentityProviderWellKnown}} JSON object.
 
 The {{IdentityProviderWellKnown}} JSON object has the following semantics:
@@ -1002,26 +1047,6 @@ Sec-Fetch-Dest: webidentity
 
 The response body must be a JSON object that can be [=converted to an IDL value|converted=] to an {{IdentityProviderAPIConfig}} without an exception.
 
-<xmp class=idl>
-dictionary IdentityProviderIcon {
-  required USVString url;
-  unsigned long size;
-};
-
-dictionary IdentityProviderBranding {
-  USVString background_color;
-  USVString color;
-  sequence<IdentityProviderIcon> icons;
-};
-
-dictionary IdentityProviderAPIConfig {
-  required USVString accounts_endpoint;
-  required USVString client_metadata_endpoint;
-  required USVString id_assertion_endpoint;
-  IdentityProviderBranding branding;
-};
-</xmp>
-
 The {{IdentityProviderAPIConfig}} object's members have the following semantics:
 
 <dl dfn-type="dict-member" dfn-for="IdentityProviderAPIConfig">
@@ -1125,21 +1150,6 @@ Sec-Fetch-Dest: webidentity
 
 The response body must be a JSON object that can be [=converted to an IDL value|converted=] to an {{IdentityProviderAccountList}} without an exception.
 
-
-<xmp class="idl">
-dictionary IdentityProviderAccount {
-  required USVString id;
-  required USVString name;
-  required USVString email;
-  USVString given_name;
-  USVString picture;
-  sequence<USVString> approved_clients;
-};
-dictionary IdentityProviderAccountList {
-  sequence<IdentityProviderAccount> accounts;
-};
-</xmp>
-
 Every {{IdentityProviderAccount}} is expected to have members with the following semantics:
 
 <dl dfn-type="dict-member" dfn-for="IdentityProviderAccount">
@@ -1213,13 +1223,6 @@ Sec-Fetch-Dest: webidentity
 
 The response body must be a JSON object that can be [=converted to an IDL value|converted=] to an {{IdentityProviderClientMetadata}} without an exception.
 
-<xmp class="idl">
-dictionary IdentityProviderClientMetadata {
-  USVString privacy_policy_url;
-  USVString terms_of_service_url;
-};
-</xmp>
-
 The {{IdentityProviderClientMetadata}} object's members have the following semantics:
 
 <dl dfn-type="dict-member" dfn-for="IdentityProviderClientMetadata">
@@ -1296,12 +1299,6 @@ Note: An [=IDP=] should validate the nonce, if present, to prevent CSRF-style at
 
 The response body must be a JSON object that can be [=converted to an IDL value|converted=] to an {{IdentityProviderToken}} without an exception.
 
-<xmp class="idl">
-dictionary IdentityProviderToken {
-  required USVString token;
-};
-</xmp>
-
 Every {{IdentityProviderToken}} is expected to have members with the following semantics:
 
 <dl dfn-type="dict-member" dfn-for="IdentityProviderToken">