From 6fe5ac59a97e76215a63527c1625f6767dd596db Mon Sep 17 00:00:00 2001 From: jeb228 Date: Tue, 23 Nov 2010 21:05:52 +0000 Subject: [PATCH] NIHVIVO-1207 If deploy.properties does not contain a value for externalAuth.serverUrl, default to /loginExternalAuthReturn -- that way the users need only configure that as a protected page. --- .../controller/authenticate/ExternalAuthHelper.java | 9 ++++----- .../controller/authenticate/LoginExternalAuthSetup.java | 6 +++--- 2 files changed, 7 insertions(+), 8 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 bd71e1a6b..6f47d1f34 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 @@ -13,7 +13,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.ConfigurationProperties; -import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; /** * Capture the properties used by the External Authorization system, and use @@ -109,10 +108,10 @@ public class ExternalAuthHelper { } if (externalAuthServerUrl == null) { - log.error("User asked for external authentication, " - + "but deploy.properties doesn't contain a value for '" - + PROPERTY_EXTERNAL_AUTH_SERVER_URL + "'"); - return null; + log.debug("deploy.properties doesn't contain a value for '" + + PROPERTY_EXTERNAL_AUTH_SERVER_URL + + "' -- sending directly to '" + returnUrl + "'"); + return returnUrl; } try { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthSetup.java index a3c8bdfb7..a05710934 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthSetup.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthSetup.java @@ -48,14 +48,14 @@ public class LoginExternalAuthSetup extends BaseLoginServlet { LoginProcessBean.State.LOGGING_IN); String returnUrl = buildReturnUrl(req); - ExternalAuthHelper helper = ExternalAuthHelper.getHelper(req); - String redirectUrl = helper.buildExternalAuthRedirectUrl(returnUrl); + String redirectUrl = ExternalAuthHelper.getHelper(req) + .buildExternalAuthRedirectUrl(returnUrl); if (redirectUrl == null) { complainAndReturnToReferrer(req, resp, ATTRIBUTE_REFERRER, MESSAGE_LOGIN_FAILED); } - + resp.sendRedirect(redirectUrl); }