Resolves SWAMIDOPS-8416. Adjust MDUI. Fix for previous, SP landed in an IdP xml by mistake

4 files changed, 17 insertions, 9 deletions

diff --git a/swamid-2.0/indico.uu.se-shibboleth-sso.xml b/swamid-2.0/indico.uu.se-shibboleth-sso.xml
index 94523672..b0b380c6 100644
--- a/swamid-2.0/indico.uu.se-shibboleth-sso.xml
+++ b/swamid-2.0/indico.uu.se-shibboleth-sso.xml
@@ -5,10 +5,11 @@
       <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://uuc-web003-t.its.uu.se/Shibboleth.sso/Login"/>
       <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://uuc-web003-t.its.uu.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Indico - new</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Indico - new</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Indico</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Indico</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Indico är ett evenemangshanteringssystem för möten, konferenser och föreläsningar.</mdui:Description>
         <mdui:Description xml:lang="en">Indico is an event management system for meetings, conferences and lectures.</mdui:Description>
+        <mdui:Logo height="52" width="196">https://indico.uu.se/images/logo_indico.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -44,4 +45,9 @@ S8+ySBPOBAlDD/+hnhDiWa82S9gWdmu9m9eFNZhK65BrqXq6ogD9wpznTB/+AbQ=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://indico.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://indico.uu.se/Shibboleth.sso/SAML/POST" index="4"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Björn</md:GivenName>
+    <md:SurName>Wiberg</md:SurName>
+    <md:EmailAddress>mailto:bjorn.wiberg@uadm.uu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml b/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml
index 267c55d3..2a586734 100644
--- a/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml
+++ b/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-This is example metadata only. Do *NOT* supply it as is without review,
-and do *NOT* provide it in real time to your partners.
- -->
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uuc-web003-t.its.uu.se/shibboleth">
   <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
     <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
@@ -33,10 +29,11 @@ and do *NOT* provide it in real time to your partners.
       <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://uuc-web003-t.its.uu.se/Shibboleth.sso/Login"/>
       <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://uuc-web003-t.its.uu.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Indico</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Indico</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Indico TEST</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Indico TEST</mdui:DisplayName>
         <mdui:Description xml:lang="sv">Indico är ett evenemangshanteringssystem för möten, konferenser och föreläsningar.</mdui:Description>
         <mdui:Description xml:lang="en">Indico is an event management system for meetings, conferences and lectures.</mdui:Description>
+        <mdui:Logo height="52" width="196">https://uuc-web003-t.its.uu.se/images/logo_indico.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -89,4 +86,9 @@ R+DVLFswqfvJvRRyTA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uuc-web003-t.its.uu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uuc-web003-t.its.uu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Björn</md:GivenName>
+    <md:SurName>Wiberg</md:SurName>
+    <md:EmailAddress>mailto:bjorn.wiberg@uadm.uu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-idp-2.0.mxml b/swamid-idp-2.0.mxml
index a4a5a197..cc66403e 100644
--- a/swamid-idp-2.0.mxml
+++ b/swamid-idp-2.0.mxml
@@ -16,5 +16,4 @@
   <xi:include href="swamid-2.0/idp.suni.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/idp2.rkh.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp3.hig.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/indico.uu.se-shibboleth-sso.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 0dcaeecb..847e5301 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -626,4 +626,5 @@
   <xi:include href="swamid-2.0/test.account.hj.se.xml"/>
   <xi:include href="swamid-2.0/uportalhb-test.ldc.lu.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/ladokportalen.hb.se-shibboleth.sso.xml"/>
+  <xi:include href="swamid-2.0/indico.uu.se-shibboleth-sso.xml"/>
 </md:EntitiesDescriptor>