SWAMID-2495: Updated auth.fieldsites.se

3 files changed, 24 insertions, 5 deletions

diff --git a/swamid-edugain-sp-1.0.mxml b/swamid-edugain-sp-1.0.mxml
index 704872d8..b13b774b 100644
--- a/swamid-edugain-sp-1.0.mxml
+++ b/swamid-edugain-sp-1.0.mxml
@@ -3,6 +3,7 @@
   <xi:include href="swamid-edugain/account.eciu.eu.xml"/>
   <xi:include href="swamid-edugain/account.test.eciu.eu.xml"/>
   <xi:include href="swamid-edugain/auth.asiaportal.info.xml"/>
+  <xi:include href="swamid-edugain/auth.fieldsites.se-saml-cpauth.xml"/>
   <xi:include href="swamid-edugain/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-edugain/cloudmore.com-shibboleth.xml"/>
   <xi:include href="swamid-edugain/cpauth.icos-cp.eu-saml-cpauth.xml"/>
diff --git a/swamid-2.0/auth.fieldsites.se-saml-cpauth.xml b/swamid-edugain/auth.fieldsites.se-saml-cpauth.xml
index b3299182..2ac094c1 100644
--- a/swamid-2.0/auth.fieldsites.se-saml-cpauth.xml
+++ b/swamid-edugain/auth.fieldsites.se-saml-cpauth.xml
@@ -33,6 +33,11 @@
         <mdui:DisplayName xml:lang="en">SITES Authentication Service</mdui:DisplayName>
         <mdui:Description xml:lang="en">Single sign on for SITES data services</mdui:Description>
         <mdui:PrivacyStatementURL xml:lang="en">https://auth.fieldsites.se/saml/privacyStatement</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="sv">https://www.fieldsites.se/sv-SE</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.fieldsites.se/en-GB</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://auth.fieldsites.se/saml/privacyStatement</mdui:PrivacyStatementURL>
+        <mdui:DisplayName xml:lang="sv">SITES inloggningstjänst</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Inloggning för SITES data tjänster</mdui:Description>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -63,8 +68,7 @@ b8UpNU6UUQ12GBHhUP7OFv4VLz1OS3bwWxujRdMxjttW85rtjFCDnzjht2w1K3sJ
 +Wix+T8xHE8NVtg8wvEOr53/TKq0U1MwonVJLjbxRY8F3QexxXYGmDore/PtxDIb
 to63TmmP1EIbqrj1LGv23EngIG0wfhrKkV5cT1/TJ/0xJfLim6e66SO3crc9L2Q/
 r2UZOu21reg8IOKK+GgCBXVyc6ihEFpUF5sg/k4EThNjZM5PDDRYnwOwg8WdnOjF
-ut7vQ9gFxIHIfE526gVIlHUomwr6JGU=
-					</ds:X509Certificate>
+ut7vQ9gFxIHIfE526gVIlHUomwr6JGU=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -80,8 +84,10 @@ ut7vQ9gFxIHIfE526gVIlHUomwr6JGU=
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.fieldsites.se/saml/logout"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.fieldsites.se/saml/SAML2/POST" index="1" isDefault="true"/>
     <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">SITES Authentication Service</md:ServiceName>
+      <md:ServiceName xml:lang="en">SITES SAML service</md:ServiceName>
+      <md:ServiceName xml:lang="sv">SITES SAML tjänst</md:ServiceName>
       <md:ServiceDescription xml:lang="en">Single sign on for SITES data services</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="sv">Enskild inloggning för SITES data tjänster</md:ServiceDescription>
       <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
@@ -89,12 +95,25 @@ ut7vQ9gFxIHIfE526gVIlHUomwr6JGU=
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">SITES Data Portal</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">SITES data portalen</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">SITES Data Portal</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.fieldsites.se/</md:OrganizationURL>
+    <md:OrganizationDisplayName xml:lang="sv">SITES data portalen</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.fieldsites.se/en-GB</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.fieldsites.se/sv-SE</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Oleg</md:GivenName>
     <md:SurName>Mirzov</md:SurName>
     <md:EmailAddress>mailto:oleg.mirzov@nateko.lu.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Holger</md:GivenName>
+    <md:SurName>Villwock</md:SurName>
+    <md:EmailAddress>mailto:holger.villwock@slu.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jonathan</md:GivenName>
+    <md:SurName>Thiry</md:SurName>
+    <md:EmailAddress>mailto:jonathan.thiry@nateko.lu.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index a2227ca6..4b86291b 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -38,7 +38,6 @@
   <xi:include href="swamid-2.0/artisan-idp-proxy.sunet.se-sp.xml"/>
   <xi:include href="swamid-2.0/assemblage.dc.kau.se.xml"/>
   <xi:include href="swamid-2.0/assurance.release-check.swamid.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/auth.fieldsites.se-saml-cpauth.xml"/>
   <xi:include href="swamid-2.0/backweb.antagning.se-hubble-sp.xml"/>
   <xi:include href="swamid-2.0/backweb.demo.antagning.se-hubble-sp.xml"/>
   <xi:include href="swamid-2.0/backweb.hubbletest.antagning.se-hubble-sp.xml"/>