[java-idp-oidc] 36/44: JOIDC-5 Switched the OAuthRPExtension-container to use 'choice'.

[Henri Mikkonen]

This is an automated email from the git hooks/post-receive script.

hjmikkon pushed a commit to branch main
in repository java-idp-oidc.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=c260ab5f992f96abe108b97f03818e6c6b8678c3

commit c260ab5f992f96abe108b97f03818e6c6b8678c3
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Fri Sep 18 15:31:13 2020 +0300

    JOIDC-5 Switched the OAuthRPExtension-container to use 'choice'.
    
    https://issues.shibboleth.net/jira/browse/JOIDC-5
    
    Unlike with the previous 'sequence' -style, the order of the elements
    does not matter anymore.
---
 .../resources/schema/saml-metadata-ext-oidcmd.xsd  | 78 +++++++++++-----------
 1 file changed, 38 insertions(+), 40 deletions(-)

diff --git a/idp-oidc-extension-api/src/main/resources/schema/saml-metadata-ext-oidcmd.xsd b/idp-oidc-extension-api/src/main/resources/schema/saml-metadata-ext-oidcmd.xsd
index 83e9e2e7..38ae1df0 100644
--- a/idp-oidc-extension-api/src/main/resources/schema/saml-metadata-ext-oidcmd.xsd
+++ b/idp-oidc-extension-api/src/main/resources/schema/saml-metadata-ext-oidcmd.xsd
@@ -7,39 +7,37 @@
         </documentation>
     </annotation>
 
-    <import namespace="urn:oasis:names:tc:SAML:2.0:metadata" schemaLocation="http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"/>
-
-    <complexType name="OAuthRPExtensions">
-        <complexContent>
-                <sequence>
-                    <element ref="oidcmd:TokenEndpointAuthMethod" minOccurs="0" maxOccurs="1"/> <!-- or unbounded? -->
-                    <element ref="oidcmd:GrantType" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="oidcmd:ResponseType" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="oidcmd:ApplicationType" minOccurs="0" maxOccurs="1" />
-                    <element ref="oidcmd:ClientUri" minOccurs="0" maxOccurs="1" /> <!-- TODO localized -->
-                    <element ref="oidcmd:Scope" minOccurs="0" maxOccurs="unbounded" />
-                    <element ref="oidcmd:SoftwareId" minOccurs="0" maxOccurs="1" />
-                    <element ref="oidcmd:SoftwareVersion" minOccurs="0" maxOccurs="1" />
-                    <element ref="oidcmd:SectorIdentifierUri" minOccurs="0" maxOccurs="1" />
-                    <element ref="oidcmd:IdTokenSignedResponseAlg" minOccurs="0" maxOccurs="1" />
-                    <element ref="oidcmd:IdTokenEncryptedResponseAlg" minOccurs="0" maxOccurs="1" />
-                    <element ref="oidcmd:IdTokenEncryptedResponseEnc" minOccurs="0" maxOccurs="1" />
-                    <element ref="oidcmd:UserInfoSignedResponseAlg" minOccurs="0" maxOccurs="1" />
-                    <element ref="oidcmd:UserInfoEncryptedResponseAlg" minOccurs="0" maxOccurs="1" />
-                    <element ref="oidcmd:UserInfoEncryptedResponseEnc" minOccurs="0" maxOccurs="1" />
-                    <element ref="oidcmd:RequestObjectSigningAlg" minOccurs="0" maxOccurs="1" />
-                    <element ref="oidcmd:RequestObjectEncryptionAlg" minOccurs="0" maxOccurs="1" />
-                    <element ref="oidcmd:RequestObjectEncryptionEnc" minOccurs="0" maxOccurs="1" />
-                    <element ref="oidcmd:TokenEndpointAuthSigningAlg" minOccurs="0" maxOccurs="1" />
-                    <element ref="oidcmd:DefaultAcrValue" minOccurs="0" maxOccurs="unbounded" />
-                    <element ref="oidcmd:InitiateLoginUri" minOccurs="0" maxOccurs="1" />
-                    <element ref="oidcmd:RequestUri" minOccurs="0" maxOccurs="unbounded" />
-                    <element ref="oidcmd:PostLogoutRedirectUri" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="defaultMaxAge" type="int" use="optional" />
-                <attribute name="requireAuthTime" type="string" use="optional" />
-        </complexContent>
-    </complexType>
+    <element name="OAuthRPExtensions">
+        <complexType>
+            <choice minOccurs="0" maxOccurs="unbounded">
+                <element ref="oidcmd:TokenEndpointAuthMethod" />
+                <element ref="oidcmd:GrantType" />
+                <element ref="oidcmd:ResponseType" />
+                <element ref="oidcmd:ApplicationType" />
+                <element ref="oidcmd:ClientUri" />
+                <element ref="oidcmd:Scope" />
+                <element ref="oidcmd:SoftwareId" />
+                <element ref="oidcmd:SoftwareVersion" />
+                <element ref="oidcmd:SectorIdentifierUri" />
+                <element ref="oidcmd:IdTokenSignedResponseAlg" />
+                <element ref="oidcmd:IdTokenEncryptedResponseAlg" />
+                <element ref="oidcmd:IdTokenEncryptedResponseEnc" />
+                <element ref="oidcmd:UserInfoSignedResponseAlg" />
+                <element ref="oidcmd:UserInfoEncryptedResponseAlg" />
+                <element ref="oidcmd:UserInfoEncryptedResponseEnc" />
+                <element ref="oidcmd:RequestObjectSigningAlg" />
+                <element ref="oidcmd:RequestObjectEncryptionAlg" />
+                <element ref="oidcmd:RequestObjectEncryptionEnc" />
+                <element ref="oidcmd:TokenEndpointAuthSigningAlg" />
+                <element ref="oidcmd:DefaultAcrValue" /><!-- order matters -->
+                <element ref="oidcmd:InitiateLoginUri" />
+                <element ref="oidcmd:RequestUri" />
+                <element ref="oidcmd:PostLogoutRedirectUri" />
+            </choice>
+            <attribute name="defaultMaxAge" type="int" use="optional" />
+            <attribute name="requireAuthTime" type="string" use="optional" />
+        </complexType>
+    </element>
 
     <element name="TokenEndpointAuthMethod" type="anyURI" />
     <element name="GrantType" type="anyURI" />
