Resolved SWAMID-224

1 files changed, 30 insertions, 31 deletions

diff --git a/swamid-2.0/www.scalable-learning.com.xml b/swamid-2.0/www.scalable-learning.com.xml
index 1c6ae3ef..46fa4778 100644
--- a/swamid-2.0/www.scalable-learning.com.xml
+++ b/swamid-2.0/www.scalable-learning.com.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xrd="http://docs.oasis-open.org/ns/xri/xrd-1.0" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.scalable-learning.com" xml:base="swamid-2.0/.xml">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xrd="http://docs.oasis-open.org/ns/xri/xrd-1.0" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.scalable-learning.com">
   <md:Extensions>
     <mdattr:EntityAttributes>
       <saml:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
@@ -13,10 +13,10 @@
     <md:Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">Scalable Learning</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Blended learning platform for interactive in-class and online education.</mdui:Description>
-        <mdui:Description xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.scalable-learning.com/home/about</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.scalable-learning.com/#/privacy</mdui:PrivacyStatementURL>
+        <mdui:Description xml:lang="en">Blended learning platform for interactive in-class and online education. </mdui:Description>
+        <mdui:Description xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning. </mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.scalable-learning.com/home/about</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.scalable-learning.com/home/privacy</mdui:PrivacyStatementURL>
         <mdui:Logo xml:lang="en" height="100" width="100">https://www.scalable-learning.com/assets/logo-a66e557f3f93b4d5195033ba1a1527a3.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
