- Pollen-commits - mailman.cloud.codelutin.com

01/01: fixes #1029 Migrate to Git.
by Chorem.org scm May 18, 2014

May 18, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch master in repository Pollen. commit 326e44c321eb81f9c40335fb3f40d64f170bc8b1 Author: tchemit <chemit(a)codelutin.com> Date: Sun May 18 16:51:09 2014 +0200 fixes #1029 Migrate to Git. --- pom.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index c5fa4ff..b1d2760 100644 --- a/pom.xml +++ b/pom.xml @@ -140,11 +140,11 @@ </modules> <scm> - <connection>scm:svn:https://svn.chorem.org/pollen/trunk</connection> + <connection>scm:git:http://git.chorem.org/pollen.git</connection> <developerConnection> - scm:svn:https://svn.chorem.org/pollen/trunk + scm:git:https://git.chorem.org/pollen.git </developerConnection> - <url>http://forge.chorem.org/repositories/browse/pollen/trunk</url> + <url>http://forge.chorem.org/projects/pollen/repository</url> </scm> <distributionManagement> <site> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: fis #1029 Migrate to Git.
by Chorem.org scm May 18, 2014

May 18, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch master in repository Pollen. commit e3d8c6af849fea370f083e92c753e68df8af7330 Author: tchemit <chemit(a)codelutin.com> Date: Sun May 18 16:45:33 2014 +0200 fis #1029 Migrate to Git. --- pom.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pom.xml b/pom.xml index ef2d9db..a4d66e0 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ <module>pollen-ui-angular</module> </modules> - <sc m> + <sc m> <connection>scm:git:http://git.chorem.org/pollen.git</connection> <developerConnection> scm:git:https://git.chorem.org/pollen.git -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: fis #1029 Migrate to Git.
by Chorem.org scm May 18, 2014

May 18, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch master in repository Pollen. commit 4dac5d4b3702639b299ca79a3ea04e55a0559ca5 Author: tchemit <chemit(a)codelutin.com> Date: Sun May 18 16:40:44 2014 +0200 fis #1029 Migrate to Git. --- pom.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pom.xml b/pom.xml index b1d2760..ef2d9db 100644 --- a/pom.xml +++ b/pom.xml @@ -139,7 +139,7 @@ <module>pollen-ui-angular</module> </modules> - <scm> + <sc m> <connection>scm:git:http://git.chorem.org/pollen.git</connection> <developerConnection> scm:git:https://git.chorem.org/pollen.git -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: fis #1029 Migrate to Git.
by Chorem.org scm May 18, 2014

May 18, 2014

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch master in repository Pollen. commit 16b2135c4ea0b2f970a8fa3040c8746be6f7004c Author: tchemit <chemit(a)codelutin.com> Date: Sun May 18 16:35:38 2014 +0200 fis #1029 Migrate to Git. --- pom.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index c5fa4ff..b1d2760 100644 --- a/pom.xml +++ b/pom.xml @@ -140,11 +140,11 @@ </modules> <scm> - <connection>scm:svn:https://svn.chorem.org/pollen/trunk</connection> + <connection>scm:git:http://git.chorem.org/pollen.git</connection> <developerConnection> - scm:svn:https://svn.chorem.org/pollen/trunk + scm:git:https://git.chorem.org/pollen.git </developerConnection> - <url>http://forge.chorem.org/repositories/browse/pollen/trunk</url> + <url>http://forge.chorem.org/projects/pollen/repository</url> </scm> <distributionManagement> <site> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

r3963 - in trunk: pollen-rest-api/src/main/java/org/chorem/pollen/rest/api src/site/rst
by tchemit＠users.chorem.org May 16, 2014

May 16, 2014

