resolves SWAMIDOPS-7179

1 files changed, 7 insertions, 14 deletions

diff --git a/swamid-2.0/idp.suni.se-adfs-services-trust.xml b/swamid-2.0/idp.suni.se-adfs-services-trust.xml
index 7e227514..d40ee030 100644
--- a/swamid-2.0/idp.suni.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp.suni.se-adfs-services-trust.xml
@@ -10,21 +10,14 @@
     <KeyDescriptor use="encryption">
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <X509Data>
-          <X509Certificate>MIIC2DCCAcCgAwIBAgIQfGgWejIsCo5L/IsIvUnfcTANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1BREZTIEVuY3J5cHRpb24gLSBpZHAuc3VuaS5zZTAeFw0xMzAzMjQyMTExNTZaFw0xNDAzMjQyMTExNTZaMCgxJjAkBgNVBAMTHUFERlMgRW5jcnlwdGlvbiAtIGlkcC5zdW5pLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtxEBzEGsdM1UkdKbL1M/nEhXxR1/i8Sw2DP6uZML2iO6t1yfZHoxiziC1BCcF/3inQm/mvPgU3KlwHERjdmZMbfvD8vI+yyflWqB6iHsk2RylpdW0ROrQda//P/YYkElQJUQVvZQ7wZMrtsSQNwwnhXx/O5mIU3au4aoQznefJ/kTx4lpwCR7xnQpyjFtFrrNn/ublE5OC8vBQ/iQOQKWSWmOuChSjEX8IhKngKO+eU0xGdipH09OjnQspcdET3cXFuwnv6ul6PDLo3FDo6NquAjwyV+g1c7ogbOm404aHI3fKaQ6vq6wow3clTO14w+i7aT8KJZ/5TykIygRfTLsQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBQ2XltMk5K0e21pRs9e1qT+V7KeDdVqVQ0p9UOi2WAYgGkaWp04QJXFp5WssSRKIFZqzoGx4bZChuVIYa38jJT8FJMEWvv3aIIwsfbjHgJQeGHO+2K14/gjbrJe/HCbhNpzE/SSqLqvZ2FnhPuBACpOKeD74M194tQ528GGuHFJkVvXJDUxZaY9fD67WQxdI8wvXayGu+VXHh1xqWixdd0QZHHTqPY1W49zJWpVdmyU9FGfRgMY3pA0W2aVpNfeB2J1XdWQJvKVA/pEj43qJgbzO2eIgDnTMn8UvuDDwMZksQOXW478UVpOqZ/StQCUgF1A5L7bYzRX7HySX6+lcNN</X509Certificate>
+          <X509Certificate>MIIEYzCCA0ugAwIBAgIQZHPOuyVURJge5wdOa1kfEzANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTE0MDMxMTAwMDAwMFoXDTE3MDQzMDIzNTk1OVowOTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRQwEgYDVQQDEwtpZHAuc3VuaS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMB0RS/jwsLGyG8DB8mIqgzTcEwb5P/7y9beizxgvlJc3dbauQogUIwZtsUn2q7qbV5h66c68bl8fi+JhtJYWXXu/rA9d6i4cQSdKXJPTMAss2ZobcRmnVSDrj0ZTJ5+JBe+fuYI3cDaLy5rGz9PcgxqINcjM4wW01pKjnZzrVqbJ1dsSfWzU5AkMwVS+10UjQYLSeHg/2PAgfDRovqTqTfMpF16DXwx+OcqnJY2yN0JcpVggQNOE9a4y9L6qe0SYbbTlqbrlrz/X+0e4gQ8sjif4PdB4AXVb0dP9D3pjfLXim8leVarNN2knOPZmmFYWKEBNS5KHlkSnHFIyNFof3UCAwEAAaOCAWgwggFkMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBT3yAYidugFyhjhPMuNGIu6pA6hfzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFgYDVR0RBA8wDYILaWRwLnN1bmkuc2UwDQYJKoZIhvcNAQEFBQADggEBAAdzCLw9BLbfTeYy0fLEWT4nrH5oBJ7G1Si/vdf8dvQlUF8gbtizKI/c7871smaPHge5DdwUwY9vqRkRrzeiM/mGUSgUCkN56Y17eTzmbvRQ6EPjpiZ/dlTBycedq2TmnxLM1VbO9Xx3rK07YdSdDn+y+n4GNJlL4NCED/rVDdsEBoy+nmztLLolGztRZPv8xLbCdE2vompEA7sbDsBv4hNCjsuVSCt8FlX3rz3uqaaNcG3r5tQ8VHtrQ7xCCRScSfoYoI0sgwE5BtThwDAi1arLp/tHN5Ow500zq4m8LZEdmGBZ56M3kIHEn1n8UOUlCMWYtYw1rIhX9FYyT8Dn2bY=</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
     <KeyDescriptor use="signing">
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
         <X509Data>
