From cab3bfe9b1655ede52d23b71addae40b066dda81 Mon Sep 17 00:00:00 2001
From: j2blake <j2blake@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 1 Jun 2011 19:16:18 +0000
Subject: [PATCH] NIHVIVO-2279 On external auth, the HTTP header holds the
 externalAuthId -- there is no username any more.

---
 .../authenticate/ExternalAuthHelper.java         | 16 ++++++++--------
 .../authenticate/FakeExternalAuthController.java |  2 +-
 .../authenticate/LoginExternalAuthReturn.java    |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ExternalAuthHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ExternalAuthHelper.java
index 481649ddd..74168a2a3 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ExternalAuthHelper.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ExternalAuthHelper.java
@@ -34,8 +34,8 @@ public class ExternalAuthHelper {
 	/** This configuration property points to the external authorization server. */
 	private static final String PROPERTY_EXTERNAL_AUTH_SERVER_URL = "externalAuth.serverUrl";
 
-	/** This configuration property says which HTTP header holds the username. */
-	public static final String PROPERTY_EXTERNAL_AUTH_USERNAME_HEADER = "externalAuth.netIdHeaderName";
+	/** This configuration property says which HTTP header holds the auth ID. */
+	public static final String PROPERTY_EXTERNAL_AUTH_ID_HEADER = "externalAuth.netIdHeaderName";
 
 	// ----------------------------------------------------------------------
 	// static methods
@@ -82,7 +82,7 @@ public class ExternalAuthHelper {
 		String externalAuthServerUrl = ConfigurationProperties.getBean(ctx)
 				.getProperty(PROPERTY_EXTERNAL_AUTH_SERVER_URL);
 		String externalAuthHeaderName = ConfigurationProperties.getBean(ctx)
-				.getProperty(PROPERTY_EXTERNAL_AUTH_USERNAME_HEADER);
+				.getProperty(PROPERTY_EXTERNAL_AUTH_ID_HEADER);
 
 		return new ExternalAuthHelper(externalAuthServerUrl,
 				externalAuthHeaderName);
@@ -134,7 +134,7 @@ public class ExternalAuthHelper {
 		}
 	}
 
-	public String getExternalUsername(HttpServletRequest request) {
+	public String getExternalAuthId(HttpServletRequest request) {
 		if (request == null) {
 			log.error("request is null.");
 			return null;
@@ -143,13 +143,13 @@ public class ExternalAuthHelper {
 		if (externalAuthHeaderName == null) {
 			log.error("User asked for external authentication, "
 					+ "but deploy.properties doesn't contain a value for '"
-					+ PROPERTY_EXTERNAL_AUTH_USERNAME_HEADER + "'");
+					+ PROPERTY_EXTERNAL_AUTH_ID_HEADER + "'");
 			return null;
 		}
 
-		String username = request.getHeader(externalAuthHeaderName);
-		log.debug("username=" + username);
-		return username;
+		String externalAuthId = request.getHeader(externalAuthHeaderName);
+		log.debug("externalAuthId=" + externalAuthId);
+		return externalAuthId;
 	}
 
 	@Override
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/FakeExternalAuthController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/FakeExternalAuthController.java
index 829209ee1..fd1efd039 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/FakeExternalAuthController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/FakeExternalAuthController.java
@@ -117,7 +117,7 @@ public class FakeExternalAuthController extends FreemarkerHttpServlet {
 		}
 
 		@Override
-		public String getExternalUsername(HttpServletRequest request) {
+		public String getExternalAuthId(HttpServletRequest request) {
 			log.debug("external username is '" + username + "'");
 			return username;
 		}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthReturn.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthReturn.java
index 085005edd..eea0f21e0 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthReturn.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthReturn.java
@@ -40,8 +40,8 @@ public class LoginExternalAuthReturn extends BaseLoginServlet {
 	@Override
 	protected void doPost(HttpServletRequest req, HttpServletResponse resp)
 			throws ServletException, IOException {
-		String username = ExternalAuthHelper.getHelper(req)
-				.getExternalUsername(req);
+		String username = ExternalAuthHelper.getHelper(req).getExternalAuthId(
+				req);
 		List<String> associatedUris = getAuthenticator(req)
 				.getAssociatedIndividualUris(username);