Resolves SWAMID-3392 and SWAMID-3393

2 files changed, 57 insertions, 7 deletions

diff --git a/swamid-2.0/akka-anv.uu.se-shibboleth.xml b/swamid-2.0/akka-anv.uu.se-shibboleth.xml
index 8592812b..3fc57ae7 100644
--- a/swamid-2.0/akka-anv.uu.se-shibboleth.xml
+++ b/swamid-2.0/akka-anv.uu.se-shibboleth.xml
@@ -28,6 +28,15 @@
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://akka-anv.uu.se/Shibboleth.sso/Login" index="1"/>
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://akka-anv.uu.se/Shibboleth.sso/DS/ds.swamid.se"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://akka-anv.uu.se/Shibboleth.sso/DS/ds.swamid.se" index="2"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Uppsala universitets AKKA användargränssnitt</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Uppsala University AKKA User Interface</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Autentisering/Kontroll - Katalogadministration</mdui:Description>
+        <mdui:Description xml:lang="en">Authentication/Control - Directory Administration</mdui:Description>
+        <mdui:Logo height="50" width="50">https://weblogin.uu.se/idp/images/logga-50.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">http://akka.uadm.uu.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://akka.uadm.uu.se/?languageId=1</mdui:InformationURL>
+      </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo>
@@ -82,5 +91,35 @@ JnhHj8Wsg0csCS86vOCTNXVKXHcRIUL5FaLf+8MrSHrs8WR4CN4AHLuprwthtQyV
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://akka-anv.uu.se/Shibboleth.sso/SAML2/ECP" index="10"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://akka-anv.uu.se/Shibboleth.sso/SAML/POST" index="11"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://akka-anv.uu.se/Shibboleth.sso/SAML/Artifact" index="12"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="sv">Uppsala universitets AKKA användargränssnitt</md:ServiceName>
+      <md:ServiceName xml:lang="en">Uppsala University AKKA User Interface</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:SurName>Servicedesk</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:SurName>Operations</md:SurName>
+    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:SurName>Servicedesk</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/konto.weblogin.uu.se-shibboleth.xml b/swamid-2.0/konto.weblogin.uu.se-shibboleth.xml
index 140a4f67..6732c433 100644
--- a/swamid-2.0/konto.weblogin.uu.se-shibboleth.xml
+++ b/swamid-2.0/konto.weblogin.uu.se-shibboleth.xml
@@ -15,14 +15,13 @@
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Uppsala University user account activation and password reset</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Uppsala universitets kontoaktivering och lösenordsåterställning</mdui:DisplayName>
-        <mdui:Description xml:lang="en">As a new user you use this service to activate your university user account. You can also use this service to reset your password A for your user account after the account activation.</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Uppsala University user account activation and password reset</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Denna tjänst används för att du som ny vid universitetet ska kunna aktivera ditt användarkonto vid universitetet. Om du redan har ett aktivt konto kan du sätta ett nytt lösenord A om du glömt bort det.</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.uu.se/idp/images/logga-50.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.uu.se/idp/images/logga-50.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://konto.weblogin.uu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://konto.weblogin.uu.se</mdui:InformationURL>
+        <mdui:Description xml:lang="en">As a new user you use this service to activate your university user account. You can also use this service to reset your password A for your user account after the account activation.</mdui:Description>
+        <mdui:Logo height="50" width="50">https://weblogin.uu.se/idp/images/logga-50.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">https://konto.weblogin.uu.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://konto.weblogin.uu.se/index-en.html</mdui:InformationURL>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -67,9 +66,21 @@ zs343t8msFatMz3jlO+DgmZS0btlHkYSvRDAGaXOAkwGnE3nzjsLKA==
     <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
   </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:SurName>Servicedesk</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Uppsala universitet</md:Company>
+    <md:SurName>Operations</md:SurName>
+    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
+  </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>Uppsala universitet</md:Company>
+    <md:SurName>Servicedesk</md:SurName>
     <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46184714400</md:TelephoneNumber>
+    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>