-          <X509Certificate>MIIC0jCCAbqgAwIBAgIQS8lPCdCO1YRGywJDFutE7zANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDExpBREZTIFNpZ25pbmcgLSBpZHAuc3VuaS5zZTAeFw0xMjA0MTMxMDAwMTBaFw0xMzA0MTMxMDAwMTBaMCUxIzAhBgNVBAMTGkFERlMgU2lnbmluZyAtIGlkcC5zdW5pLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2foZBCMRnGb97/oTHmcto6B9L08sfhtjxxQY8+RazXgAAxRReFpyLqrHFMFFpyQjzSzd+0DW//quGT+YxVk9YrluO+M2LFEt6FwZsxQxiPfoPwNp6AvvU0v4JfVs6Og6xrrYQF3xTa1+cwdpWqBhZPOUZ4Y0r7WmjEBgWi5lW657/GaddcqE+HUh4JFcus9SaQmPFyftRAdUIt5hgoThse3cPjDrAmcs0XQCN2/ay5Q6+ewJbNNR3pJzPnJ7WTRCLV6MDC9Zzc9M2yBWUsgLXC6GoWLsxjqrFliVIzSH27D9JwVRDPmXexQA0rxdxNjPQn0WtiOcW653sKi4c9A1wwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCB6XWG5AKYx7eLFpEDhwjUjGCxeZrC6j5ldZT0eypmFQJ41IBCNODcDDpL1olVpV05lQMdAsWGdCUHwBkIc6NPd/4YbSbkgyX+GKOMNX16VetsNJoxFppYwhchj4NgFZTMB36e4xmnYwjPJDzTbARohdfhpk3JtjwovwX2TSF8fINfjT+KN/ayEail5JCCIBtJqCM8IVFNKO7pWL2u1xkZpAh740r72z7VuwMx5Ig8/+xc5h7j3ftiz2LsBtkgqiimUhy0WjzTmYuV2VRZsvYVdwBmOSRvh3/hNqwpjXADkGMwgvjuRMgf45/k4cjWTyCVCG0KmJ0DamJf5RAO44Jj</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC0jCCAbqgAwIBAgIQEiQ+IOJRR4pMJkHVO0fu1jANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDExpBREZTIFNpZ25pbmcgLSBpZHAuc3VuaS5zZTAeFw0xMzAzMjQyMTExNThaFw0xNDAzMjQyMTExNThaMCUxIzAhBgNVBAMTGkFERlMgU2lnbmluZyAtIGlkcC5zdW5pLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqdy1oGrdKaRc5n08MdGT71Xb2qfvxE9vdLw2BBzi9g8MwuP6e59hHJJWYFthNHDGvFjEZZlXkcI1b+pOlq+XtAbIoYxEmJUQjWoRJZopN87DVB8Bf1i65cuaqlEmpfyR3C88Ic/8kXo1np/Tllzr3mezxoF65QWrwc6nw8lwanyLeoJ9BlfqHnaniyw7rPXdH3BSzIN26bmZ58U9nn+OIhxYs4NqLHAeY7lSC08R8A4JYCr0C0M3yZMCDHCs4B3PD6OpkQcnFf/vyb3wLtNpMKMLhKMQIYu5+N/gUPUvoVQEFdC5+neWYJl6kOED5isNnaSYVfr8/wr656ME20r+kwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAVIAMscei0J9p/yC7b9Y3F1pOxoEufy114w5TzxO5RQ5aS1CmqVg5yd66vExrGrYuJx52Rla6LSlJ/Fg/Uxv6RAesyUGIaTNYbE6uyfFnuh78I9BrM1M3fjOxhmV79Y3XwOtl0yzY8qW4z/O3Z/5J8VkLQ4crSEN9IkmHLTE5bU4PlFMi3PGR3zm/vkePAgjQ6FWY864l/zHmZbycDp90gJBBNVStYoNbAZsYAZEvGGZwyzOtly1C59KEZOXt+NUyStWKcPe7lbANh1Umu+ucrlDYZEqVTdAjcf2Q3NfK99aFlz1SZdV4tugyLEKsZtOgOeOadohiy9j1+3rojS0JR</X509Certificate>
+          <X509Certificate>MIIEYzCCA0ugAwIBAgIQZHPOuyVURJge5wdOa1kfEzANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTE0MDMxMTAwMDAwMFoXDTE3MDQzMDIzNTk1OVowOTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRQwEgYDVQQDEwtpZHAuc3VuaS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMB0RS/jwsLGyG8DB8mIqgzTcEwb5P/7y9beizxgvlJc3dbauQogUIwZtsUn2q7qbV5h66c68bl8fi+JhtJYWXXu/rA9d6i4cQSdKXJPTMAss2ZobcRmnVSDrj0ZTJ5+JBe+fuYI3cDaLy5rGz9PcgxqINcjM4wW01pKjnZzrVqbJ1dsSfWzU5AkMwVS+10UjQYLSeHg/2PAgfDRovqTqTfMpF16DXwx+OcqnJY2yN0JcpVggQNOE9a4y9L6qe0SYbbTlqbrlrz/X+0e4gQ8sjif4PdB4AXVb0dP9D3pjfLXim8leVarNN2knOPZmmFYWKEBNS5KHlkSnHFIyNFof3UCAwEAAaOCAWgwggFkMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBT3yAYidugFyhjhPMuNGIu6pA6hfzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFgYDVR0RBA8wDYILaWRwLnN1bmkuc2UwDQYJKoZIhvcNAQEFBQADggEBAAdzCLw9BLbfTeYy0fLEWT4nrH5oBJ7G1Si/vdf8dvQlUF8gbtizKI/c7871smaPHge5DdwUwY9vqRkRrzeiM/mGUSgUCkN56Y17eTzmbvRQ6EPjpiZ/dlTBycedq2TmnxLM1VbO9Xx3rK07YdSdDn+y+n4GNJlL4NCED/rVDdsEBoy+nmztLLolGztRZPv8xLbCdE2vompEA7sbDsBv4hNCjsuVSCt8FlX3rz3uqaaNcG3r5tQ8VHtrQ7xCCRScSfoYoI0sgwE5BtThwDAi1arLp/tHN5Ow500zq4m8LZEdmGBZ56M3kIHEn1n8UOUlCMWYtYw1rIhX9FYyT8Dn2bY=</X509Certificate>
         </X509Data>
       </KeyInfo>
     </KeyDescriptor>
