From a645c60e134caef7004745bb4ba562c4a9c199a2 Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 1 Dec 2010 15:39:16 +0000
Subject: [PATCH] NIHVIVO-1368 fill the loginName field with a
 previously-supplied value, if one exists.

---
 .../webapp/controller/edit/Authenticate.java  | 23 +++++++++++++++----
 .../freemarker/widgets/widget-login.ftl       |  2 +-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java
index a2e7f9e5a..c1b112990 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java
@@ -70,7 +70,7 @@ public class Authenticate extends VitroHttpServlet {
 		try {
 			// Where do we stand in the process?
 			State entryState = getCurrentLoginState(vreq);
-			log.debug("State on entry: " + entryState);
+			dumpStateToLog("entry", entryState, vreq);
 
 			// Act on any input.
 			switch (entryState) {
@@ -90,7 +90,7 @@ public class Authenticate extends VitroHttpServlet {
 
 			// Now where do we stand?
 			State exitState = getCurrentLoginState(vreq);
-			log.debug("State on exit: " + exitState);
+			dumpStateToLog("exit", exitState, vreq);
 
 			// Send them on their way.
 			switch (exitState) {
@@ -162,10 +162,10 @@ public class Authenticate extends VitroHttpServlet {
 		if ((username == null) || username.isEmpty()) {
 			bean.setMessage(Message.NO_USERNAME);
 			return;
-		} else {
-			bean.setUsername(username);
 		}
 
+		bean.setUsername(username);
+
 		User user = getAuthenticator(request).getUserByUsername(username);
 		log.trace("User is " + (user == null ? "null" : user.getURI()));
 
@@ -420,6 +420,21 @@ public class Authenticate extends VitroHttpServlet {
 		jenaOntModel.getBaseModel().notifyEvent(event);
 	}
 
+	private void dumpStateToLog(String label, State state, VitroRequest vreq) {
+		log.debug("State on " + label + ": " + state);
+		
+		if (log.isTraceEnabled()) {
+			log.trace("Status bean on " + label + ": "
+					+ LoginStatusBean.getBean(vreq));
+
+			LoginProcessBean processBean = null;
+			if (LoginProcessBean.isBean(vreq)) {
+				processBean = LoginProcessBean.getBean(vreq);
+			}
+			log.trace("Process bean on " + label + ": " + processBean);
+		}
+	}
+
 	@Override
 	public void doGet(HttpServletRequest request, HttpServletResponse response)
 			throws IOException, ServletException {
diff --git a/webapp/web/templates/freemarker/widgets/widget-login.ftl b/webapp/web/templates/freemarker/widgets/widget-login.ftl
index 404b32cc1..9e7dea658 100644
--- a/webapp/web/templates/freemarker/widgets/widget-login.ftl
+++ b/webapp/web/templates/freemarker/widgets/widget-login.ftl
@@ -36,7 +36,7 @@
        
         <form  role="form" id="login-form" action="${formAction}" method="post" name="login-form" />
             <label for="email">Email</label>
-            <input class="text-field" name="loginName" id="loginName" type="text" required />
+            <input class="text-field" name="loginName" id="loginName" type="text" value="${loginName!}" required />
 
             <label for="password">Password</label>
             <input class="text-field" name="loginPassword" id="password" type="password" required />