Author: mfortun Date: 2011-05-20 18:05:23 +0200 (Fri, 20 May 2011) New Revision: 910 Url: http://nuiton.org/repositories/revision/wikitty/910 Log: * correct redirection's url Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java 2011-05-20 14:15:51 UTC (rev 909) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java 2011-05-20 16:05:23 UTC (rev 910) @@ -25,18 +25,21 @@ import java.util.Map; +import javax.servlet.ServletRequest; +import javax.servlet.http.HttpServletRequest; + import org.apache.struts2.ServletActionContext; +import org.apache.struts2.interceptor.RequestAware; import org.nuiton.wikitty.entities.WikittyUser; +import org.nuiton.wikitty.publication.action.PublicationActionView; - import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.AbstractInterceptor; - /** - * Interceptor used to redirect a non-logged user if he tries to access a page - * where logging is mandatory + * Interceptor used to redirect a non-logged user if he tries to access a page + * where logging is mandatory */ public class LoginInterceptor extends AbstractInterceptor { private static final long serialVersionUID = -7520186185205372272L; @@ -50,27 +53,30 @@ public void setError(String error) { this.error = error; } - - + @Override public String intercept(ActionInvocation invocation) throws Exception { + Map<String, Object> session = ActionContext.getContext().getSession(); - - WikittyPublicationSession pubSession = WikittyPublicationSession.getWikittyPublicationSession(session); + + WikittyPublicationSession pubSession = WikittyPublicationSession + .getWikittyPublicationSession(session); WikittyUser user = pubSession.getUser(); String result = null; - + + HttpServletRequest request = ServletActionContext.getRequest(); - //If the user isn't logged in + error = request.getContextPath() + error ; + error += "?success="+request.getServletPath(); + + // If the user isn't logged in if (user == null) { ServletActionContext.getResponse().sendRedirect(error); } else { - result = invocation.invoke(); + result = invocation.invoke(); } - + return result; } - - }