From f08b0ebc6b47d92eb5ff8f7369f62830e6de43a5 Mon Sep 17 00:00:00 2001
From: milanmajchrak <90026355+milanmajchrak@users.noreply.github.com>
Date: Mon, 18 Mar 2024 15:14:03 +0100
Subject: [PATCH] Updated shibboleth cfg properties (firstname, lastname,
 netid, email) (#558)

* Updated shibboleth cfg properties (firstname, lastname, netid, email)

* Keep vanilla shib headers for the integration tests
---
 dspace-api/src/test/data/dspaceFolder/config/local.cfg | 4 ++++
 dspace/config/modules/authentication-shibboleth.cfg    | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dspace-api/src/test/data/dspaceFolder/config/local.cfg b/dspace-api/src/test/data/dspaceFolder/config/local.cfg
index 8a9decfa3318..a842905c53ab 100644
--- a/dspace-api/src/test/data/dspaceFolder/config/local.cfg
+++ b/dspace-api/src/test/data/dspaceFolder/config/local.cfg
@@ -219,6 +219,10 @@ featured.service.teitok.description = A web-based platform for viewing, creating
 
 
 ##### Shibboleth #####
+authentication-shibboleth.netid-header = SHIB-NETID
+authentication-shibboleth.email-header = SHIB-MAIL
+authentication-shibboleth.firstname-header = SHIB-GIVENNAME
+authentication-shibboleth.lastname-header = SHIB-SURNAME
 # Turn off the discofeed, it is allowed by default
 shibboleth.discofeed.allowed = false
 # File where is DiscoJuiceFeed response
diff --git a/dspace/config/modules/authentication-shibboleth.cfg b/dspace/config/modules/authentication-shibboleth.cfg
index 4034d7e2c326..7e176f71b718 100644
--- a/dspace/config/modules/authentication-shibboleth.cfg
+++ b/dspace/config/modules/authentication-shibboleth.cfg
@@ -90,8 +90,8 @@ authentication-shibboleth.lazysession.secure = true
 
 # Authentication headers for Mail, NetID, and Tomcat's Remote User.
 # Supply all parameters possible.
-authentication-shibboleth.netid-header = SHIB-NETID
-authentication-shibboleth.email-header = SHIB-MAIL
+authentication-shibboleth.netid-header = eppn
+authentication-shibboleth.email-header = mail
 authentication-shibboleth.email-use-tomcat-remote-user = false
 
 # Should we allow new users to be registered automatically?
@@ -127,8 +127,8 @@ authentication-shibboleth.sword.compatibility = false
 
 # Metadata Headers
 # Shibboleth-based headers for the first and last name attirbutes
-authentication-shibboleth.firstname-header = SHIB-GIVENNAME
-authentication-shibboleth.lastname-header = SHIB-SURNAME
+authentication-shibboleth.firstname-header = givenName
+authentication-shibboleth.lastname-header = sn
 
 # Additional user attributes mapping, multiple attributes may be stored
 # for each user. The left side is the Shibboleth-based metadata Header