Author: tchemit Date: 2014-05-16 15:49:52 +0200 (Fri, 16 May 2014) New Revision: 3963 Url: http://forge.chorem.org/projects/pollen/repository/revisions/3963 Log: review login workflow Removed: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiSession.java Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestContext.java trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiUtil.java trunk/src/site/rst/restApi.rst Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestContext.java =================================================================== --- trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestContext.java 2014-05-16 13:14:22 UTC (rev 3962) +++ trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestContext.java 2014-05-16 13:49:52 UTC (rev 3963) @@ -48,8 +48,6 @@ httpContext.getRequest().setAttribute(REQUEST_POLLEN_REQUEST_CONTEXT, serviceContext); } - protected PollenRestApiSession session; - protected PollenServiceContext serviceContext; public void setServiceContext(PollenServiceContext serviceContext) { @@ -68,14 +66,6 @@ return serviceContext.getSecurityContext(); } - public PollenRestApiSession getSession() { - return session; - } - - public void setSession(PollenRestApiSession session) { - this.session = session; - } - public SecurityService getSecurityService() { return serviceContext.newService(SecurityService.class); } Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java =================================================================== --- trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java 2014-05-16 13:14:22 UTC (rev 3962) +++ trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java 2014-05-16 13:49:52 UTC (rev 3963) @@ -23,6 +23,8 @@ * #L% */ +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.pollen.persistence.PollenPersistenceContext; import org.chorem.pollen.persistence.entity.PollenPrincipal; import org.chorem.pollen.persistence.entity.SessionToken; @@ -37,6 +39,7 @@ import org.debux.webmotion.server.render.RenderStatus; import javax.servlet.http.HttpServletResponse; +import java.util.Locale; import java.util.Map; /** @@ -47,8 +50,13 @@ */ public class PollenRestApiRequestFilter extends WebMotionFilter { + public static final String REQUEST_SESSION_TOKEN_PARAMETER = "sessionToken"; + public static final String REQUEST_PERMISSION_PARAMETER = "permission"; + /** Logger. */ + private static final Log log = LogFactory.getLog(PollenRestApiRequestFilter.class); + public void inject(Call call, HttpContext context) throws PollenInvalidSessionTokenException { PollenRestApiRequestContext requestContext = prepareRequestContext(context); @@ -75,7 +83,7 @@ protected PollenRestApiRequestContext prepareRequestContext(HttpContext context) throws PollenInvalidSessionTokenException { - PollenRestApiSession session = PollenRestApiSession.getSession(context); + Locale locale = getUSerLocale(context); PollenRestApiApplicationContext applicationContext = PollenRestApiApplicationContext.getApplicationContext(context.getServletContext()); @@ -83,12 +91,10 @@ PollenPersistenceContext persistenceContext = PollenTopiaTransactionFilter.getPersistenceContext(context.getRequest()); - PollenServiceContext serviceContext = - applicationContext.newServiceContext(persistenceContext, session.getLocale()); + PollenServiceContext serviceContext = applicationContext.newServiceContext(persistenceContext, locale); PollenRestApiRequestContext requestContext = new PollenRestApiRequestContext(); requestContext.setServiceContext(serviceContext); - requestContext.setSession(session); PollenSecurityContext securityContext = createSecurityContext(context, applicationContext, requestContext); requestContext.setSecurityContext(securityContext); @@ -99,20 +105,22 @@ } - protected PollenSecurityContext createSecurityContext(HttpContext httpContext, + protected PollenSecurityContext createSecurityContext(HttpContext context, PollenRestApiApplicationContext applicationContext, PollenRestApiRequestContext requestContext) throws PollenInvalidSessionTokenException { SecurityService securityService = requestContext.getSecurityService(); - // --- get session token (from session) --- // - PollenRestApiSession session = requestContext.getSession(); - String authParam = session.getSessionToken(); + // --- get session token (from request parameters) --- // + Map<String, String[]> parameters = context.getParameters(); + String[] strings = parameters.get(REQUEST_SESSION_TOKEN_PARAMETER); + String authParam = strings == null || strings.length < 1 ? null : strings[0]; + SessionToken sessionToken = securityService.getSessionTokenByToken(authParam); // --- get mainPrincipal (from request parameters) --- // - Map<String, String[]> parameters = httpContext.getParameters(); - String[] strings = parameters.get(REQUEST_PERMISSION_PARAMETER); + parameters = context.getParameters(); + strings = parameters.get(REQUEST_PERMISSION_PARAMETER); String credentialParam = strings == null || strings.length < 1 ? null : strings[0]; PollenPrincipal mainPrincipal = securityService.getPollenPrincipalByPermissionToken(credentialParam); @@ -124,4 +132,26 @@ } + protected Locale getUSerLocale(HttpContext context) { + String language = context.getHeader(HttpContext.HEADER_LANGUAGE); + + if (log.isInfoEnabled()) { + log.info("Found Accept-Language: " + language); + } + + if (language == null) { + + language = Locale.FRENCH.getLanguage(); + + if (log.isInfoEnabled()) { + log.info("Use default language: " + language); + } + + } + + Locale locale = new Locale(language); + return locale; + + } + } Deleted: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiSession.java =================================================================== --- trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiSession.java 2014-05-16 13:14:22 UTC (rev 3962) +++ trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiSession.java 2014-05-16 13:49:52 UTC (rev 3963) @@ -1,88 +0,0 @@ -package org.chorem.pollen.rest.api; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.debux.webmotion.server.call.CookieManager; -import org.debux.webmotion.server.call.HttpContext; - -import java.io.Serializable; -import java.util.Locale; - -/** - * Created on 5/16/14. - * - * @author Tony Chemit <chemit(a)codelutin.com> - * @since 2.0 - */ -public class PollenRestApiSession implements Serializable { - - private static final long serialVersionUID = 1L; - - /** Logger. */ - private static final Log log = LogFactory.getLog(PollenRestApiSession.class); - - public static final String COOKIE_SESSION = "pollenSession"; - - public static PollenRestApiSession getSession(HttpContext context) { - - CookieManager cookieManager = context.getCookieManager(); - - CookieManager.CookieEntity sessionCookie = cookieManager.get(COOKIE_SESSION); - - if (sessionCookie == null) { - - if (log.isInfoEnabled()) { - log.info("Will create user session."); - } - - PollenRestApiSession session = new PollenRestApiSession(); - - String language = context.getHeader(HttpContext.HEADER_LANGUAGE); - - if (log.isInfoEnabled()) { - log.info("Found Accept-Language: " + language); - } - - if (language == null) { - - language = Locale.FRENCH.getLanguage(); - - if (log.isInfoEnabled()) { - log.info("Use default language: " + language); - } - - } - - Locale locale = new Locale(language); - session.setLocale(locale); - - sessionCookie = cookieManager.create(COOKIE_SESSION, session); - cookieManager.add(sessionCookie); - - } - - PollenRestApiSession session = sessionCookie.getValue(PollenRestApiSession.class); - return session; - - } - - protected Locale locale; - - protected String sessionToken; - - public Locale getLocale() { - return locale; - } - - public void setLocale(Locale locale) { - this.locale = locale; - } - - public String getSessionToken() { - return sessionToken; - } - - public void setSessionToken(String sessionToken) { - this.sessionToken = sessionToken; - } -} Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiUtil.java =================================================================== --- trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiUtil.java 2014-05-16 13:14:22 UTC (rev 3962) +++ trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiUtil.java 2014-05-16 13:49:52 UTC (rev 3963) @@ -7,8 +7,6 @@ import com.fasterxml.jackson.module.afterburner.AfterburnerModule; import com.google.common.collect.Lists; import org.apache.commons.lang3.StringUtils; -import org.chorem.pollen.persistence.entity.SessionToken; -import org.chorem.pollen.services.service.security.PollenSecurityContext; import org.debux.webmotion.server.call.HttpContext; import javax.servlet.http.HttpServletResponse; @@ -68,18 +66,18 @@ response.addHeader(HttpContext.HEADER_ACCESS_CONTROL_ALLOW_ORIGIN, "*"); response.addHeader(HttpContext.HEADER_ACCESS_CONTROL_ALLOW_CREDENTIALS, "true"); - PollenSecurityContext securityContext = requestContext.getSecurityContext(); - SessionToken sessionToken = securityContext.getSessionToken(); - if (sessionToken != null) { +// PollenSecurityContext securityContext = requestContext.getSecurityContext(); +// SessionToken sessionToken = securityContext.getSessionToken(); +// if (sessionToken != null) { +// +// context.getResponse().setHeader(sessionToken.getPollenToken().getToken()); +// +// } else { +// +// context.getResponse().setHeader(requestContext.getSession().setSessionToken(null); +// +// } - requestContext.getSession().setSessionToken(sessionToken.getPollenToken().getToken()); - - } else { - - requestContext.getSession().setSessionToken(null); - - } - } public static void addOptionCorsHeaders(HttpContext context) { Modified: trunk/src/site/rst/restApi.rst =================================================================== --- trunk/src/site/rst/restApi.rst 2014-05-16 13:14:22 UTC (rev 3962) +++ trunk/src/site/rst/restApi.rst 2014-05-16 13:49:52 UTC (rev 3963) @@ -34,7 +34,7 @@ - mandaTory parameter **login** - mandaTory parameter **password** -- optional parameter **remberberMe** +- optional parameter **remberberMe** (TODO) Validation ~~~~~~~~~~ @@ -51,10 +51,8 @@ permission: "Token" } -A cookie named **pollenSession** with this data will be keep this data til you are logout. +You must keep the **permission** value and add it in all your REST queries as the parameter named **sessionToken**. -The cookie will be user for each request To log you in. - GET /v1/lostpassword/{Token} ----------------------------

