SWAMID-2327 Updated swamid-2.grandid.com

2 files changed, 26 insertions, 17 deletions

diff --git a/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-proxysp-swamid-retendo.xml b/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-ProxySP-Swamid-retendo.xml
index 328fc3b5..48dbdd40 100644
--- a/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-proxysp-swamid-retendo.xml
+++ b/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-ProxySP-Swamid-retendo.xml
@@ -1,27 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://swamid-2.grandid.com/module.php/saml/sp/metadata.php/ProxySP-Swamid-retendo">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-01-10T12:00:25Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes>
       <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue xsi:type="xs:string">http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
-    <idpdisc:DiscoveryResponse index="1" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://swamid-2.grandid.com/module.php/saml/sp/discoresp.php"/>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-01-10T12:00:25Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
   </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol" AuthnRequestsSigned="false">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol" AuthnRequestsSigned="true">
     <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="sv">Retendo AB</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">Retendo AB</mdui:DisplayName>
         <mdui:Description xml:lang="sv">En tjänst för webbaserade projektsystem</mdui:Description>
         <mdui:Description xml:lang="en">A service for web based project systems</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.retendo.se/om-oss</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.retendo.se/om-oss</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" width="500" height="132">https://cdn.grandid.com/retendo/retendo_logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" width="500" height="132">https://cdn.grandid.com/retendo/retendo_logo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">https://retendo.com/sv/om_oss/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://retendo.com/en/about_us/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://retendo.com/sv/privacy_policy/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://retendo.com/en/privacy_policy/</mdui:PrivacyStatementURL>
+        <mdui:Logo width="350" height="108" xml:lang="sv">https://retendo.com/wp-content/uploads/logo_retendo.png</mdui:Logo>
+        <mdui:Logo width="350" height="108" xml:lang="en">https://retendo.com/wp-content/uploads/logo_retendo.png</mdui:Logo>
       </mdui:UIInfo>
       <idpdisc:DiscoveryResponse index="1" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://swamid-2.grandid.com/module.php/saml/sp/discoresp.php"/>
     </md:Extensions>
@@ -40,6 +41,7 @@
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid-2.grandid.com/module.php/saml/sp/saml2-logout.php/ProxySP-Swamid-retendo"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid-2.grandid.com/module.php/saml/sp/saml2-acs.php/ProxySP-Swamid-retendo" index="0"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://swamid-2.grandid.com/module.php/saml/sp/saml1-acs.php/ProxySP-Swamid-retendo" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swamid-2.grandid.com/module.php/saml/sp/saml2-acs.php/ProxySP-Swamid-retendo" index="2"/>
@@ -48,25 +50,33 @@
   <md:Organization>
     <md:OrganizationName xml:lang="sv">Retendo AB</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Retendo AB</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="sv">Retendo AB</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Retendo AB</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.retendo.com/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">https://www.retendo.com/sv/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://www.retendo.com/en/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="administrative">
     <md:Company>Retendo AB</md:Company>
-    <md:GivenName>Jens</md:GivenName>
-    <md:SurName>Apelgren</md:SurName>
+    <md:GivenName>Operations</md:GivenName>
     <md:EmailAddress>mailto:support@retendo.com</md:EmailAddress>
     <md:TelephoneNumber>08-20 41 80</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="support">
     <md:Company>Retendo AB</md:Company>
-    <md:GivenName>Jens</md:GivenName>
-    <md:SurName>Apelgren</md:SurName>
+    <md:GivenName>IT Support</md:GivenName>
     <md:EmailAddress>mailto:support@retendo.com</md:EmailAddress>
     <md:TelephoneNumber>08-20 41 80</md:TelephoneNumber>
   </md:ContactPerson>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Svensk E-identitet / GrandID Support</md:GivenName>
-    <md:EmailAddress>mailto:support@grandid.com</md:EmailAddress>
+    <md:Company>Svensk E-identitet</md:Company>
+    <md:GivenName>Svensk E-identitet</md:GivenName>
+    <md:EmailAddress>mailto:support@e-identitet.se</md:EmailAddress>
+    <md:TelephoneNumber>08-20 41 80</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:Company>Retendo AB</md:Company>
+    <md:GivenName>Retendo AB</md:GivenName>
+    <md:EmailAddress>mailto:support@retendo.com</md:EmailAddress>
+    <md:TelephoneNumber>08-20 41 80</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index b891154a..2d6d3d78 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -414,7 +414,6 @@
   <xi:include href="swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-ProxySP-Swamid-retendo.xml"/>
   <xi:include href="swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-gu-swamid-draftit.xml"/>
   <xi:include href="swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-proxysp-swamid-btj.xml"/>
-  <xi:include href="swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-proxysp-swamid-retendo.xml"/>
   <xi:include href="swamid-2.0/tds.test.srv.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/te-id.statenssc.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/tentaadmin-demo.test.umu.se-shibboleth.xml"/>