Author: mfortun Date: 2011-05-24 17:46:53 +0200 (Tue, 24 May 2011) New Revision: 918 Url: http://nuiton.org/repositories/revision/wikitty/918 Log: * change session storage/login mechanism Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogin.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java 2011-05-24 15:43:26 UTC (rev 917) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java 2011-05-24 15:46:53 UTC (rev 918) @@ -21,17 +21,17 @@ static final private String WIKITTY_PUBLICATION_SESSION_KEY = WikittyPublicationSession.class .getSimpleName(); - protected WikittyPublicationProxy proxy; - protected WikittyUser user; + protected String securityToken = null; + transient protected WikittyUser user; + transient protected WikittyPublicationProxy proxy = null; public WikittyPublicationSession() { - //proxy = WikittyPublicationProxy.getInstance(null); - proxy = WikittyPublicationProxy.getInstanceWithFallback(null); - + proxy = WikittyPublicationProxy.getInstance(null); } /** * remove wikittypublicationSession from the httpsession + * * @param session */ static public void invalidate(Map<String, Object> session) { @@ -67,10 +67,23 @@ return result; } + public void login(String login, String password) { + + getProxy().login(login, password); + securityToken = getProxy().getSecurityToken(); + user = getProxy().getUser(); + + } + public WikittyPublicationProxy getProxy() { + if (proxy == null) { + proxy = WikittyPublicationProxy.getInstance(securityToken); + } return proxy; + } + public WikittyUser getUser() { return user; } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogin.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogin.java 2011-05-24 15:43:26 UTC (rev 917) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionLogin.java 2011-05-24 15:46:53 UTC (rev 918) @@ -25,9 +25,8 @@ package org.nuiton.wikitty.publication.action; import org.nuiton.util.StringUtil; -import org.nuiton.wikitty.entities.WikittyUser; -import org.nuiton.wikitty.publication.WikittyPublicationProxy; + /** * Class used as an action login, call the login method on the proxy with * login/password pass threw the login form @@ -93,21 +92,11 @@ try { - WikittyPublicationProxy proxy = getWikittyPublicationSession() - .getProxy(); + getWikittyPublicationSession().login(login, md5); + result = SUCCESS; - // Try to log a wikitty user - proxy.login(login, md5); - - WikittyUser user = proxy.getLoggedInUser(); - // check if a user is logged - if (user != null) { - getWikittyPublicationSession().setUser(user); - result = SUCCESS; - } } catch (Exception e) { // TODO mfortun-2011-05-12 handle exception due to wrong - // login/password e.printStackTrace(); } }