Author: tchemit Date: 2014-05-16 14:26:45 +0200 (Fri, 16 May 2014) New Revision: 3960 Url: http://forge.chorem.org/projects/pollen/repository/revisions/3960 Log: add a create entity ref after login Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/AuthApi.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/bean/CreateBeanRef.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/AuthService.java Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/AuthApi.java =================================================================== --- trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/AuthApi.java 2014-05-16 12:26:05 UTC (rev 3959) +++ trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/AuthApi.java 2014-05-16 12:26:45 UTC (rev 3960) @@ -23,7 +23,7 @@ * #L% */ -import org.chorem.pollen.persistence.entity.SessionToken; +import org.chorem.pollen.services.bean.CreateBeanRef; import org.chorem.pollen.services.service.AuthService; import org.chorem.pollen.services.service.security.PollenAuthenticationException; import org.debux.webmotion.server.WebMotionController; @@ -36,10 +36,10 @@ */ public class AuthApi extends WebMotionController { - public SessionToken login(AuthService authService, String login, String password, Boolean rememberMe) throws PollenAuthenticationException { + public CreateBeanRef login(AuthService authService, String login, String password, Boolean rememberMe) throws PollenAuthenticationException { - SessionToken sessionToken = authService.login(login, password, rememberMe); - return sessionToken; + CreateBeanRef principalRef = authService.login(login, password, rememberMe); + return principalRef; } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/bean/CreateBeanRef.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/bean/CreateBeanRef.java 2014-05-16 12:26:05 UTC (rev 3959) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/bean/CreateBeanRef.java 2014-05-16 12:26:45 UTC (rev 3960) @@ -6,6 +6,7 @@ import org.chorem.pollen.persistence.entity.FavoriteListMember; import org.chorem.pollen.persistence.entity.Poll; import org.chorem.pollen.persistence.entity.PollenUser; +import org.chorem.pollen.persistence.entity.SessionToken; import org.chorem.pollen.persistence.entity.Vote; import org.chorem.pollen.persistence.entity.VoterList; @@ -72,6 +73,11 @@ setId(result.getTopiaId()); } + public void fromEntity(SessionToken result) { + setId(result.getTopiaId()); + setPermission(result.getPollenToken().getToken()); + } + public String getId() { return id; } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/AuthService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/AuthService.java 2014-05-16 12:26:05 UTC (rev 3959) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/AuthService.java 2014-05-16 12:26:45 UTC (rev 3960) @@ -29,6 +29,7 @@ import org.chorem.pollen.persistence.entity.PollenToken; import org.chorem.pollen.persistence.entity.PollenUser; import org.chorem.pollen.persistence.entity.SessionToken; +import org.chorem.pollen.services.bean.CreateBeanRef; import org.chorem.pollen.services.service.security.PollenAuthenticationException; /** @@ -42,7 +43,7 @@ /** Logger. */ private static final Log log = LogFactory.getLog(AuthService.class); - public SessionToken login(String login, String password, Boolean rememberMe) throws PollenAuthenticationException { + public CreateBeanRef login(String login, String password, Boolean rememberMe) throws PollenAuthenticationException { // Log-in user PollenUser user = getSecurityService().login(login, password, rememberMe); @@ -56,7 +57,9 @@ SessionToken.PROPERTY_POLLEN_USER, user); commit(); - return sessionToken; + CreateBeanRef createBeanRef = new CreateBeanRef(); + createBeanRef.fromEntity(sessionToken); + return createBeanRef; }