SWAMIDOPS-8072 New version of metadata med rätt entityid

1 files changed, 10 insertions, 3 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 f9321981..103f92de 100644
--- a/swamid-2.0/idp.suni.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp.suni.se-adfs-services-trust.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://idp.suni.se/adfs/services/trust">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.suni.se/adfs/services/trust">
   <RoleDescriptor xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706" xsi:type="fed:ApplicationServiceType" protocolSupportEnumeration="http://docs.oasis-open.org/ws-sx/ws-trust/200512 http://schemas.xmlsoap.org/ws/2005/02/trust http://docs.oasis-open.org/wsfed/federation/200706" ServiceDisplayName="idp.suni.se">
     <KeyDescriptor use="encryption">
       <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
@@ -265,6 +265,9 @@
         <auth:DisplayName>Alternate Login ID</auth:DisplayName>
         <auth:Description>Alternate login ID of the user</auth:Description>
       </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/norEduPersonNIN" Optional="true">
+        <auth:DisplayName>norEduPersonNIN</auth:DisplayName>
+      </auth:ClaimType>
     </fed:ClaimTypesRequested>
     <fed:TargetScopes>
       <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
@@ -283,7 +286,7 @@
         <Address>https://idp.suni.se/adfs/ls/</Address>
       </EndpointReference>
       <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
-        <Address>http://idp.suni.se/adfs/services/trust</Address>
+        <Address>https://idp.suni.se/adfs/services/trust</Address>
       </EndpointReference>
     </fed:TargetScopes>
     <fed:ApplicationServiceEndpoint>
@@ -566,6 +569,9 @@
         <auth:DisplayName>Alternate Login ID</auth:DisplayName>
         <auth:Description>Alternate login ID of the user</auth:Description>
       </auth:ClaimType>
+      <auth:ClaimType xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706" Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/norEduPersonNIN" Optional="true">
+        <auth:DisplayName>norEduPersonNIN</auth:DisplayName>
+      </auth:ClaimType>
     </fed:ClaimTypesOffered>
     <fed:SecurityTokenServiceEndpoint>
       <EndpointReference xmlns="http://www.w3.org/2005/08/addressing">
@@ -701,6 +707,7 @@
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/claims/authnmethodsreferences" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Authentication Methods References"/>
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/2012/01/requestcontext/claims/client-request-id" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Client Request ID"/>
     <Attribute xmlns="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://schemas.microsoft.com/ws/2013/11/alternateloginid" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Alternate Login ID"/>
+    <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"/>
   </IDPSSODescriptor>
   <Organization>
     <OrganizationName xml:lang="sv-SE">Södertörns högskola</OrganizationName>
@@ -710,7 +717,7 @@
   <ContactPerson contactType="support">
     <GivenName>Tomas</GivenName>
     <SurName>Legat</SurName>
-    <EmailAddress>mailto:tomas.legat@sh.se</EmailAddress>
+    <EmailAddress>tomas.legat@sh.se</EmailAddress>
     <TelephoneNumber>08-6084000</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>