From 96c928fbc03a619dd3c65b195674337d90b9d959 Mon Sep 17 00:00:00 2001
From: "R. van Vliet" <58777767+rvanvliet@users.noreply.github.com>
Date: Thu, 18 Jan 2024 13:32:36 +0100
Subject: [PATCH 1/4] Update login.ivdnt.org.xml

Added Logo and ServiceName
---
 metadata/login.ivdnt.org.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/metadata/login.ivdnt.org.xml b/metadata/login.ivdnt.org.xml
index 5eafda7..ea6cfc6 100644
--- a/metadata/login.ivdnt.org.xml
+++ b/metadata/login.ivdnt.org.xml
@@ -42,6 +42,7 @@
             <mdui:Description xml:lang="nl">Instituut voor de Nederlandse taal (INT) diensten en projecten verbonden aan het CLARIN project</mdui:Description>
             <mdui:InformationURL xml:lang="nl">https://ivdnt.org/onderzoek-projecten/clarin</mdui:InformationURL>
             <mdui:InformationURL xml:lang="en">http://portal.clarin.inl.nl</mdui:InformationURL>
+            <mdui:Logo height="9" width="16">https://portal.clarin.inl.nl/img/logo-clarin.png</mdui:Logo>
             <mdui:PrivacyStatementURL xml:lang="en">https://portal.clarin.inl.nl/doc/Data_Protection_Code_of_Conduct_INT.pdf</mdui:PrivacyStatementURL>
          </mdui:UIInfo>
          <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
@@ -53,6 +54,18 @@
 <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ivdnt.org/realms/shibboleth/broker/saml/endpoint"/>
 <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
 <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ivdnt.org/realms/shibboleth/broker/saml/endpoint" index="1" isDefault="true"/>
+         <md:ServiceName xml:lang="en">Login</md:ServiceName>
+         <md:ServiceDescription xml:lang="en">Login service</md:ServiceDescription>
+         <!-- SAML1 -->
+         <md:RequestedAttribute FriendlyName="eduPersonPrincipalName"
+                                Name="urn:mace:dir:attribute-def:eduPersonPrincipalName"
+                                NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
+                                isRequired="true"/>
+         <!-- SAML2 -->
+         <md:RequestedAttribute FriendlyName="eduPersonPrincipalName"
+                                Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"
+                                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                                isRequired="true"/>
 </md:SPSSODescriptor>
    <md:Organization>
       <md:OrganizationName xml:lang="nl">Instituut voor de Nederlandse Taal (INT)</md:OrganizationName>

From e7ef87e56eb9ae94f4cd92fbf5a78ba6188918fc Mon Sep 17 00:00:00 2001
From: "R. van Vliet" <58777767+rvanvliet@users.noreply.github.com>
Date: Tue, 23 Jan 2024 13:41:17 +0100
Subject: [PATCH 2/4] Update login.ivdnt.org.xml

added Logo and Attribute
---
 metadata/login.ivdnt.org.xml | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/metadata/login.ivdnt.org.xml b/metadata/login.ivdnt.org.xml
index ea6cfc6..092e68f 100644
--- a/metadata/login.ivdnt.org.xml
+++ b/metadata/login.ivdnt.org.xml
@@ -42,8 +42,8 @@
             <mdui:Description xml:lang="nl">Instituut voor de Nederlandse taal (INT) diensten en projecten verbonden aan het CLARIN project</mdui:Description>
             <mdui:InformationURL xml:lang="nl">https://ivdnt.org/onderzoek-projecten/clarin</mdui:InformationURL>
             <mdui:InformationURL xml:lang="en">http://portal.clarin.inl.nl</mdui:InformationURL>
-            <mdui:Logo height="9" width="16">https://portal.clarin.inl.nl/img/logo-clarin.png</mdui:Logo>
             <mdui:PrivacyStatementURL xml:lang="en">https://portal.clarin.inl.nl/doc/Data_Protection_Code_of_Conduct_INT.pdf</mdui:PrivacyStatementURL>
+            <mdui:Logo width="165" height="80">https://portal.clarin.inl.nl/img/logo-clarin.png</mdui:Logo>
          </mdui:UIInfo>
          <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
                                 Location="https://portal.clarin.inl.nl/Shibboleth.sso/Login"/>
@@ -54,18 +54,15 @@
 <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ivdnt.org/realms/shibboleth/broker/saml/endpoint"/>
 <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
 <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ivdnt.org/realms/shibboleth/broker/saml/endpoint" index="1" isDefault="true"/>