@@ -33,11 +26,12 @@
     <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.suni.se/adfs/ls/"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.suni.se/adfs/ls/"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.suni.se/adfs/ls/"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.suni.se/adfs/ls/"/>
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/eduPersonEntitlement" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/displayname" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Display Name"/>
+    <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/initials" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Initials"/>
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/norEduPersonNIN" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="norEduPersonNIN"/>
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/socialSecurityNumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="socialSecurityNumber"/>
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/socialSecurityNumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="socialSecurityNumberNotOld"/>
@@ -65,10 +59,9 @@
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.xmlsoap.org/claims/eduPersonScopedAffiliation" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
   </IDPSSODescriptor>
   <Organization>
-    <OrganizationName xml:lang="sv">Södertörns högskola</OrganizationName>
-    <OrganizationDisplayName xml:lang="sv">Södertörns Högskola</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Södertörns Högskola</OrganizationDisplayName>
-    <OrganizationURL xml:lang="sv">http://www.sh.se/</OrganizationURL>
+    <OrganizationName xml:lang="sv-SE">Södertörns högskola</OrganizationName>
+    <OrganizationDisplayName xml:lang="sv-SE">Södertörns högskola</OrganizationDisplayName>
+    <OrganizationURL xml:lang="sv-SE">http://www.sh.se/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
     <GivenName>Tomas</GivenName>