Resolves SWAMIDOPS-8387

2 files changed, 46 insertions, 6 deletions

diff --git a/swamid-2.0/scalear-staging2.herokuapp.com.xml b/swamid-2.0/scalear-staging2.herokuapp.com.xml
index 19b8d04c..19b5daed 100644
--- a/swamid-2.0/scalear-staging2.herokuapp.com.xml
+++ b/swamid-2.0/scalear-staging2.herokuapp.com.xml
@@ -5,6 +5,7 @@
       <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <saml:AttributeValue>http://www.swamid.se/category/hei-service</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -14,9 +15,9 @@
         <mdui:DisplayName xml:lang="en">Scalable Learning</mdui:DisplayName>
         <mdui:Description xml:lang="en">Blended learning platform for interactive in-class and online education.</mdui:Description>
         <mdui:Description xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.scalable-learning.com/home/about</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.scalable-learning.com/home/privacy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="100" width="100">https://scalear-staging2.herokuapp.com/assets/logo-a66e557f3f93b4d5195033ba1a1527a3.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://scalear-staging2.herokuapp.com/#/about</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://scalear-staging2.herokuapp.com/#/privacy</mdui:PrivacyStatementURL>
+        <mdui:Logo xml:lang="en" height="100" width="100">https://scalear-staging2.herokuapp.com/assets/logo-a66e557f3f93b4d5195033ba1a1527a3.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -51,10 +52,29 @@ qONqqzvm+WBOIQ==
 urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress
 </md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" Location="https://scalear-staging2.herokuapp.com/saml/consume"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Scalable Learning</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Blended learning platform for interactive in-class and online education.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning. </md:ServiceDescription>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:2.5.4.42"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:2.5.4.4"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:2.5.4.10"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Scalable Learning</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Scalable Learning</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">www.scalable-learning.com</md:OrganizationURL>
   </md:Organization>
+  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>ScalableLearning</Company>
+    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>ScalableLearning</Company>
+    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/test.scalable-learning.com.xml b/swamid-2.0/test.scalable-learning.com.xml
index 486d7b9b..c9a862df 100644
--- a/swamid-2.0/test.scalable-learning.com.xml
+++ b/swamid-2.0/test.scalable-learning.com.xml
@@ -5,6 +5,7 @@
       <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
         <saml:AttributeValue>http://www.swamid.se/category/hei-service</saml:AttributeValue>
         <saml:AttributeValue>http://www.swamid.se/category/research-and-education</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
       </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -14,9 +15,9 @@
         <mdui:DisplayName xml:lang="en">Scalable Learning</mdui:DisplayName>
         <mdui:Description xml:lang="en">Blended learning platform for interactive in-class and online education.</mdui:Description>
         <mdui:Description xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.scalable-learning.com/home/about</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.scalable-learning.com/home/privacy</mdui:PrivacyStatementURL>
-        <mdui:Logo height="100" width="100">https://test.scalable-learning.com/assets/logo-a66e557f3f93b4d5195033ba1a1527a3.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://test.scalable-learning.com/#/about</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://test.scalable-learning.com/#/privacy</mdui:PrivacyStatementURL>
+        <mdui:Logo xml:lang="en" height="100" width="100">https://test.scalable-learning.com/assets/logo-a66e557f3f93b4d5195033ba1a1527a3.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -51,10 +52,29 @@ ROE=
 urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress
 </md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="1" Location="https://test.scalable-learning.com/saml/consume"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Scalable Learning</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Blended learning platform for interactive in-class and online education.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning. </md:ServiceDescription>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:2.5.4.42"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:2.5.4.4"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:2.5.4.10"/>
+      <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Scalable Learning</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Scalable Learning</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">www.scalable-learning.com</md:OrganizationURL>
   </md:Organization>
+  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <Company>ScalableLearning</Company>
+    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <Company>ScalableLearning</Company>
+    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>