From 2ad521e9dac826979f1eee9fcb0b14ab83ecbb38 Mon Sep 17 00:00:00 2001
From: Ben <mbgross@wustl.edu>
Date: Tue, 6 Apr 2021 02:44:53 -0600
Subject: [PATCH] Bugfix for redirecting user to home page after login (#221)

https://jira.lyrasis.org/browse/VIVO-1736
---
 .../authenticate/LoginRedirector.java         | 35 ++++++-------------
 1 file changed, 10 insertions(+), 25 deletions(-)

diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginRedirector.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginRedirector.java
index ffc18f805..00cc6f054 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginRedirector.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginRedirector.java
@@ -23,6 +23,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
 import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
 import edu.cornell.mannlib.vitro.webapp.i18n.I18n;
 import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
 
 /**
  * A user has just completed the login process. What page do we direct them to?
@@ -76,7 +77,7 @@ public class LoginRedirector {
 
 		if (!canSeeSiteAdminPage()) {
 			log.debug("User not recognized. Going to application home.");
-			return getApplicationHomePageUrl();
+			return UrlBuilder.getHomeUrl();
 		}
 
 		if (isLoginPage(afterLoginPage)) {
@@ -87,20 +88,20 @@ public class LoginRedirector {
 			return afterLoginPage;
 		} else {
 			log.debug("Don't know what to do. Go home.");
-			return getApplicationHomePageUrl();
+			return UrlBuilder.getHomeUrl();
 		}
 	}
 
 	public String getRedirectionUriForCancellingUser() {
 		if (isLoginPage(afterLoginPage)) {
 			log.debug("Coming from /login. Going to home.");
-			return getApplicationHomePageUrl();
+			return UrlBuilder.getHomeUrl();
 		} else if (null != afterLoginPage) {
 			log.debug("Returning to requested page: " + afterLoginPage);
 			return afterLoginPage;
 		} else {
 			log.debug("Don't know what to do. Go home.");
-			return getApplicationHomePageUrl();
+			return UrlBuilder.getHomeUrl();
 		}
 	}
 
@@ -108,10 +109,12 @@ public class LoginRedirector {
 			throws IOException {
 		try {
 			DisplayMessage.setMessage(request, assembleWelcomeMessage());
-			response.sendRedirect(getRedirectionUriForLoggedInUser());
+			String redirectUrl = getRedirectionUriForLoggedInUser();
+			log.debug("Sending redirect to path: " + redirectUrl);
+			response.sendRedirect(redirectUrl);
 		} catch (IOException e) {
 			log.debug("Problem with re-direction", e);
-			response.sendRedirect(getApplicationHomePageUrl());
+			response.sendRedirect(UrlBuilder.getHomeUrl());
 		}
 	}
 
@@ -143,7 +146,7 @@ public class LoginRedirector {
 			response.sendRedirect(getRedirectionUriForCancellingUser());
 		} catch (IOException e) {
 			log.debug("Problem with re-direction", e);
-			response.sendRedirect(getApplicationHomePageUrl());
+			response.sendRedirect(UrlBuilder.getHomeUrl());
 		}
 	}
 
@@ -174,22 +177,4 @@ public class LoginRedirector {
 			throw new IllegalStateException("No UTF-8 encoding? Really?", e);
 		}
 	}
-
-	/**
-	 * The application home page can be overridden by an attribute in the
-	 * ServletContext. Further, it can either be an absolute URL, or it can be
-	 * relative to the application. Weird.
-	 */
-	private String getApplicationHomePageUrl() {
-		String contextRedirect = (String) session.getServletContext()
-				.getAttribute("postLoginRequest");
-		if (contextRedirect != null) {
-			if (contextRedirect.indexOf(":") == -1) {
-				return request.getContextPath() + contextRedirect;
-			} else {
-				return contextRedirect;
-			}
-		}
-		return request.getContextPath();
-	}
 }