SWAMID-2113: Updated tentaadmin.uhr.se

1 files changed, 31 insertions, 7 deletions

diff --git a/swamid-2.0/tentaadmin.uhr.se-shibboleth.xml b/swamid-2.0/tentaadmin.uhr.se-shibboleth.xml
index 736494a9..7847395b 100644
--- a/swamid-2.0/tentaadmin.uhr.se-shibboleth.xml
+++ b/swamid-2.0/tentaadmin.uhr.se-shibboleth.xml
@@ -22,8 +22,9 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
     <mdattr:EntityAttributes>
       <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <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:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
@@ -35,6 +36,10 @@
         <mdui:DisplayName xml:lang="en">TentaAdmin</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Administration av tentamen och tentamensvakter.</mdui:Description>
         <mdui:Description xml:lang="en">Administration av tentamen och tentamensvakter.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://tentaadmin.uhr.se/about/privacypolicy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://tentaadmin.uhr.se/about/privacypolicy</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://tentaadmin.uhr.se/about/privacypolicy</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://tentaadmin.uhr.se/about/privacypolicy</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -57,8 +62,7 @@ XDPaH7zLR0UkOzDAxWpbMoB4r+bXvxawL02mcLciKa1qMczJI35UxxCZi4XW/78d
 Qyqz6IqAF5pbHDzIGij/jDysIwsPNzULawhr4nb46FZ0jRtlGU+nqlKpC0eNLvru
 0ntNd0B9Dx3/75Uj9Fc6BLjoHbrXFBZDQxCBTFebq9k2h2aEpR0GCiS7b1+NZpng
 lCQay1yDOXbbbFWmU8Ggn8BWJ3/4AdfiYs0U4sjkpel77MhH8qtdnH03dXPOOorE
-gA74GRgPQ3FGnqF2PkasBH+5Vkxk2rTdAroEO3WXRBOsk6JgO3lB/QY8x/lOfg==
-</ds:X509Certificate>
+gA74GRgPQ3FGnqF2PkasBH+5Vkxk2rTdAroEO3WXRBOsk6JgO3lB/QY8x/lOfg==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -85,10 +89,30 @@ gA74GRgPQ3FGnqF2PkasBH+5Vkxk2rTdAroEO3WXRBOsk6JgO3lB/QY8x/lOfg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://tentaadmin.uhr.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tentaadmin.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tentaadmin.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="sv">Tentaadmin</md:ServiceName>
+      <md:ServiceName xml:lang="en">Tentaadmin</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Universitets- och högskolerådet</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Swedish Council for Higher Education</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.uhr.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.uhr.se</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Anders</md:GivenName>
-    <md:SurName>Möllström</md:SurName>
-    <md:EmailAddress>mailto:Anders.mollstrom@uhr.se</md:EmailAddress>
+    <md:Company>Universitets- och högskolerådet</md:Company>
+    <md:GivenName>Christine</md:GivenName>
+    <md:SurName>Claesson</md:SurName>
+    <md:EmailAddress>mailto:christine.claesson@uhr.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Universitets- och högskolerådet</md:Company>
+    <md:GivenName>Christine</md:GivenName>
+    <md:SurName>Claesson</md:SurName>
+    <md:EmailAddress>mailto:christine.claesson@uhr.se</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>