1 0

r3962 - trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api
by tchemit＠users.chorem.org May 16, 2014

May 16, 2014

Author: tchemit Date: 2014-05-16 15:14:22 +0200 (Fri, 16 May 2014) New Revision: 3962 Url: http://forge.chorem.org/projects/pollen/repository/revisions/3962 Log: use a real session object stored in cookie Added: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiSession.java Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestContext.java trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiUtil.java Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestContext.java =================================================================== --- trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestContext.java 2014-05-16 13:13:49 UTC (rev 3961) +++ trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestContext.java 2014-05-16 13:14:22 UTC (rev 3962) @@ -48,6 +48,8 @@ httpContext.getRequest().setAttribute(REQUEST_POLLEN_REQUEST_CONTEXT, serviceContext); } + protected PollenRestApiSession session; + protected PollenServiceContext serviceContext; public void setServiceContext(PollenServiceContext serviceContext) { @@ -66,6 +68,14 @@ return serviceContext.getSecurityContext(); } + public PollenRestApiSession getSession() { + return session; + } + + public void setSession(PollenRestApiSession session) { + this.session = session; + } + public SecurityService getSecurityService() { return serviceContext.newService(SecurityService.class); } Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java =================================================================== --- trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java 2014-05-16 13:13:49 UTC (rev 3961) +++ trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java 2014-05-16 13:14:22 UTC (rev 3962) @@ -32,13 +32,11 @@ import org.chorem.pollen.services.service.security.SecurityService; import org.debux.webmotion.server.WebMotionFilter; import org.debux.webmotion.server.call.Call; -import org.debux.webmotion.server.call.CookieManager; import org.debux.webmotion.server.call.HttpContext; import org.debux.webmotion.server.render.Render; import org.debux.webmotion.server.render.RenderStatus; import javax.servlet.http.HttpServletResponse; -import java.util.Locale; import java.util.Map; /** @@ -77,18 +75,20 @@ protected PollenRestApiRequestContext prepareRequestContext(HttpContext context) throws PollenInvalidSessionTokenException { + PollenRestApiSession session = PollenRestApiSession.getSession(context); + PollenRestApiApplicationContext applicationContext = PollenRestApiApplicationContext.getApplicationContext(context.getServletContext()); PollenPersistenceContext persistenceContext = PollenTopiaTransactionFilter.getPersistenceContext(context.getRequest()); - //FIXME Reuse user locale PollenServiceContext serviceContext = - applicationContext.newServiceContext(persistenceContext, Locale.FRANCE); + applicationContext.newServiceContext(persistenceContext, session.getLocale()); PollenRestApiRequestContext requestContext = new PollenRestApiRequestContext(); requestContext.setServiceContext(serviceContext); + requestContext.setSession(session); PollenSecurityContext securityContext = createSecurityContext(context, applicationContext, requestContext); requestContext.setSecurityContext(securityContext); @@ -105,9 +105,9 @@ SecurityService securityService = requestContext.getSecurityService(); - // --- get session token (from cookie) --- // - CookieManager.CookieEntity pollenSession = httpContext.getCookieManager().get(PollenRestApiUtil.COOKIE_USER_SESSION); - String authParam = pollenSession == null ? null : pollenSession.getValue(); + // --- get session token (from session) --- // + PollenRestApiSession session = requestContext.getSession(); + String authParam = session.getSessionToken(); SessionToken sessionToken = securityService.getSessionTokenByToken(authParam); // --- get mainPrincipal (from request parameters) --- // Added: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiSession.java =================================================================== --- trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiSession.java (rev 0) +++ trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiSession.java 2014-05-16 13:14:22 UTC (rev 3962) @@ -0,0 +1,88 @@ +package org.chorem.pollen.rest.api; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.debux.webmotion.server.call.CookieManager; +import org.debux.webmotion.server.call.HttpContext; + +import java.io.Serializable; +import java.util.Locale; + +/** + * Created on 5/16/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class PollenRestApiSession implements Serializable { + + private static final long serialVersionUID = 1L; + + /** Logger. */ + private static final Log log = LogFactory.getLog(PollenRestApiSession.class); + + public static final String COOKIE_SESSION = "pollenSession"; + + public static PollenRestApiSession getSession(HttpContext context) { + + CookieManager cookieManager = context.getCookieManager(); + + CookieManager.CookieEntity sessionCookie = cookieManager.get(COOKIE_SESSION); + + if (sessionCookie == null) { + + if (log.isInfoEnabled()) { + log.info("Will create user session."); + } + + PollenRestApiSession session = new PollenRestApiSession(); + + String language = context.getHeader(HttpContext.HEADER_LANGUAGE); + + if (log.isInfoEnabled()) { + log.info("Found Accept-Language: " + language); + } + + if (language == null) { + + language = Locale.FRENCH.getLanguage(); + + if (log.isInfoEnabled()) { + log.info("Use default language: " + language); + } + + } + + Locale locale = new Locale(language); + session.setLocale(locale); + + sessionCookie = cookieManager.create(COOKIE_SESSION, session); + cookieManager.add(sessionCookie); + + } + + PollenRestApiSession session = sessionCookie.getValue(PollenRestApiSession.class); + return session; + + } + + protected Locale locale; + + protected String sessionToken; + + public Locale getLocale() { + return locale; + } + + public void setLocale(Locale locale) { + this.locale = locale; + } + + public String getSessionToken() { + return sessionToken; + } + + public void setSessionToken(String sessionToken) { + this.sessionToken = sessionToken; + } +} Property changes on: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiSession.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiUtil.java =================================================================== --- trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiUtil.java 2014-05-16 13:13:49 UTC (rev 3961) +++ trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiUtil.java 2014-05-16 13:14:22 UTC (rev 3962) @@ -9,7 +9,6 @@ import org.apache.commons.lang3.StringUtils; import org.chorem.pollen.persistence.entity.SessionToken; import org.chorem.pollen.services.service.security.PollenSecurityContext; -import org.debux.webmotion.server.call.CookieManager; import org.debux.webmotion.server.call.HttpContext; import javax.servlet.http.HttpServletResponse; @@ -23,9 +22,6 @@ */ public class PollenRestApiUtil { - - public static final String COOKIE_USER_SESSION = "pollenSession"; - public static final String HEADER_ACCESS_CONTROL_REQUEST_HEADERS = "Access-Control-Request-Headers"; public static final String HEADER_ACCESS_CONTROL_ALLOW_HEADERS = "Access-Control-Allow-Headers"; @@ -72,18 +68,15 @@ response.addHeader(HttpContext.HEADER_ACCESS_CONTROL_ALLOW_ORIGIN, "*"); response.addHeader(HttpContext.HEADER_ACCESS_CONTROL_ALLOW_CREDENTIALS, "true"); - CookieManager cookieManager = context.getCookieManager(); - PollenSecurityContext securityContext = requestContext.getSecurityContext(); SessionToken sessionToken = securityContext.getSessionToken(); if (sessionToken != null) { - CookieManager.CookieEntity pollenSession = cookieManager.create(COOKIE_USER_SESSION, sessionToken.getPollenToken().getToken()); - cookieManager.add(pollenSession); + requestContext.getSession().setSessionToken(sessionToken.getPollenToken().getToken()); } else { - cookieManager.remove(COOKIE_USER_SESSION); + requestContext.getSession().setSessionToken(null); }