@@ -24,35 +24,34 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-MIIDjDCCAnQCCQDSdbONyCFCGzANBgkqhkiG9w0BAQsFADCBhzELMAkGA1UEBhMC
-U0UxEjAQBgNVBAgMCVNUT0NLSE9MTTESMBAGA1UEBwwJU1RPQ0tIT0xNMRowGAYD
-VQQKDBFTQ0FMQUJMRSBMRUFSTklORzEQMA4GA1UECwwHc2NhbGVhcjEiMCAGA1UE
-AwwZd3d3LnNjYWxhYmxlLWxlYXJuaW5nLmNvbTAeFw0xNjAyMjUxMTEyNTdaFw0x
-NzAyMjQxMTEyNTdaMIGHMQswCQYDVQQGEwJTRTESMBAGA1UECAwJU1RPQ0tIT0xN
-MRIwEAYDVQQHDAlTVE9DS0hPTE0xGjAYBgNVBAoMEVNDQUxBQkxFIExFQVJOSU5H
-MRAwDgYDVQQLDAdzY2FsZWFyMSIwIAYDVQQDDBl3d3cuc2NhbGFibGUtbGVhcm5p
-bmcuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAut3wWgrigP2C
-L8zUlER/YfTtQCvExXxCBRLtP9pxHb4q3a+PkJvy+xUD4TZhtLu5rdMqXvSfrCCC
-K6FO+MoLmVu7BzANl2RW37FUtkc2oyDD79hVwyZkcb3VSbYe3v4E5wwyEr40EZuY
-VK8VvGXZWCj1jw3wWfqU8Y683luDvRq7B7dlRDkzV5NfuOhk0Ghq3WoqPX//1+TE
-hWrFXJw/t/KVIatePcOFUj2q8+fvAfVgJ/RS7NKCqbmcm7dYR38QptWXpK22FDEh
-9QNFFXLahLK/g52rMdonlL646TgXfHcYdK3h9uHkh0d2cTaNFUisho/RQ706GwOV
-rrmfMjKXrQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQA7/7Yl+dZf7anFmHFq7xl7
-WoiyNJcdzMxvGjAtaaxUUGKNCV44AMdnLJGXeDmbmWXOE+2o3WD54+1mUKLeKsXe
-TbQ6mXOEetXBHzuWxOY0a65s4mCGyqPgHTQ5bLSz/h+GLjRvMqLoXtOXhj3Woa1f
-LHep+dsEIbVdze3uxztVBzOKqkfKsT1eqSrW+z5ir72bkVf0F7rMjPh3VnGgoL65
-wYSrKz3rhwVbkf0eGJeoICGCV6Gbtc/b4D/GXx9VhWA+ni5WBJn4wE0Gy7dvr1If
-fkpQngoTsFRNOJ5gwo2dZAVQYRBKXToI2elv5qW151WnpWn9gdQjaW7zzKSkPDRf
-</ds:X509Certificate>
+      MIIDjDCCAnQCCQDC601Yku4SKjANBgkqhkiG9w0BAQsFADCBhzELMAkGA1UEBhMC
+      U0UxEjAQBgNVBAgMCVNUT0NLSE9MTTESMBAGA1UEBwwJU1RPQ0tIT0xNMRowGAYD
+      VQQKDBFTQ0FMQUJMRSBMRUFSTklORzEQMA4GA1UECwwHc2NhbGVhcjEiMCAGA1UE
+      AwwZd3d3LnNjYWxhYmxlLWxlYXJuaW5nLmNvbTAeFw0xNzA5MjcwODI0MjVaFw0x
+      ODA5MjcwODI0MjVaMIGHMQswCQYDVQQGEwJTRTESMBAGA1UECAwJU1RPQ0tIT0xN
+      MRIwEAYDVQQHDAlTVE9DS0hPTE0xGjAYBgNVBAoMEVNDQUxBQkxFIExFQVJOSU5H
+      MRAwDgYDVQQLDAdzY2FsZWFyMSIwIAYDVQQDDBl3d3cuc2NhbGFibGUtbGVhcm5p
+      bmcuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAut3wWgrigP2C
+      L8zUlER/YfTtQCvExXxCBRLtP9pxHb4q3a+PkJvy+xUD4TZhtLu5rdMqXvSfrCCC
+      K6FO+MoLmVu7BzANl2RW37FUtkc2oyDD79hVwyZkcb3VSbYe3v4E5wwyEr40EZuY
+      VK8VvGXZWCj1jw3wWfqU8Y683luDvRq7B7dlRDkzV5NfuOhk0Ghq3WoqPX//1+TE
+      hWrFXJw/t/KVIatePcOFUj2q8+fvAfVgJ/RS7NKCqbmcm7dYR38QptWXpK22FDEh
+      9QNFFXLahLK/g52rMdonlL646TgXfHcYdK3h9uHkh0d2cTaNFUisho/RQ706GwOV
+      rrmfMjKXrQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQApgL+f6XwcQ13PWxKJemFK
+      QqIZQbsADqK+KOlpOWFO8aNbvDd5WsFgvQEbKwbPeGIfp7Nb0/5gtabWBwOs0dA3
+      3llHJeGzWH5NMr0R/2+N8z2XY50Z8a5w38vSvgHwFgJh1HEsFhx5zFOsHjSYI3PD
+      +vyDMuhCPe1UhoTeffBmmH97Oe1DBVlzDwTD9ZdcAaiGB9XbaLP6gDFuBjU/GBd3
+      Ngbl+ZAuTcGpNzUYfuNC9MXHcn3/SKyl5NnL4wEe1j9sL0JnDYwvSTlnovqOVHY4
+      nCMfHlNippwYPVOHUqOxAnKoInWIxsKiyQkFsjG/sbIwCc7rTwpdn9jtTAnvZkPn
+     </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <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" index="1" Location="https://www.scalable-learning.com/saml/consume"/>
     <md:AttributeConsumingService index="0">
       <md:ServiceName xml:lang="en">Scalable Learning</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Blended learning platform for interactive in-class and online education.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Blended learning platform for interactive in-class and online education. </md:ServiceDescription>
       <md:ServiceDescription xml:lang="sv">Plattform för stöd av "flipped classroom" utbildning. </md:ServiceDescription>
       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"/>
       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" Name="urn:oid:0.9.2342.19200300.100.1.3"/>
@@ -65,14 +64,14 @@ fkpQngoTsFRNOJ5gwo2dZAVQYRBKXToI2elv5qW151WnpWn9gdQjaW7zzKSkPDRf
   <md:Organization>
     <md:OrganizationName xml:lang="en">Scalable Learning</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Scalable Learning</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.scalable-learning.com</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">www.scalable-learning.com</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>ScalableLearning</Company>
-    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
+    <EmailAddress>support@scalable-learning.com</EmailAddress>
   </md:ContactPerson>
   <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>ScalableLearning</Company>
-    <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
+    <EmailAddress>support@scalable-learning.com</EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>