Author: fdesbois Date: 2010-05-04 15:22:03 +0200 (Tue, 04 May 2010) New Revision: 2984 Url: http://chorem.org/repositories/revision/pollen/2984 Log: rename main method for redirection if user is not allowed (or not authenticated) Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/AbstractAuthenticationFilter.java Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/AbstractAuthenticationFilter.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/AbstractAuthenticationFilter.java 2010-05-04 10:11:20 UTC (rev 2983) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/AbstractAuthenticationFilter.java 2010-05-04 13:22:03 UTC (rev 2984) @@ -11,15 +11,11 @@ import org.apache.tapestry5.services.PageRenderLinkSource; import org.apache.tapestry5.services.PageRenderRequestParameters; import org.apache.tapestry5.services.Response; -import org.chorem.pollen.entity.UserAccount; -import org.chorem.pollen.ui.data.RequiresAuthentication; -import org.chorem.pollen.ui.pages.Connexion; -import org.chorem.pollen.ui.pages.ErrorPage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * RequiresAuthenticationFilter + * AbstractAuthenticationFilter * * Created: 3 mai 2010 * @@ -68,7 +64,7 @@ logger.trace("handleComponentEvent"); } - if (dispatchedToLoginPage(parameters.getActivePageName())) { + if (redirectUnauthorizedUser(parameters.getActivePageName())) { return; } @@ -84,14 +80,15 @@ logger.trace("handlePageRender"); } - if (dispatchedToLoginPage(parameters.getLogicalPageName())) { + if (redirectUnauthorizedUser(parameters.getLogicalPageName())) { return; } handler.handlePageRender(parameters); } - private boolean dispatchedToLoginPage(String pageName) throws IOException { + protected boolean redirectUnauthorizedUser(String pageName) + throws IOException { Component page = componentSource.getPage(pageName); @@ -108,7 +105,6 @@ return false; } -// Class<?> redirectPage = Connexion.class; AuthenticationRedirect redirectType = AuthenticationRedirect.CONNEXION; if (serviceAuthentication.isUserConnected()) { @@ -123,7 +119,6 @@ return false; } -// redirectPage = ErrorPage.class; redirectType = AuthenticationRedirect.NOT_ALLOWED; }