Resolves SWAMIDOPS-247

3 files changed, 9 insertions, 9 deletions

diff --git a/swamid-2.0/idp-test.swamid.se-nren-sp.xml b/swamid-2.0/idp-test.swamid.se-nren-sp.xml
index 9a68a74d..e59a7a8a 100644
--- a/swamid-2.0/idp-test.swamid.se-nren-sp.xml
+++ b/swamid-2.0/idp-test.swamid.se-nren-sp.xml
@@ -30,7 +30,7 @@ lRS6D+EhwPVb3rpK1CowCB8cN4hIn+m4WxsFMkufkmu51HbL6nhfvEY9HLJj10LP
 Do5vsMJ0pY+BEQxuaXeRLTgyY3u0FQXaKHIYCj0Tg+t7rT3FT4Gdn/vBgkG9c9Kf
 Uj8tu3Uh/5Xwpr9Tfura9rTVp5vYgzbXNwsowjacTip/HSoekd01nNMCGyWa73AG
 4rXuPM2bMzCWglmDUO4OqmYvXe2D6IKr6vF+AmPy9vPlHePxNhipiwdo54h5Xg==
-          </ns5:X509Certificate>        
+          </ns5:X509Certificate>
         </ns5:X509Data>
       </ns5:KeyInfo>
     </ns0:KeyDescriptor>
diff --git a/swamid-2.0/s2s.cloudapp.net-Saml2-proxy_saml2_backend.xml b/swamid-2.0/s2s.ifmsa.se-saml2-proxy_saml2_backend.xml
index ad97bd74..1f199d36 100644
--- a/swamid-2.0/s2s.cloudapp.net-Saml2-proxy_saml2_backend.xml
+++ b/swamid-2.0/s2s.ifmsa.se-saml2-proxy_saml2_backend.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ns0:EntityDescriptor xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="http://www.w3.org/2000/09/xmldsig#" xmlns:ns2="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" entityID="https://s2s.cloudapp.net/Saml2/proxy_saml2_backend.xml">
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="http://www.w3.org/2000/09/xmldsig#" xmlns:ns2="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" entityID="https://s2s.ifmsa.se/Saml2/proxy_saml2_backend.xml">
   <ns0:Extensions>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
@@ -10,7 +10,7 @@
   </ns0:Extensions>
   <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <ns0:Extensions>
-      <ns2:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://s2s.cloudapp.net/Saml2/disco" index="1"/>
+      <ns2:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://s2s.ifmsa.se/Saml2/disco" index="1"/>
     </ns0:Extensions>
     <ns0:KeyDescriptor use="signing">
       <ns1:KeyInfo>
@@ -38,9 +38,9 @@ zJkE6G+EYWU=
         </ns1:X509Data>
       </ns1:KeyInfo>
     </ns0:KeyDescriptor>
-    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://s2s.cloudapp.net/Saml2/acs/post" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://s2s.cloudapp.net/Saml2/acs/redirect" index="2"/>
+    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</ns0:NameIDFormat>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://s2s.ifmsa.se/Saml2/acs/post" index="1"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://s2s.ifmsa.se/Saml2/acs/redirect" index="2"/>
   </ns0:SPSSODescriptor>
   <ns0:Organization>
     <ns0:OrganizationName xml:lang="en">IFMSA-Sweden</ns0:OrganizationName>
@@ -49,10 +49,10 @@ zJkE6G+EYWU=
   </ns0:Organization>
   <ns0:ContactPerson contactType="technical">
     <ns0:GivenName>Admin</ns0:GivenName>
-    <ns0:EmailAddress>admin@ifmsa.se</ns0:EmailAddress>
+    <ns0:EmailAddress>mailto:admin@ifmsa.se</ns0:EmailAddress>
   </ns0:ContactPerson>
   <ns0:ContactPerson contactType="support">
     <ns0:GivenName>Admin</ns0:GivenName>
-    <ns0:EmailAddress>admin@ifmsa.se</ns0:EmailAddress>
+    <ns0:EmailAddress>mailto:admin@ifmsa.se</ns0:EmailAddress>
   </ns0:ContactPerson>
 </ns0:EntityDescriptor>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 1fe71031..af898278 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -45,5 +45,5 @@
   <xi:include href="swamid-2.0/sso.ifmsa.se-login-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/38caledon.ddns.net-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sp.haikom.com-saml-kph-test.xml"/>
-  <xi:include href="swamid-2.0/s2s.cloudapp.net-Saml2-proxy_saml2_backend.xml"/>
+  <xi:include href="swamid-2.0/s2s.ifmsa.se-saml2-proxy_saml2_backend.xml"/>
 </EntitiesDescriptor>