1 0

r3961 - in trunk/pollen-services/src/main: java/org/chorem/pollen/services/config java/org/chorem/pollen/services/service resources/i18n
by tchemit＠users.chorem.org May 16, 2014

May 16, 2014

Author: tchemit Date: 2014-05-16 15:13:49 +0200 (Fri, 16 May 2014) New Revision: 3961 Url: http://forge.chorem.org/projects/pollen/repository/revisions/3961 Log: i18n on validation Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java 2014-05-16 12:26:45 UTC (rev 3960) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java 2014-05-16 13:13:49 UTC (rev 3961) @@ -115,7 +115,7 @@ */ DEFAULT_CHOICE_TYPE( "pollen.default.pollChoiceType", - n("pollen.configuration.pollChoiceType"), + n("pollen.configuration.defaultPollChoiceType"), ChoiceType.TEXT.name(), ChoiceType.class), Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java 2014-05-16 12:26:45 UTC (rev 3960) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java 2014-05-16 13:13:49 UTC (rev 3961) @@ -41,6 +41,8 @@ import java.util.List; import java.util.Set; +import static org.nuiton.i18n.I18n.l; + /** * TODO * @@ -340,12 +342,13 @@ ErrorMap errors = new ErrorMap(); - checkNotNull(errors, Poll.PROPERTY_POLL_TYPE, poll.getPollType(), "pollType can not be null"); - checkNotNull(errors, Poll.PROPERTY_COMMENT_VISIBILITY, poll.getCommentVisibility(), "commentVisibility can not be null"); - checkNotNull(errors, Poll.PROPERTY_VOTE_VISIBILITY, poll.getVoteVisibility(), "voteVisibility can not be null"); - checkNotNull(errors, Poll.PROPERTY_VOTE_COUNTING_TYPE, poll.getVoteCountingType(), "voteCountingType can not be null"); + checkNotNull(errors, Poll.PROPERTY_POLL_TYPE, poll.getPollType(), l(getLocale(), "pollen.error.poll.pollType.mandatory")); + checkNotNull(errors, Poll.PROPERTY_COMMENT_VISIBILITY, poll.getCommentVisibility(), l(getLocale(), "pollen.error.poll.pollType.mandatory commentVisibility")); + checkNotNull(errors, Poll.PROPERTY_VOTE_VISIBILITY, poll.getVoteVisibility(), l(getLocale(), "pollen.error.poll.voteVisibility.mandatory")); + checkNotNull(errors, Poll.PROPERTY_RESULT_VISIBILITY, poll.getResultVisibility(), l(getLocale(), "pollen.error.poll.resultVisibility.mandatory")); + checkNotNull(errors, Poll.PROPERTY_VOTE_COUNTING_TYPE, poll.getVoteCountingType(), l(getLocale(), "pollen.error.poll.voteCountingType.mandatory")); - checkNotBlank(errors, Poll.PROPERTY_TITLE, poll.getTitle(), "title can not be empty"); + checkNotBlank(errors, Poll.PROPERTY_TITLE, poll.getTitle(), l(getLocale(), "pollen.error.poll.title.mandatory")); return errors; @@ -355,7 +358,7 @@ boolean choicesNotEmpty = CollectionUtils.isNotEmpty(choices); - check(errorMap, "choice", choicesNotEmpty, "need at least one choice"); + check(errorMap, "choice", choicesNotEmpty, l(getLocale(), "pollen.error.poll.choice.mandatory")); if (choicesNotEmpty) { @@ -381,15 +384,15 @@ if (PollBean.isPollFree(poll)) { - checkEmpty(errorMap, "voterList", voterLists, "can't have voterList with free poll"); + checkEmpty(errorMap, "voterList", voterLists, l(getLocale(), "pollen.error.poll.voterList.mismatch.freePoll")); } else if (PollBean.isPollRestricted(poll)) { - check(errorMap, "voterList", voterListsNotEmpty && 1 == voterLists.size(), "must have a unique voterList with a restricted poll"); + check(errorMap, "voterList", voterListsNotEmpty && 1 == voterLists.size(), l(getLocale(), "pollen.error.poll.unique.voterList.mandatory.for.restrictedPoll")); } else if (PollBean.isPollGroup(poll)) { - check(errorMap, "voterList", voterListsNotEmpty, "must have at least one voterList with a group poll"); + check(errorMap, "voterList", voterListsNotEmpty, l(getLocale(), "pollen.error.poll.voterList.mandatory.for.groupedPoll")); } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java 2014-05-16 12:26:45 UTC (rev 3960) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java 2014-05-16 13:13:49 UTC (rev 3961) @@ -59,6 +59,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; +import java.util.Locale; /** * TODO @@ -99,6 +100,10 @@ return serviceContext.getPollenServiceConfig(); } + protected Locale getLocale() { + return serviceContext.getLocale(); + } + // -- Services -- // protected AuthService getAuthService() { Modified: trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties =================================================================== --- trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties 2014-05-16 12:26:45 UTC (rev 3960) +++ trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties 2014-05-16 13:13:49 UTC (rev 3961) @@ -1,15 +1,28 @@ pollen.configuration.data.directory=Directory where Pollen stores his data +pollen.configuration.defaultPollChoiceType=Default choice type used when creating a new poll pollen.configuration.defaultPollCommentVisibility=Default Poll comment visibility used when creating a new poll +pollen.configuration.defaultPollResultVisibility=Default Result vsibility used when creating a new poll pollen.configuration.defaultPollType=Default Poll type used when creating a new poll pollen.configuration.defaultPollVoteVisibility=Default Poll vote visibility used when creating a new poll pollen.configuration.defaultVoteCountingType=Default vote counting type used when creating a new poll -pollen.configuration.pollChoiceType= pollen.error.favoriteList.import.csv.already.used.email= pollen.error.favoriteList.import.csv.already.used.name= pollen.error.favoriteList.import.csv.invalid.email= pollen.error.favoriteList.import.ldap.already.used.email= pollen.error.favoriteList.import.ldap.already.used.name= pollen.error.favoriteList.import.ldap.invalid.email= +pollen.error.poll.choice.mandatory=At least a choice is mandatory +pollen.error.poll.commentVisibility.mandatory=comment visiblity is mandatory +pollen.error.poll.mismatch.freePoll=cant' have a voter list for a free poll +pollen.error.poll.pollType.mandatory=poll type is mandatory +pollen.error.poll.pollType.mandatory\ commentVisibility= +pollen.error.poll.resultVisibility.mandatory=result visibility is mandatory +pollen.error.poll.title.mandatory=title is mandatory +pollen.error.poll.unique.voterList.mandatory.for.restrictedPoll=A voter list is mandatory for a restricted poll +pollen.error.poll.voteCountingType.mandatory=vote counting type is mandatory +pollen.error.poll.voteVisibility.mandatory=vote visibility is mandatory +pollen.error.poll.voterList.mandatory.for.groupedPoll=At least one voter list ins mandatory for a grouped poll +pollen.error.poll.voterList.mismatch.freePoll= pollen.service.mail.ChoiceAddedEmail.subject=[Pollen] A choice was added in poll %s pollen.service.mail.ChoiceDeletedEmail.subject=[Pollen] A choice was deleted in poll %s pollen.service.mail.ChoiceEditedEmail.subject=[Pollen] A choice was edited in poll %s Modified: trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties =================================================================== --- trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties 2014-05-16 12:26:45 UTC (rev 3960) +++ trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties 2014-05-16 13:13:49 UTC (rev 3961) @@ -1,15 +1,27 @@ pollen.configuration.data.directory=Répertoire de données de l'application +pollen.configuration.defaultPollChoiceType=Type de choix par défaut lors de la création d'un nouveau sondage pollen.configuration.defaultPollCommentVisibility=Visibilité des commentaires par défaut lors de la création d'un nouveau sondage +pollen.configuration.defaultPollResultVisibility=Visibilité des résultats par défaut lors de la création d'un nouveau sondage pollen.configuration.defaultPollType=Type de sondage par défaut lors de la création d'un nouveau sondage pollen.configuration.defaultPollVoteVisibility=Visibilité des votes par défaut lors de la création d'un nouveau sondage pollen.configuration.defaultVoteCountingType=Type de dépouillement par défaut lors de la création d'un nouveau sondage -pollen.configuration.pollChoiceType= pollen.error.favoriteList.import.csv.already.used.email= pollen.error.favoriteList.import.csv.already.used.name= pollen.error.favoriteList.import.csv.invalid.email= pollen.error.favoriteList.import.ldap.already.used.email= pollen.error.favoriteList.import.ldap.already.used.name= pollen.error.favoriteList.import.ldap.invalid.email= +pollen.error.poll.choice.mandatory=Au moins un choix est nécessaire +pollen.error.poll.commentVisibility.mandatory=la visibilité des commentaires est obligatoire +pollen.error.poll.pollType.mandatory=le type de sondage est obligatoire +pollen.error.poll.pollType.mandatory\ commentVisibility= +pollen.error.poll.resultVisibility.mandatory=la visibilité des résultats est obligatoire +pollen.error.poll.title.mandatory=le titre du sondage est obligatoire +pollen.error.poll.unique.voterList.mandatory.for.restrictedPoll=une liste de votant est obligatoire pour un sondage restreint +pollen.error.poll.voteCountingType.mandatory=le type de vote est obligatoire +pollen.error.poll.voteVisibility.mandatory=la visiblité des votes est obligatoire +pollen.error.poll.voterList.mandatory.for.groupedPoll=Au moins une liste de votant est obligatoire pour un sondage groupé +pollen.error.poll.voterList.mismatch.freePoll=Liste de votants impossible pour un sondage libre pollen.service.mail.ChoiceAddedEmail.subject=[Pollen] Un choix a été ajouté au sondage %s pollen.service.mail.ChoiceDeletedEmail.subject=[Pollen] Un choix a été supprimé du sondage %s pollen.service.mail.ChoiceEditedEmail.subject=[Pollen] Un choix a été modifié sur le sondage %s

