From cfb70f755c45a2cad582e8030b1542add9949efb Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 24 Jul 2013 17:13:31 +0200
Subject: - SSO finalized - SSO Session is not closed if a new single
 authentication operation is started - PVP2 Configuration from Database (but
 without Metadata) --> TODO: change MetaDataProvider - Add additional
 UserFrame in case of SSO - MOASession encryption

TODO: MetaDataProvider, IdentityLink resign, SSO with Mandates, Legacy Template generation
---
 .../src/main/resources/config/moaid_config_2.0.xsd | 47 ++++++++++++----------
 1 file changed, 25 insertions(+), 22 deletions(-)

(limited to 'id/server/moa-id-commons')

diff --git a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
index b7982aca5..9f4e54212 100644
--- a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
+++ b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
@@ -283,6 +283,7 @@
 							<xsd:complexType>
 								<xsd:sequence>
 									<xsd:element name="PublicURLPrefix" type="xsd:anyURI" minOccurs="1" maxOccurs="1"/>
+									<xsd:element name="IssuerName" type="xsd:anyURI" minOccurs="1" maxOccurs="1"/>
 									<xsd:element name="Organization">
 										<xsd:complexType>
 											<xsd:sequence>
@@ -292,28 +293,7 @@
 											</xsd:sequence>
 										</xsd:complexType>
 									</xsd:element>
-									<xsd:element name="Contact">
-										<xsd:complexType>
-											<xsd:sequence>
-												<xsd:element name="SurName" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-												<xsd:element name="GivenName" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-												<xsd:element name="Mail" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-												<xsd:element name="Type" minOccurs="1" maxOccurs="1">
-													<xsd:simpleType>
-														<xsd:restriction base="xsd:token">
-															<xsd:enumeration value="technical"/>
-															<xsd:enumeration value="support"/>
-															<xsd:enumeration value="administrative"/>
-															<xsd:enumeration value="billing"/>
-															<xsd:enumeration value="other"/>
-														</xsd:restriction>
-													</xsd:simpleType>
-												</xsd:element>
-												<xsd:element name="Company" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-												<xsd:element name="Phone" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-											</xsd:sequence>
-										</xsd:complexType>
-									</xsd:element>
+									<xsd:element ref="Contact" minOccurs="1" maxOccurs="unbounded"/>
 								</xsd:sequence>
 							</xsd:complexType>
 						</xsd:element>
@@ -556,6 +536,7 @@
 							<xsd:complexType>
 								<xsd:sequence>
 									<xsd:element name="UseSSO" type="xsd:boolean"/>
+									<xsd:element name="AuthDataFrame" type="xsd:boolean" default="true"/>
 									<xsd:element name="SingleLogOutURL" type="xsd:anyURI"/>
 								</xsd:sequence>
 							</xsd:complexType>
@@ -937,4 +918,26 @@
 			</xsd:sequence>
 		</xsd:complexType>
 	</xsd:element>
+	<xsd:element name="Contact">
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="SurName" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+				<xsd:element name="GivenName" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+				<xsd:element name="Mail" type="xsd:string" minOccurs="1" maxOccurs="unbounded"/>
+				<xsd:element name="Type" minOccurs="1" maxOccurs="1">
+					<xsd:simpleType>
+						<xsd:restriction base="xsd:token">
+							<xsd:enumeration value="technical"/>
+							<xsd:enumeration value="support"/>
+							<xsd:enumeration value="administrative"/>
+							<xsd:enumeration value="billing"/>
+							<xsd:enumeration value="other"/>
+						</xsd:restriction>
+					</xsd:simpleType>
+				</xsd:element>
+				<xsd:element name="Company" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+				<xsd:element name="Phone" type="xsd:string" minOccurs="1" maxOccurs="unbounded"/>
+			</xsd:sequence>
+		</xsd:complexType>
+	</xsd:element>
 </xsd:schema>
-- 
cgit v1.2.3