@@ -48,19 +46,16 @@
 
     <element name="ClientUri" type="anyURI" />
     <element name="Scope" type="anyURI" />
-    <element name="ClientSecret" type="anyURI" />
-    <element name="JwkSet" type="anyURI" />
-    <element name="JwkSetUri" type="anyURI" />
     <element name="SoftwareId" type="anyURI" />
     <element name="SoftwareVersion" type="anyURI" />
     <element name="SectorIdentifierUri" type="anyURI" />
 
     <element name="IdTokenSignedResponseAlg" type="anyURI" />
-    <element name="IdTokenEncryptionResponseAlg" type="anyURI" />
-    <element name="IdTokenEncryptionResponseEnc" type="anyURI" />
+    <element name="IdTokenEncryptedResponseAlg" type="anyURI" />
+    <element name="IdTokenEncryptedResponseEnc" type="anyURI" />
     <element name="UserInfoSignedResponseAlg" type="anyURI" />
-    <element name="UserInfoEncryptionResponseAlg" type="anyURI" />
-    <element name="UserInfoEncryptionResponseEnc" type="anyURI" />
+    <element name="UserInfoEncryptedResponseAlg" type="anyURI" />
+    <element name="UserInfoEncryptedResponseEnc" type="anyURI" />
     <element name="RequestObjectSigningAlg" type="anyURI" />
     <element name="RequestObjectEncryptionAlg" type="anyURI" />
     <element name="RequestObjectEncryptionEnc" type="anyURI" />
@@ -70,7 +65,10 @@
     <element name="RequestUri" type="anyURI" />
     <element name="PostLogoutRedirectUri" type="anyURI" />
     
+    <element name="JwkSet" type="anyURI" />
+    <element name="JwkSetUri" type="anyURI" />
     <element name="JwksData" type="anyURI" />
+    <element name="ClientSecret" type="anyURI" />
     <element name="ClientSecretKeyReference" type="anyURI" />
 
 </schema>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.