1 0

r3960 - in trunk: pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1 pollen-services/src/main/java/org/chorem/pollen/services/bean pollen-services/src/main/java/org/chorem/pollen/services/service
by tchemit＠users.chorem.org May 16, 2014

May 16, 2014

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; }

1 0

r3959 - trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api
by tchemit＠users.chorem.org May 16, 2014

May 16, 2014

Author: tchemit Date: 2014-05-16 14:26:05 +0200 (Fri, 16 May 2014) New Revision: 3959 Url: http://forge.chorem.org/projects/pollen/repository/revisions/3959 Log: rename session cookie name Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiUtil.java Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiUtil.java =================================================================== --- trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiUtil.java 2014-05-16 12:25:43 UTC (rev 3958) +++ trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiUtil.java 2014-05-16 12:26:05 UTC (rev 3959) @@ -24,7 +24,7 @@ public class PollenRestApiUtil { - public static final String COOKIE_USER_SESSION = "userSession"; + public static final String COOKIE_USER_SESSION = "pollenSession"; public static final String HEADER_ACCESS_CONTROL_REQUEST_HEADERS = "Access-Control-Request-Headers";

1 0

r3958 - in trunk/pollen-services/src/main/java/org/chorem/pollen/services: config service
by tchemit＠users.chorem.org May 16, 2014

