Merge branch 'master' of git.swamid.se:swamid-metadata

2 files changed, 18 insertions, 12 deletions

diff --git a/swamid-testing/adfs.test.rkh.se-adfs-services-trust.xml b/swamid-testing/adfs.test.rkh.se-adfs-services-trust.xml
index 02d56ba1..d0aea279 100644
--- a/swamid-testing/adfs.test.rkh.se-adfs-services-trust.xml
+++ b/swamid-testing/adfs.test.rkh.se-adfs-services-trust.xml
@@ -9,15 +9,20 @@
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
       </samla:Attribute>
+      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
+        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+      </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo>
-        <mdui:Description xml:lang="en">Application submission for use of the national 7T facility in Lund</mdui:Description>
-        <mdui:Description xml:lang="sv">Ansökningshantering till nationella 7T anläggningen i Lund</mdui:Description>
-        <mdui:DisplayName xml:lang="en">National 7T facility</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Nationella 7T anläggningen</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Test ADFS Server for Swedish Red Cross University</mdui:Description>
+        <mdui:Description xml:lang="sv">Test ADFS Server för Röda Korsets Högskola</mdui:Description>
+        <mdui:DisplayName xml:lang="en">TEST ADFS Swedish Red Cross University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">TEST ADFS Röda Korsets Högskola</mdui:DisplayName>
         <mdui:PrivacyStatementURL xml:lang="en">https://www.rkh.se/om-webbplatsen/behandling-av-personuppgifter/</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://www.rkh.se/om-webbplatsen/behandling-av-personuppgifter/</mdui:PrivacyStatementURL>
         <mdui:InformationURL xml:lang="en">https://www.rkh.se/information-in-english/</mdui:InformationURL>
@@ -46,8 +51,8 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.rkh.se/adfs/ls/" index="0" isDefault="true"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.test.rkh.se/adfs/ls/" index="1"/>
     <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">National 7T facility</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Nationella 7T anläggningen</md:ServiceName>
+      <md:ServiceName xml:lang="en">TEST ADFS Swedish Red Cross University</md:ServiceName>
+      <md:ServiceName xml:lang="sv">TEST ADFS Röda Korsets Högskola</md:ServiceName>
       <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="c" Name="urn:oid:2.5.4.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
@@ -75,14 +80,14 @@
     <md:Extensions>
       <shibmd:Scope regexp="false">rkh.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">National 7T facility</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Application submission for use of the national 7T facility in Lund&lt;</mdui:Description>
+        <mdui:DisplayName xml:lang="en">TEST ADFS Swedish Red Cross University</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Test ADFS Server for Swedish Red Cross University</mdui:Description>
         <mdui:PrivacyStatementURL xml:lang="en">https://www.rkh.se/om-webbplatsen/behandling-av-personuppgifter/</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="sv">https://www.rkh.se/om-webbplatsen/behandling-av-personuppgifter/</mdui:PrivacyStatementURL>
         <mdui:InformationURL xml:lang="sv">https://www.rkh.se/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">https://www.rkh.se/information-in-english/</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="sv">Nationella 7T anläggningen</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Ansökningshantering till nationella 7T anläggningen i Lund</mdui:Description>
+        <mdui:DisplayName xml:lang="sv">TEST ADFS Röda Korsets Högskola</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Test ADFS Server för Röda Korsets Högskola</mdui:Description>
         <mdui:Logo xml:lang="en" height="126" width="200">https://dw.rkh.se/Logo.png</mdui:Logo>
         <mdui:Logo xml:lang="sv" height="126" width="200">https://dw.rkh.se/Logo.png</mdui:Logo>
       </mdui:UIInfo>
@@ -112,8 +117,8 @@
   <md:Organization>
     <md:OrganizationName xml:lang="en">Swedish Red Cross University College</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Röda Korsets Högskola</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">[TEST] Swedish Red Cross University College</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">[TEST] Röda Korsets Högskola</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish Red Cross University College</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Röda Korsets Högskola</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.rkh.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.rkh.se/</md:OrganizationURL>
   </md:Organization>
diff --git a/swamid-testing/idp-test.suni.se-adfs-services-trust.xml b/swamid-testing/idp-test.suni.se-adfs-services-trust.xml
index 9c43c611..ea340c97 100644
--- a/swamid-testing/idp-test.suni.se-adfs-services-trust.xml
+++ b/swamid-testing/idp-test.suni.se-adfs-services-trust.xml
@@ -13,6 +13,7 @@
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
         <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
         <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
+        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>