-         <md:ServiceName xml:lang="en">Login</md:ServiceName>
-         <md:ServiceDescription xml:lang="en">Login service</md:ServiceDescription>
-         <!-- SAML1 -->
-         <md:RequestedAttribute FriendlyName="eduPersonPrincipalName"
-                                Name="urn:mace:dir:attribute-def:eduPersonPrincipalName"
-                                NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"
-                                isRequired="true"/>
-         <!-- SAML2 -->
-         <md:RequestedAttribute FriendlyName="eduPersonPrincipalName"
-                                Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"
-                                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-                                isRequired="true"/>
+            <md:ServiceName xml:lang="en">INT</md:ServiceName>
+            <md:ServiceName xml:lang="nl">INT</md:ServiceName>
+            <md:ServiceDescription xml:lang="en">INT login - CLARIN services</md:ServiceDescription>
+            <md:ServiceDescription xml:lang="nl">INT login - CLARIN diensten</md:ServiceDescription>
+            <md:RequestedAttribute isRequired="true" FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+            <md:RequestedAttribute isRequired="false" FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+            <md:RequestedAttribute isRequired="false" FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+            <md:RequestedAttribute isRequired="false" FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+            <md:RequestedAttribute isRequired="false" FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
 </md:SPSSODescriptor>
    <md:Organization>
       <md:OrganizationName xml:lang="nl">Instituut voor de Nederlandse Taal (INT)</md:OrganizationName>

From 0b8a027b7f69cc2fb79a0bce342260258be1033b Mon Sep 17 00:00:00 2001
From: "R. van Vliet" <58777767+rvanvliet@users.noreply.github.com>
Date: Tue, 23 Jan 2024 13:56:40 +0100
Subject: [PATCH 3/4] Update login.ivdnt.org.xml

removed shibboleth references, not needed.
---
 metadata/login.ivdnt.org.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/metadata/login.ivdnt.org.xml b/metadata/login.ivdnt.org.xml
index 092e68f..8077700 100644
--- a/metadata/login.ivdnt.org.xml
+++ b/metadata/login.ivdnt.org.xml
@@ -45,11 +45,6 @@
             <mdui:PrivacyStatementURL xml:lang="en">https://portal.clarin.inl.nl/doc/Data_Protection_Code_of_Conduct_INT.pdf</mdui:PrivacyStatementURL>
             <mdui:Logo width="165" height="80">https://portal.clarin.inl.nl/img/logo-clarin.png</mdui:Logo>
          </mdui:UIInfo>
-         <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init"
-                                Location="https://portal.clarin.inl.nl/Shibboleth.sso/Login"/>
-         <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-                                    Location="https://portal.clarin.inl.nl/Shibboleth.sso/Login"
-                                    index="1"/>
       </md:Extensions>
 <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ivdnt.org/realms/shibboleth/broker/saml/endpoint"/>
 <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>

From 2439ae48f72206e87e705ae6e6af581c27dffd59 Mon Sep 17 00:00:00 2001
From: "R. van Vliet" <58777767+rvanvliet@users.noreply.github.com>
Date: Tue, 23 Jan 2024 14:21:06 +0100
Subject: [PATCH 4/4] Update login.ivdnt.org.xml

fixed opening/closing tag
---
 metadata/login.ivdnt.org.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/metadata/login.ivdnt.org.xml b/metadata/login.ivdnt.org.xml
index 8077700..a835255 100644
--- a/metadata/login.ivdnt.org.xml
+++ b/metadata/login.ivdnt.org.xml
@@ -49,6 +49,7 @@
 <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ivdnt.org/realms/shibboleth/broker/saml/endpoint"/>
 <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
 <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.ivdnt.org/realms/shibboleth/broker/saml/endpoint" index="1" isDefault="true"/>
+  <md:AttributeConsumingService index="1">
             <md:ServiceName xml:lang="en">INT</md:ServiceName>
             <md:ServiceName xml:lang="nl">INT</md:ServiceName>
             <md:ServiceDescription xml:lang="en">INT login - CLARIN services</md:ServiceDescription>
@@ -58,6 +59,7 @@
             <md:RequestedAttribute isRequired="false" FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
             <md:RequestedAttribute isRequired="false" FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
             <md:RequestedAttribute isRequired="false" FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+   </md:AttributeConsumingService>
 </md:SPSSODescriptor>
    <md:Organization>
       <md:OrganizationName xml:lang="nl">Instituut voor de Nederlandse Taal (INT)</md:OrganizationName>