May 16, 2014

Author: tchemit Date: 2014-05-16 14:25:43 +0200 (Fri, 16 May 2014) New Revision: 3958 Url: http://forge.chorem.org/projects/pollen/repository/revisions/3958 Log: add default resultVisibility option Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java 2014-05-16 12:25:22 UTC (rev 3957) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java 2014-05-16 12:25:43 UTC (rev 3958) @@ -32,6 +32,7 @@ import org.chorem.pollen.persistence.entity.ChoiceType; import org.chorem.pollen.persistence.entity.CommentVisibility; import org.chorem.pollen.persistence.entity.PollType; +import org.chorem.pollen.persistence.entity.ResultVisibility; import org.chorem.pollen.persistence.entity.VoteVisibility; import org.chorem.pollen.services.PollenTechnicalException; import org.nuiton.config.ApplicationConfig; @@ -149,6 +150,13 @@ return result; } + public ResultVisibility getDefaultResultVisibility() { + ResultVisibility result = applicationConfig.getOption( + ResultVisibility.class, + PollenServiceConfigOption.DEFAULT_RESULT_VISIBILITY.key); + return result; + } + public ChoiceType getDefaultChoiceType() { ChoiceType result = applicationConfig.getOption( ChoiceType.class, Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java 2014-05-16 12:25:22 UTC (rev 3957) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java 2014-05-16 12:25:43 UTC (rev 3958) @@ -26,6 +26,7 @@ import org.chorem.pollen.persistence.entity.ChoiceType; import org.chorem.pollen.persistence.entity.CommentVisibility; import org.chorem.pollen.persistence.entity.PollType; +import org.chorem.pollen.persistence.entity.ResultVisibility; import org.chorem.pollen.persistence.entity.VoteVisibility; import org.nuiton.config.ConfigOptionDef; @@ -97,6 +98,17 @@ CommentVisibility.class), /** + * Default poll comment visibility to use at a new poll creation. + * + * @since 2.0 + */ + DEFAULT_RESULT_VISIBILITY( + "pollen.default.pollResultVisibility", + n("pollen.configuration.defaultPollResultVisibility"), + ResultVisibility.EVERYBODY.name(), + ResultVisibility.class), + + /** * Default poll choice type to use at a new choice creation. * * @since 2.0 Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java 2014-05-16 12:25:22 UTC (rev 3957) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java 2014-05-16 12:25:43 UTC (rev 3958) @@ -120,6 +120,7 @@ result.setPollType(getPollenServiceConfig().getDefaultPollType()); result.setVoteVisibility(getPollenServiceConfig().getDefaultVoteVisibility()); result.setCommentVisibility(getPollenServiceConfig().getDefaultCommentVisibility()); + result.setResultVisibility(getPollenServiceConfig().getDefaultResultVisibility()); result.setBeginDate(serviceContext.getNow()); // -- creator -- //

1 0