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

branch feature/1_socialauth updated (aa859951 -> d545965b)
by chorem.org scm 07 Sep '17

07 Sep '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/1_socialauth in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git omits aa859951 refs #1 séparaion des langues omits f4cb642f refs #1 gestion de la suppression des credentials omits 6e891e73 refs #1 mise en page des comptes externes dans le profil omits 8e108414 fix build omits 0975e601 refs #1 ajout de credentials depuis le profil omits ef68f13e refs #1 permettre d'ajouter des comptes tiers à un compte existant omits 1a386c04 refs #1 permettre l'ajout d'un mot de passe à des comptes créés à partir de service tiers omits 01639cf5 refs #1 envoi d'un mail à la création d'un compte a partir d'un service tiers omits a32cf352 refs #1 erreur si l'utilisateur veut se connecter via un service tiers et que son email est deja utilisé par un autre compte Pollen omits a63cca0d refs #1 gestion des tiers de connexion + style du login omits 40bb3dc9 refs #1 ajout du socialmanager dans la session en attendant le retour du provider + gestion des tiers de connexion + gestion des comptes sans email omits 9ec9ff65 refs #1 ajout de la conf des providers dans la base (plus simple à modifier) + début de l'admin omits 3d3db40b refs #1 connexion avec google omits c581c872 refs #1 utilisation de la lib socialauth pour se connecter via des services tiers omits 6e63e1c4 refs #1 ajout des credentials sur le user adds 00f2c6af Pour les participant d'un sondage, ne pas proposer d'inporter une list de favoris si l'utilisateur n'en a pas définis (ref #132) new ea9adfde refs #1 ajout des credentials sur le user new 64cc7bbc refs #1 utilisation de la lib socialauth pour se connecter via des services tiers new 253dd540 refs #1 connexion avec google new b5c67229 refs #1 ajout de la conf des providers dans la base (plus simple à modifier) + début de l'admin new 62201ae0 refs #1 ajout du socialmanager dans la session en attendant le retour du provider + gestion des tiers de connexion + gestion des comptes sans email new cfa63ad2 refs #1 gestion des tiers de connexion + style du login new d3f0f3dc refs #1 erreur si l'utilisateur veut se connecter via un service tiers et que son email est deja utilisé par un autre compte Pollen new 1cbe1725 refs #1 envoi d'un mail à la création d'un compte a partir d'un service tiers new 71bf5022 refs #1 permettre l'ajout d'un mot de passe à des comptes créés à partir de service tiers new 160da205 refs #1 permettre d'ajouter des comptes tiers à un compte existant new dee2bf14 refs #1 ajout de credentials depuis le profil new aacfec6e fix build new e36db9ab refs #1 mise en page des comptes externes dans le profil new b34a7a02 refs #1 gestion de la suppression des credentials new d545965b refs #1 séparaion des langues This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (aa859951) \ N -- N -- N refs/heads/feature/1_socialauth (d545965b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 15 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d545965b3d120aff578b104343582cd7a955fe8c Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Sep 7 11:22:15 2017 +0200 refs #1 séparaion des langues commit b34a7a0268cb8d062d8ac3161ea90ece5d7000de Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Sep 7 11:01:10 2017 +0200 refs #1 gestion de la suppression des credentials commit e36db9ab487847ece02d8a6a3fd4a8e31bf7a2e9 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Sep 7 10:48:45 2017 +0200 refs #1 mise en page des comptes externes dans le profil commit aacfec6e28d17fea5a2904b6ce2fbbf6de70246c Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Sep 5 16:48:06 2017 +0200 fix build commit dee2bf14ea4cd597c5a2979f01c476f1c1180145 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Sep 5 16:08:48 2017 +0200 refs #1 ajout de credentials depuis le profil commit 160da205f1bc5ecd8e6bef0ca67eaf3c7ab23c4e Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Sep 4 15:21:58 2017 +0200 refs #1 permettre d'ajouter des comptes tiers à un compte existant commit 71bf50224f98ada5869279d08ddbaa50f16a178f Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Aug 31 16:08:45 2017 +0200 refs #1 permettre l'ajout d'un mot de passe à des comptes créés à partir de service tiers commit 1cbe17251adbc04d3e48034963e7eff806d72c7d Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Aug 31 14:57:45 2017 +0200 refs #1 envoi d'un mail à la création d'un compte a partir d'un service tiers commit d3f0f3dc910239e807543126e0daa63a00dc13f3 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Aug 29 17:57:01 2017 +0200 refs #1 erreur si l'utilisateur veut se connecter via un service tiers et que son email est deja utilisé par un autre compte Pollen commit cfa63ad271f28017e49cfbdc491a185ca23ba32b Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Aug 25 18:04:36 2017 +0200 refs #1 gestion des tiers de connexion + style du login commit 62201ae0f5b3019ed7bd593200a4d24eb1f65556 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Aug 25 18:03:46 2017 +0200 refs #1 ajout du socialmanager dans la session en attendant le retour du provider + gestion des tiers de connexion + gestion des comptes sans email commit b5c672295a2136dcaf2dad7c94588eac62996ca7 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Aug 24 17:35:35 2017 +0200 refs #1 ajout de la conf des providers dans la base (plus simple à modifier) + début de l'admin commit 253dd540dc6315482fd9cb4a88026b9e36688ef2 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Aug 24 11:05:45 2017 +0200 refs #1 connexion avec google commit 64cc7bbcbd6bfec6dfcd278de20295354a9fc43e Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Aug 11 17:52:32 2017 +0200 refs #1 utilisation de la lib socialauth pour se connecter via des services tiers commit ea9adfdeef6f6b852daeba235c7bd9452691d2dc Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Aug 11 17:52:10 2017 +0200 refs #1 ajout des credentials sur le user Summary of changes: pollen-ui-riot-js/src/main/web/i18n/en.json | 1 - pollen-ui-riot-js/src/main/web/i18n/fr.json | 1 - .../tag/voterList/ImportFavoritListModal.tag.html | 29 +++++----------------- .../src/main/web/tag/voterList/VoterList.tag.html | 25 ++++++++++++++++--- .../i18n/pollen-votecounting-api_fr_FR.properties | 2 +- 5 files changed, 28 insertions(+), 30 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 12

03/15: refs #1 connexion avec google
by chorem.org scm 07 Sep '17

07 Sep '17

This is an automated email from the git hooks/post-receive script. New commit to branch feature/1_socialauth in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 253dd540dc6315482fd9cb4a88026b9e36688ef2 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Aug 24 11:05:45 2017 +0200 refs #1 connexion avec google --- .../src/main/java/org/chorem/pollen/rest/api/v1/AuthApi.java | 3 --- .../org/chorem/pollen/services/service/SocialAuthService.java | 2 ++ pollen-ui-riot-js/src/main/web/js/AuthService.js | 6 ++++-- pollen-ui-riot-js/src/main/web/js/Session.js | 8 ++++---- pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 10 +++++----- pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html | 9 +++++---- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/AuthApi.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/AuthApi.java index 55541664..7a7b74bb 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/AuthApi.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/AuthApi.java @@ -212,9 +212,6 @@ public class AuthApi { Gson gson = new Gson(); Map<String, String> paramsMap = gson.fromJson(authorization, Map.class); PollenEntityRef<PollenUser> userPollenEntityRef = socialAuthService.login(providerId, providerRedirection, paramsMap); - - - return getLoginResponseFromPollenUser(serviceContext, securityService, securityContext, userPollenEntityRef); } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/SocialAuthService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/SocialAuthService.java index 47cb08dd..6866b3b5 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/SocialAuthService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/SocialAuthService.java @@ -6,6 +6,7 @@ import org.brickred.socialauth.AuthProvider; import org.brickred.socialauth.Profile; import org.brickred.socialauth.SocialAuthConfig; import org.brickred.socialauth.SocialAuthManager; +import org.brickred.socialauth.util.Constants; import org.chorem.pollen.persistence.entity.PollenUser; import org.chorem.pollen.persistence.entity.PollenUserImpl; import org.chorem.pollen.persistence.entity.PollenUserTopiaDao; @@ -38,6 +39,7 @@ public class SocialAuthService extends PollenServiceSupport { SocialAuthManager manager = getSocialAuthManager(); manager.getAuthenticationUrl(providerId, redirection); + paramsMap.remove(Constants.STATE); AuthProvider provider = manager.connect(paramsMap); // get profile diff --git a/pollen-ui-riot-js/src/main/web/js/AuthService.js b/pollen-ui-riot-js/src/main/web/js/AuthService.js index 23b87d3a..42052f20 100644 --- a/pollen-ui-riot-js/src/main/web/js/AuthService.js +++ b/pollen-ui-riot-js/src/main/web/js/AuthService.js @@ -68,9 +68,11 @@ class AuthService extends FetchService { return this.post("/v1/resendValidation", email); } - signInProvider(provider, query, providerRedirection) { + signInProvider(query, providerRedirection) { + console.log(query) + console.log(providerRedirection) return this.fetch( - "/v1/login/" + provider, + "/v1/login/" + query.loginProvider, "POST", {Authorization: JSON.stringify(query)}, providerRedirection); diff --git a/pollen-ui-riot-js/src/main/web/js/Session.js b/pollen-ui-riot-js/src/main/web/js/Session.js index 1112204f..f5f84fdf 100644 --- a/pollen-ui-riot-js/src/main/web/js/Session.js +++ b/pollen-ui-riot-js/src/main/web/js/Session.js @@ -136,8 +136,8 @@ class Session { return authService.signIn(login, password).then(auth => this.updateConnection(auth, this)); } - signInProvider(provider, query) { - return authService.signInProvider(provider, query, this.getProviderRedirectionUrl(query.redirect)) + signInProvider(query) { + return authService.signInProvider(query, this.getProviderRedirectionUrl(query.loginProvider)) .then(auth => this.updateConnection(auth, this)); } @@ -172,8 +172,8 @@ class Session { }); } - getProviderRedirectionUrl(redirect) { - return this.pollenUIContext.uiEndPoint + "/?redirect=" + redirect; + getProviderRedirectionUrl(provider) { + return this.pollenUIContext.uiEndPoint + "/?loginProvider=" + provider; } } diff --git a/pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html b/pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html index 1ac4f6cb..36ca5983 100644 --- a/pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html @@ -219,11 +219,11 @@ require("./popup/InformationPopup.tag.html"); route(() => { var q = route.query(); - console.log(q); - console.log(q.redirect); - if (q.redirect != null) { - session.signInProvider("facebook", q).then(() => { - location.href = session.pollenUIContext.uiEndPoint + "/" + unescape(decodeURIComponent(q.redirect)); + if (q.loginProvider != null) { + session.signInProvider(q).then(() => { + let currentPage = localStorage.getItem("currentPage"); + localStorage.removeItem("currentPage"); + location.href = session.pollenUIContext.uiEndPoint + "/" + currentPage; }); } else { diff --git a/pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html b/pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html index 739345e8..2ce478c5 100644 --- a/pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html @@ -57,9 +57,9 @@ require("./components/HumanInput.tag.html"); </div> <a onclick="{newPassword}">{__.lostpassword}</a> </form> - <p>Ou connectez vous avec votre compte + <p>Ou connectez vous avec votre compte : <a onclick="{signinWithProvider('facebook')}"><i class="fa fa-facebook-official"></i></a> - <a onclick="{signinWithProvider('linkedin')}"><i class="fa fa-linkedin-square"></i></a> + <a onclick="{signinWithProvider('googleplus')}"><i class="fa fa-google"></i></a> </p> </div> @@ -112,9 +112,10 @@ require("./components/HumanInput.tag.html"); }; this.signinWithProvider = (provider) => (e) => { - let redirect = location.hash || "#"; + let currentPage = location.hash || "#"; + localStorage.setItem("currentPage", currentPage); location.href = this.session.configuration.endPoint + "/v1/login/" + provider - + "?providerRedirection=" + this.session.getProviderRedirectionUrl(escape(encodeURIComponent(redirect))); + + "?providerRedirection=" + encodeURIComponent(this.session.getProviderRedirectionUrl(provider)); }; </script> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/15: refs #1 utilisation de la lib socialauth pour se connecter via des services tiers
by chorem.org scm 07 Sep '17

07 Sep '17

This is an automated email from the git hooks/post-receive script. New commit to branch feature/1_socialauth in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 64cc7bbcbd6bfec6dfcd278de20295354a9fc43e Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Aug 11 17:52:32 2017 +0200 refs #1 utilisation de la lib socialauth pour se connecter via des services tiers --- .../rest/api/PollenRestApiRequestFilter.java | 2 + .../org/chorem/pollen/rest/api/v1/AuthApi.java | 118 ++++++++++++++------- pollen-services/pom.xml | 5 + .../services/service/PollenServiceSupport.java | 5 + .../pollen/services/service/SocialAuthService.java | 101 ++++++++++++++++++ .../services/service/security/SecurityService.java | 6 +- .../src/main/resources/oauth_consumer.properties | 87 +++++++++++++++ pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/src/main/web/js/AuthService.js | 7 ++ pollen-ui-riot-js/src/main/web/js/Session.js | 49 +++++---- pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 14 ++- pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html | 16 ++- pollen-ui-riot-js/webpack.config.js | 2 +- pom.xml | 6 ++ 14 files changed, 356 insertions(+), 64 deletions(-) diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java index 3c369f7f..cfb03701 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java @@ -44,6 +44,7 @@ import org.chorem.pollen.services.service.PollenResourceService; import org.chorem.pollen.services.service.PollenUIUrlRenderService; import org.chorem.pollen.services.service.PollenUserService; import org.chorem.pollen.services.service.ReportService; +import org.chorem.pollen.services.service.SocialAuthService; import org.chorem.pollen.services.service.VoteCountingService; import org.chorem.pollen.services.service.VoteCountingTypeService; import org.chorem.pollen.services.service.VoteService; @@ -179,6 +180,7 @@ public class PollenRestApiRequestFilter implements ContainerRequestFilter, Conta ResteasyProviderFactory.pushContext(VoteService.class, serviceContext.newService(VoteService.class)); ResteasyProviderFactory.pushContext(PollenUserService.class, serviceContext.newService(PollenUserService.class)); ResteasyProviderFactory.pushContext(FeedbackService.class, serviceContext.newService(FeedbackService.class)); + ResteasyProviderFactory.pushContext(SocialAuthService.class, serviceContext.newService(SocialAuthService.class)); } private PollenUIContext extractUIContext(ContainerRequestContext context) { diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/AuthApi.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/AuthApi.java index ffcc4507..55541664 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/AuthApi.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/AuthApi.java @@ -21,6 +21,7 @@ package org.chorem.pollen.rest.api.v1; * #L% */ +import com.google.gson.Gson; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -30,6 +31,7 @@ import org.chorem.pollen.persistence.entity.SessionToken; import org.chorem.pollen.services.PollenServiceContext; import org.chorem.pollen.services.bean.PollenEntityRef; import org.chorem.pollen.services.service.PollenUserService; +import org.chorem.pollen.services.service.SocialAuthService; import org.chorem.pollen.services.service.security.MissingAuthenticationException; import org.chorem.pollen.services.service.security.PollenAuthenticationException; import org.chorem.pollen.services.service.security.PollenCypherTechnicalException; @@ -52,6 +54,8 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.NewCookie; import javax.ws.rs.core.Response; +import java.net.URI; +import java.util.Map; /** * TODO @@ -118,49 +122,58 @@ public class AuthApi { } PollenEntityRef<PollenUser> userPollenEntityRef = securityService.login(login, password, false); - userPollenEntityRef.encode(serviceContext.getTopiaApplicationContext().getTopiaIdFactory()); - - // Inject the session token in security context - SessionToken sessionToken = securityService.getSessionTokenByToken(userPollenEntityRef.getPermission()); - - securityContext.setSessionToken(sessionToken); - - // add auth cookies - - String value = securityService.encrypt( - sessionToken.getPollenUser().getTopiaId(), - sessionToken.getPollenToken().getToken() - ); - - NewCookie authCookie = new NewCookie( - COOKIE_POLLEN_AUTH, - value, - "/", - null, - null, - COOKIE_MAX_AGE, - false); - - NewCookie connectedCookie = new NewCookie( - COOKIE_POLLEN_CONNECTED, - "true", - "/", - null, - null, - COOKIE_MAX_AGE, - false); - - if (log.isDebugEnabled()) { - log.debug("Add auth cookie:: " + authCookie.getValue()); - } - - return Response.ok(userPollenEntityRef).cookie(authCookie, connectedCookie).build(); + return getLoginResponseFromPollenUser(serviceContext, securityService, securityContext, userPollenEntityRef); } throw new MissingAuthenticationException(); } + protected Response getLoginResponseFromPollenUser(PollenServiceContext serviceContext, + SecurityService securityService, + PollenSecurityContext securityContext, + PollenEntityRef<PollenUser> userPollenEntityRef) + throws PollenInvalidSessionTokenException, PollenCypherTechnicalException { + + userPollenEntityRef.encode(serviceContext.getTopiaApplicationContext().getTopiaIdFactory()); + + // Inject the session token in security context + SessionToken sessionToken = securityService.getSessionTokenByToken(userPollenEntityRef.getPermission()); + + securityContext.setSessionToken(sessionToken); + + // add auth cookies + + String value = securityService.encrypt( + sessionToken.getPollenUser().getTopiaId(), + sessionToken.getPollenToken().getToken() + ); + + NewCookie authCookie = new NewCookie( + COOKIE_POLLEN_AUTH, + value, + "/", + null, + null, + COOKIE_MAX_AGE, + false); + + NewCookie connectedCookie = new NewCookie( + COOKIE_POLLEN_CONNECTED, + "true", + "/", + null, + null, + COOKIE_MAX_AGE, + false); + + if (log.isDebugEnabled()) { + log.debug("Add auth cookie:: " + authCookie.getValue()); + } + + return Response.ok(userPollenEntityRef).cookie(authCookie, connectedCookie).build(); + } + @Path("/login2") @POST @PUT public PollenEntityRef<PollenUser> login2(@Context SecurityService securityService, @@ -172,8 +185,39 @@ public class AuthApi { PollenUserBannedException { return securityService.login(login, password, rememberMe); + } + @Path("/login/{providerId}") + @GET + public Response loginProvider(@Context SocialAuthService socialAuthService, + @PathParam("providerId") String providerId, + @QueryParam("providerRedirection") String providerRedirection) + throws Exception { + + String providerLoginUrl = socialAuthService.getProviderAuthenticationUrl(providerId, providerRedirection); + return Response.seeOther(URI.create(providerLoginUrl)).build(); } + + @Path("/login/{providerId}") + @POST + public Response loginProvider(@Context SocialAuthService socialAuthService, + @Context PollenServiceContext serviceContext, + @Context SecurityService securityService, + @Context PollenSecurityContext securityContext, + @PathParam("providerId") String providerId, + String providerRedirection, + @HeaderParam("authorization") String authorization) + throws Exception { + + Gson gson = new Gson(); + Map<String, String> paramsMap = gson.fromJson(authorization, Map.class); + PollenEntityRef<PollenUser> userPollenEntityRef = socialAuthService.login(providerId, providerRedirection, paramsMap); + + + + return getLoginResponseFromPollenUser(serviceContext, securityService, securityContext, userPollenEntityRef); + } + @Path("/logout") @GET public boolean logout(@Context SecurityService securityService, diff --git a/pollen-services/pom.xml b/pollen-services/pom.xml index a17b864f..43ed09cb 100644 --- a/pollen-services/pom.xml +++ b/pollen-services/pom.xml @@ -214,6 +214,11 @@ <artifactId>jboss-jaxrs-api_2.0_spec</artifactId> </dependency> + <dependency> + <groupId>org.brickred</groupId> + <artifactId>socialauth</artifactId> + </dependency> + </dependencies> <build> diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java index 88b0a6ca..c26c5f50 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java @@ -41,6 +41,7 @@ import org.chorem.pollen.persistence.entity.PollenUser; import org.chorem.pollen.persistence.entity.PollenUserTopiaDao; import org.chorem.pollen.persistence.entity.ReportTopiaDao; import org.chorem.pollen.persistence.entity.SessionTokenTopiaDao; +import org.chorem.pollen.persistence.entity.UserCredentialTopiaDao; import org.chorem.pollen.persistence.entity.VoteToChoiceTopiaDao; import org.chorem.pollen.persistence.entity.VoteTopiaDao; import org.chorem.pollen.persistence.entity.VoterListMemberTopiaDao; @@ -213,6 +214,10 @@ public abstract class PollenServiceSupport implements PollenService { return getPersistenceContext().getPollenUserDao(); } + protected UserCredentialTopiaDao getUserCredentialDao() { + return getPersistenceContext().getUserCredentialDao(); + } + protected ReportTopiaDao getReportTopiaDao() { return getPersistenceContext().getReportDao(); } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/SocialAuthService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/SocialAuthService.java new file mode 100644 index 00000000..47cb08dd --- /dev/null +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/SocialAuthService.java @@ -0,0 +1,101 @@ +package org.chorem.pollen.services.service; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.brickred.socialauth.AuthProvider; +import org.brickred.socialauth.Profile; +import org.brickred.socialauth.SocialAuthConfig; +import org.brickred.socialauth.SocialAuthManager; +import org.chorem.pollen.persistence.entity.PollenUser; +import org.chorem.pollen.persistence.entity.PollenUserImpl; +import org.chorem.pollen.persistence.entity.PollenUserTopiaDao; +import org.chorem.pollen.persistence.entity.UserCredential; +import org.chorem.pollen.persistence.entity.UserCredentialImpl; +import org.chorem.pollen.services.bean.PollenEntityRef; + +import java.util.Map; +import java.util.Optional; + +/** + * @author Kevin Morin (Code Lutin) + */ +public class SocialAuthService extends PollenServiceSupport { + + /** Logger. */ + private static final Log log = LogFactory.getLog(SocialAuthService.class); + + public String getProviderAuthenticationUrl(String providerId, String redirection) throws Exception { + SocialAuthManager manager = getSocialAuthManager(); + + // get Provider URL to which you should redirect for authentication. + // id can have values "facebook", "twitter", "yahoo" etc. or the OpenID URL + return manager.getAuthenticationUrl(providerId, redirection); + } + + public PollenEntityRef<PollenUser> login(String providerId, + String redirection, + Map<String, String> paramsMap) throws Exception { + SocialAuthManager manager = getSocialAuthManager(); + manager.getAuthenticationUrl(providerId, redirection); + + AuthProvider provider = manager.connect(paramsMap); + + // get profile + Profile p = provider.getUserProfile(); + + PollenUser pollenUser; + PollenUserTopiaDao userDao = getPollenUserDao(); + Optional<PollenUser> pollenUserForCredential = userDao.tryFindUserWithCredential(p.getProviderId(), p.getValidatedId()); + + String name = p.getDisplayName(); + if (name == null) { + name = p.getFirstName() + " " + p.getLastName(); + } + + if (pollenUserForCredential.isPresent()) { + if (log.isInfoEnabled()) { + log.info("credentials found : " + name); + } + pollenUser = pollenUserForCredential.get(); + + } else { + if (log.isInfoEnabled()) { + log.info("create new user : " + name); + } + + UserCredential credential = new UserCredentialImpl(); + credential.setProvider(p.getProviderId()); + credential.setUserId(p.getValidatedId()); + credential.setEmail(p.getEmail()); + credential = getUserCredentialDao().create(credential); + + pollenUser = new PollenUserImpl(); + pollenUser.setName(name); + pollenUser.setEmail(p.getEmail()); + pollenUser.setLanguage(p.getLanguage()); + pollenUser.setAdministrator(false); + pollenUser.setBanned(false); + pollenUser.addUserCredential(credential); + pollenUser = userDao.create(pollenUser); + + commit(); + } + + return getSecurityService().getSessionTokenForUser(pollenUser); + } + + protected SocialAuthManager getSocialAuthManager() throws Exception { + //Create an instance of SocialAuthConfgi object + SocialAuthConfig config = SocialAuthConfig.getDefault(); + + //load configuration. By default load the configuration from oauth_consumer.properties. + //You can also pass input stream, properties object or properties file name. + config.load(); + + //Create an instance of SocialAuthManager and set config + SocialAuthManager manager = new SocialAuthManager(); + manager.setSocialAuthConfig(config); + + return manager; + } +} diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java index 6eaebb94..1ccb28bb 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java @@ -138,6 +138,11 @@ public class SecurityService extends PollenServiceSupport { } PollenUser user = getPollenUserDao().forEmailEquals(login).findUnique(); + return getSessionTokenForUser(user); + + } + + public PollenEntityRef<PollenUser> getSessionTokenForUser(PollenUser user) throws PollenEmailNotValidatedException, PollenUserBannedException { if (!user.isEmailValidated()) { throw new PollenEmailNotValidatedException(); } @@ -163,7 +168,6 @@ public class SecurityService extends PollenServiceSupport { commit(); return PollenEntityRef.of(sessionToken); - } public void logout() { diff --git a/pollen-services/src/main/resources/oauth_consumer.properties b/pollen-services/src/main/resources/oauth_consumer.properties new file mode 100644 index 00000000..6f015cc3 --- /dev/null +++ b/pollen-services/src/main/resources/oauth_consumer.properties @@ -0,0 +1,87 @@ +#google +www.google.com.consumer_key = opensource.brickred.com +www.google.com.consumer_secret = YC06FqhmCLWvtBg/O4W/aJfj + +#you can set custom permission by using custom_permissions with provider prefix. +#www.google.com.custom_permissions = http://www.google.com/m8/feeds/,http://picasaweb.google.com/data/ + +#you can set OAuth endpoint (RequestToken URL, Authorization URL and AccessToken URL) if required or need +#to pass extra parameter +#www.google.com.request_token_url +#www.google.com.authentication_url +#www.google.com.access_token_url + +#New registration on google will always provide OAuth2 keys which is supported by GooglePlus provider +#google plus +googleapis.com.consumer_key = XXXXXXX +googleapis.com.consumer_secret = XXXXXXXX + + +#yahoo +api.login.yahoo.com.consumer_key = dj0yJmk9VTdaSUVTU3RrWlRzJmQ9WVdrOWNtSjZNMFpITm1VbWNHbzlNQS0tJnM9Y29uc3VtZXJzZWNyZXQmeD1iMA-- +api.login.yahoo.com.consumer_secret = 1db3d0b897dac60e151aa9e2499fcb2a6b474546 + +#twitter +twitter.com.consumer_key = E3hm7J9IQbWLijpiQG7W8Q +twitter.com.consumer_secret = SGKNuXyybt0iDdgsuzVbFHOaemV7V6pr0wKwbaT2MH0 + +#facebook +graph.facebook.com.consumer_key = 152190004803645 +graph.facebook.com.consumer_secret = 64c94bd02180b0ade85889b44b2ba7c4 +#you can set custom permission by using custom_permissions with provider prefix. +#graph.facebook.com.custom_permissions = publish_stream,email,user_birthday,user_location,offline_access + +#hotmail +consent.live.com.consumer_key = 000000004403D60E +consent.live.com.consumer_secret = cYqlii67pTvgPD4pdB7NUVC7L4MIHCcs + +#Same keys will work for Linkedin OAuth2 provider +#LinkedIn +api.linkedin.com.consumer_key = 9-mmqg28fpMocVuAg87exH-RXKs70yms52GSFIqkZN25S3m96kdPGBbuSxdSBIyL +api.linkedin.com.consumer_secret = e6NBqhDYE1fX17RwYGW5vMp25Cvh7Sbw9t-zMYTIW_T5LytY5OwJ12snh_YftgE4 + +#MySpace +api.myspace.com.consumer_key = 29db395f5ee8426bb90b1db65c91c956 +api.myspace.com.consumer_secret = 0fdccc829c474e42867e16b68cda37a4c4b7b08eda574fe6a959943e3e9be709 + +#FourSquare +foursquare.com.consumer_key = JQKEM1PHWFW4YF2YPEQBRRESXE3SBGNCYJWWDTZKF3IZNJ3V +foursquare.com.consumer_secret = 4IILLDFDVPP2LC554S4KXKETQNTDKPDSEVCKVHA2QEHKYBEQ + +#Yammer +www.yammer.com.consumer_key=5zyIkp12TrkulSRbSegQ +www.yammer.com.consumer_secret=zUcCB9kqWhI1IiTAJbl9QdG2AWcUJMDWp3Qyv5VJJw + +#Please use your own keys for mendeley +#Mendeley +#api.mendeley.com.consumer_key= +#api.mendeley.com.consumer_secret= + +#Salesforce +login.salesforce.com.consumer_key = 3MVG9Y6d_Btp4xp4yFMR0tPSndkAVu4OBejuYcL2iGFC68tA49PknWKX20XdPl5s1iwWldyuAbSINWHbB2Jcu +login.salesforce.com.consumer_secret = 1993703471433041656 + +#Instagram +api.instagram.com.consumer_key=f1e23002a9da49f696d439368624c9fc +api.instagram.com.consumer_secret=f274614621f64d498cb3458b3736827a + +#Flickr +www.flickr.com.consumer_key=942a1a394b866a30dc9b4ad8db5cb8f8 +www.flickr.com.consumer_secret=f90c5bee8a8de964 + +#GITHub +api.github.com.consumer_key=4ffc69764a59dd3ce347 +api.github.com.consumer_secret=dc62937c1d7bb9ce30cb654a26d4a575858f5e1f + +#Implementations +#you can provide your custom provider here e.g 'myprovider' is your provider id +#and 'org.brickred.socialauth.provider.GoogleImpl' is your provider implementation. +#provider id should be prefixed here with 'socialauth.' +#socialauth.myprovider = org.brickred.socialauth.provider.GoogleImpl + +#If you want to set proxy for internal http calls, so you can set in following way +#proxy.host=YOUR HOST NAME(e.g. 127.0.0.1) +#proxy.port=PORT(e.g.8888) + +#If you want to set connection timeout, you can set in following way +#http.connectionTimeOut = TIMEOUT(e.g. 5000) \ No newline at end of file diff --git a/pollen-ui-riot-js/package.json b/pollen-ui-riot-js/package.json index 68ec61e0..d542116f 100644 --- a/pollen-ui-riot-js/package.json +++ b/pollen-ui-riot-js/package.json @@ -24,7 +24,7 @@ } ], "scripts": { - "start": "webpack-dev-server --hot --inline --host 0.0.0.0 --public localhost:8080", + "start": "webpack-dev-server --hot --inline --host 0.0.0.0 --public opensource.brickred.com:8080", "package": "webpack --bail" }, "devDependencies": { diff --git a/pollen-ui-riot-js/src/main/web/js/AuthService.js b/pollen-ui-riot-js/src/main/web/js/AuthService.js index 54f272c4..23b87d3a 100644 --- a/pollen-ui-riot-js/src/main/web/js/AuthService.js +++ b/pollen-ui-riot-js/src/main/web/js/AuthService.js @@ -68,6 +68,13 @@ class AuthService extends FetchService { return this.post("/v1/resendValidation", email); } + signInProvider(provider, query, providerRedirection) { + return this.fetch( + "/v1/login/" + provider, + "POST", + {Authorization: JSON.stringify(query)}, + providerRedirection); + } } module.exports = singleton(AuthService); diff --git a/pollen-ui-riot-js/src/main/web/js/Session.js b/pollen-ui-riot-js/src/main/web/js/Session.js index 27553a40..1112204f 100644 --- a/pollen-ui-riot-js/src/main/web/js/Session.js +++ b/pollen-ui-riot-js/src/main/web/js/Session.js @@ -133,26 +133,33 @@ class Session { } signIn(login, password) { - return authService.signIn(login, password).then(auth => { - logger.info("SignIn::"); - logger.info(auth); - return authService.userPromise(auth).then((user) => { - if (!user) { - logger.info("SignIn error"); - var oldUser = this.user; - this.user = null; - bus.trigger("user", this.user, oldUser); - return Promise.reject(); - } - logger.info("SignIn user::"); - logger.info(user); - pageTracker.trackLogin(); - var oldUser = this.user; - this.user = user; - bus.trigger("user", this.user, oldUser); + return authService.signIn(login, password).then(auth => this.updateConnection(auth, this)); + } - return this.user; - }); + signInProvider(provider, query) { + return authService.signInProvider(provider, query, this.getProviderRedirectionUrl(query.redirect)) + .then(auth => this.updateConnection(auth, this)); + } + + updateConnection(auth, session) { + logger.info("SignIn::"); + logger.info(auth); + return authService.userPromise(auth).then((user) => { + if (!user) { + logger.info("SignIn error"); + var oldUser = session.user; + session.user = null; + bus.trigger("user", session.user, oldUser); + return Promise.reject(); + } + logger.info("SignIn user::"); + logger.info(user); + pageTracker.trackLogin(); + var oldUser = session.user; + session.user = user; + bus.trigger("user", session.user, oldUser); + + return session.user; }); } @@ -165,6 +172,10 @@ class Session { }); } + getProviderRedirectionUrl(redirect) { + return this.pollenUIContext.uiEndPoint + "/?redirect=" + redirect; + } + } module.exports = singleton(Session); diff --git a/pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html b/pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html index 8825148a..1ac4f6cb 100644 --- a/pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html @@ -218,8 +218,18 @@ require("./popup/InformationPopup.tag.html"); }); route(() => { - this.bus.trigger("pageChanged", "home"); - riot.mount(this.refs.content, "home"); + var q = route.query(); + console.log(q); + console.log(q.redirect); + if (q.redirect != null) { + session.signInProvider("facebook", q).then(() => { + location.href = session.pollenUIContext.uiEndPoint + "/" + unescape(decodeURIComponent(q.redirect)); + }); + + } else { + this.bus.trigger("pageChanged", "home"); + riot.mount(this.refs.content, "home"); + } }); window.onkeydown = e => { diff --git a/pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html b/pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html index e6fb6efb..739345e8 100644 --- a/pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html @@ -57,6 +57,10 @@ require("./components/HumanInput.tag.html"); </div> <a onclick="{newPassword}">{__.lostpassword}</a> </form> + <p>Ou connectez vous avec votre compte + <a onclick="{signinWithProvider('facebook')}"><i class="fa fa-facebook-official"></i></a> + <a onclick="{signinWithProvider('linkedin')}"><i class="fa fa-linkedin-square"></i></a> + </p> </div> <SignUp/> @@ -68,10 +72,10 @@ require("./components/HumanInput.tag.html"); </div> <script type="es6"> - let session = require("../js/Session"); + this.session = require("../js/Session"); let route = require("riot-route"); - this.installBundle(session, "signin"); + this.installBundle(this.session, "signin"); this.message = ""; this.openSignIn = false; @@ -95,7 +99,7 @@ require("./components/HumanInput.tag.html"); this.message = ""; - session.signIn(this.refs.login.value, this.refs.password.value) + this.session.signIn(this.refs.login.value, this.refs.password.value) .then(() => { this.openSignIn = false; this.update(); @@ -106,6 +110,12 @@ require("./components/HumanInput.tag.html"); }); }); }; + + this.signinWithProvider = (provider) => (e) => { + let redirect = location.hash || "#"; + location.href = this.session.configuration.endPoint + "/v1/login/" + provider + + "?providerRedirection=" + this.session.getProviderRedirectionUrl(escape(encodeURIComponent(redirect))); + }; </script> <style> diff --git a/pollen-ui-riot-js/webpack.config.js b/pollen-ui-riot-js/webpack.config.js index 0a233ab7..11ae81fb 100644 --- a/pollen-ui-riot-js/webpack.config.js +++ b/pollen-ui-riot-js/webpack.config.js @@ -34,7 +34,7 @@ module.exports = { new CopyWebpackPlugin([ {from: "src/main/web/conf.js", transform: function(content) { - return content.toString().replace("POLLEN_API_URL", JSON.stringify(process.env.POLLEN_SERVER_CONTEXT || "http://localhost:8888/pollen-rest-api")); + return content.toString().replace("POLLEN_API_URL", JSON.stringify(process.env.POLLEN_SERVER_CONTEXT || "http://opensource.brickred.com:8888/pollen-rest-api")); }}, {from: "src/main/web/index.html"}, {from: "src/main/web/home", to: "home"}, diff --git a/pom.xml b/pom.xml index bcc9711a..d92084cf 100644 --- a/pom.xml +++ b/pom.xml @@ -627,6 +627,12 @@ </exclusions> </dependency> + <dependency> + <groupId>org.brickred</groupId> + <artifactId>socialauth</artifactId> + <version>4.14</version> + </dependency> + <!--dependency> <groupId>javax.activation</groupId> <artifactId>activation</artifactId> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/15: refs #1 ajout des credentials sur le user
by chorem.org scm 07 Sep '17

07 Sep '17

This is an automated email from the git hooks/post-receive script. New commit to branch feature/1_socialauth in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit ea9adfdeef6f6b852daeba235c7bd9452691d2dc Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Aug 11 17:52:10 2017 +0200 refs #1 ajout des credentials sur le user --- .../persistence/entity/PollenUserTopiaDao.java | 22 +++++++++++++++++++-- .../db/migration/h2/V3_0_0_8__add_credentials.sql | 13 ++++++++++++ .../postgresql/V3_0_0_8__add_credentials.sql | 12 +++++++++++ pollen-persistence/src/main/xmi/pollen.properties | 2 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 26949 -> 27595 bytes 5 files changed, 46 insertions(+), 3 deletions(-) diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenUserTopiaDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenUserTopiaDao.java index a71e1cc1..06f84e33 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenUserTopiaDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenUserTopiaDao.java @@ -21,14 +21,16 @@ package org.chorem.pollen.persistence.entity; * #L% */ -import com.google.common.collect.Maps; import org.apache.commons.lang3.StringUtils; import org.chorem.pollen.persistence.DaoUtils; import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; +import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; +import java.util.Optional; /** * @author Tony Chemit - dev(a)tchemit.fr @@ -42,7 +44,7 @@ public class PollenUserTopiaDao extends AbstractPollenUserTopiaDao<PollenUser> { public PaginationResult<PollenUser> findAll(PaginationParameter page, String search) { - Map<String, Object> parameters = Maps.newHashMap(); + Map<String, Object> parameters = new HashMap<>(); String hql = "SELECT user FROM " + PollenUser.class.getName() + " as user"; if (StringUtils.isNotBlank(search)) { @@ -68,4 +70,20 @@ public class PollenUserTopiaDao extends AbstractPollenUserTopiaDao<PollenUser> { super.delete(entity); } + + public Optional<PollenUser> tryFindUserWithCredential(String providerId, String userId) { + Objects.requireNonNull(providerId); + Objects.requireNonNull(userId); + + Map<String, Object> parameters = new HashMap<>(); + + String hql = "SELECT user FROM " + PollenUser.class.getName() + " as user " + + "INNER JOIN user." + PollenUser.PROPERTY_USER_CREDENTIAL + " as credentials " + + "WHERE credentials." + UserCredential.PROPERTY_PROVIDER + " = :providerId " + + "AND credentials." + UserCredential.PROPERTY_USER_ID + " = :userId"; + parameters.put("providerId", providerId); + parameters.put("userId", userId); + + return Optional.ofNullable(findUniqueOrNull(hql, parameters)); + } } diff --git a/pollen-persistence/src/main/resources/db/migration/h2/V3_0_0_8__add_credentials.sql b/pollen-persistence/src/main/resources/db/migration/h2/V3_0_0_8__add_credentials.sql new file mode 100644 index 00000000..1825b8ae --- /dev/null +++ b/pollen-persistence/src/main/resources/db/migration/h2/V3_0_0_8__add_credentials.sql @@ -0,0 +1,13 @@ +-- credentials + +CREATE TABLE USERCREDENTIAL ( + TOPIAID VARCHAR(255) NOT NULL PRIMARY KEY, + TOPIAVERSION BIGINT NOT NULL, + TOPIACREATEDATE TIMESTAMP, + PROVIDER VARCHAR(255), + USERID VARCHAR(255), + EMAIL VARCHAR(255), + POLLENUSER VARCHAR(255), + FOREIGN KEY (POLLENUSER) references POLLENUSER(TOPIAID) +); + diff --git a/pollen-persistence/src/main/resources/db/migration/postgresql/V3_0_0_8__add_credentials.sql b/pollen-persistence/src/main/resources/db/migration/postgresql/V3_0_0_8__add_credentials.sql new file mode 100644 index 00000000..2280308e --- /dev/null +++ b/pollen-persistence/src/main/resources/db/migration/postgresql/V3_0_0_8__add_credentials.sql @@ -0,0 +1,12 @@ +-- credentials + +CREATE TABLE USERCREDENTIAL ( + TOPIAID VARCHAR(255) NOT NULL PRIMARY KEY, + TOPIAVERSION BIGINT NOT NULL, + TOPIACREATEDATE TIMESTAMP, + PROVIDER VARCHAR(255), + USERID VARCHAR(255), + EMAIL VARCHAR(255), + POLLENUSER VARCHAR(255), + FOREIGN KEY (POLLENUSER) references POLLENUSER(TOPIAID) +); diff --git a/pollen-persistence/src/main/xmi/pollen.properties b/pollen-persistence/src/main/xmi/pollen.properties index 49cb0e8f..16d95ab4 100644 --- a/pollen-persistence/src/main/xmi/pollen.properties +++ b/pollen-persistence/src/main/xmi/pollen.properties @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ###m -model.tagvalue.version=3.0.0.7 +model.tagvalue.version=3.0.0.8 #model.tagValue.notGenerateToString=true #model.tagValue.constantPrefix=PROPERTY_ #model.tagValue.useEnumerationName=true diff --git a/pollen-persistence/src/main/xmi/pollen.zargo b/pollen-persistence/src/main/xmi/pollen.zargo index f967fa89..72886764 100644 Binary files a/pollen-persistence/src/main/xmi/pollen.zargo and b/pollen-persistence/src/main/xmi/pollen.zargo differ -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch feature/1_socialauth updated (445695a5 -> aa859951)
by chorem.org scm 07 Sep '17

07 Sep '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/1_socialauth in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git omits 445695a5 refs #1 gestion de la suppression des credentials omits e18b813c refs #1 mise en page des comptes externes dans le profil omits 0821907e fix build omits dfd6aa67 refs #1 ajout de credentials depuis le profil omits d20e8ccc refs #1 permettre d'ajouter des comptes tiers à un compte existant omits 3b091220 refs #1 permettre l'ajout d'un mot de passe à des comptes créés à partir de service tiers omits 52a15fd5 refs #1 envoi d'un mail à la création d'un compte a partir d'un service tiers omits c04a57ed refs #1 erreur si l'utilisateur veut se connecter via un service tiers et que son email est deja utilisé par un autre compte Pollen omits 6ad03011 refs #1 gestion des tiers de connexion + style du login omits 96d56ad1 refs #1 ajout du socialmanager dans la session en attendant le retour du provider + gestion des tiers de connexion + gestion des comptes sans email omits e7253bfe refs #1 ajout de la conf des providers dans la base (plus simple à modifier) + début de l'admin omits 85efd12e refs #1 connexion avec google omits 6c2eaa6f refs #1 utilisation de la lib socialauth pour se connecter via des services tiers omits 36f48513 refs #1 ajout des credentials sur le user adds c3efed1b Add an offer page adds bea5382f Vérification des traductions, Séparation des traductions (1 fichier par langue) rechargement de type de vote à la modification de la locale (ref #123) adds 18a61096 Merge branch 'develop' of gitlab.nuiton.org:chorem/pollen into develop new 6e63e1c4 refs #1 ajout des credentials sur le user new c581c872 refs #1 utilisation de la lib socialauth pour se connecter via des services tiers new 3d3db40b refs #1 connexion avec google new 9ec9ff65 refs #1 ajout de la conf des providers dans la base (plus simple à modifier) + début de l'admin new 40bb3dc9 refs #1 ajout du socialmanager dans la session en attendant le retour du provider + gestion des tiers de connexion + gestion des comptes sans email new a63cca0d refs #1 gestion des tiers de connexion + style du login new a32cf352 refs #1 erreur si l'utilisateur veut se connecter via un service tiers et que son email est deja utilisé par un autre compte Pollen new 01639cf5 refs #1 envoi d'un mail à la création d'un compte a partir d'un service tiers new 1a386c04 refs #1 permettre l'ajout d'un mot de passe à des comptes créés à partir de service tiers new ef68f13e refs #1 permettre d'ajouter des comptes tiers à un compte existant new 0975e601 refs #1 ajout de credentials depuis le profil new 8e108414 fix build new 6e891e73 refs #1 mise en page des comptes externes dans le profil new f4cb642f refs #1 gestion de la suppression des credentials new aa859951 refs #1 séparaion des langues This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (445695a5) \ N -- N -- N refs/heads/feature/1_socialauth (aa859951) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 15 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit aa85995120122bfe8cd0a84099f3ef6457ad882e Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Sep 7 11:22:15 2017 +0200 refs #1 séparaion des langues commit f4cb642f147d1e8bb098fae4f27fc655d2d81a70 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Sep 7 11:01:10 2017 +0200 refs #1 gestion de la suppression des credentials commit 6e891e738403a7413e977ca566411d1e9b5260b9 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Sep 7 10:48:45 2017 +0200 refs #1 mise en page des comptes externes dans le profil commit 8e108414b4bfd6a54dbf38c0cb3c176dbf64f4a5 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Sep 5 16:48:06 2017 +0200 fix build commit 0975e601980fb223ec2691e40008a085b20df618 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Sep 5 16:08:48 2017 +0200 refs #1 ajout de credentials depuis le profil commit ef68f13ec531f3bbbf6ee5f376c6806cb8d17835 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Sep 4 15:21:58 2017 +0200 refs #1 permettre d'ajouter des comptes tiers à un compte existant commit 1a386c04b87a7c148a55aeb475f84cf2ea471ba0 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Aug 31 16:08:45 2017 +0200 refs #1 permettre l'ajout d'un mot de passe à des comptes créés à partir de service tiers commit 01639cf58db6b57ca78fe8097bd221f226005cc0 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Aug 31 14:57:45 2017 +0200 refs #1 envoi d'un mail à la création d'un compte a partir d'un service tiers commit a32cf352ca05b298cd6abb2d82ae8e8e958644c7 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Aug 29 17:57:01 2017 +0200 refs #1 erreur si l'utilisateur veut se connecter via un service tiers et que son email est deja utilisé par un autre compte Pollen commit a63cca0d24332ec0b9c70599f652e2cf8eb83832 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Aug 25 18:04:36 2017 +0200 refs #1 gestion des tiers de connexion + style du login commit 40bb3dc9b68e3e40816a9d2181542416e9a5a9f6 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Aug 25 18:03:46 2017 +0200 refs #1 ajout du socialmanager dans la session en attendant le retour du provider + gestion des tiers de connexion + gestion des comptes sans email commit 9ec9ff65a8a5d82fdf67bfd5742704c49f913d1d Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Aug 24 17:35:35 2017 +0200 refs #1 ajout de la conf des providers dans la base (plus simple à modifier) + début de l'admin commit 3d3db40bcd343b818e04445e8856f2858987c9d5 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Aug 24 11:05:45 2017 +0200 refs #1 connexion avec google commit c581c872057641079a7d14115c6036e03a54d1f8 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Aug 11 17:52:32 2017 +0200 refs #1 utilisation de la lib socialauth pour se connecter via des services tiers commit 6e63e1c4ae64ec40ee24ff739576f29f7fddbfbc Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Aug 11 17:52:10 2017 +0200 refs #1 ajout des credentials sur le user Summary of changes: .../rest/api/PollenRestApiRequestFilter.java | 24 +- pollen-ui-riot-js/src/main/web/homeCL/offers.html | 74 ++ pollen-ui-riot-js/src/main/web/homeCL/style.css | 14 +- pollen-ui-riot-js/src/main/web/i18n.json | 1099 -------------------- pollen-ui-riot-js/src/main/web/i18n/en.json | 554 ++++++++++ pollen-ui-riot-js/src/main/web/i18n/fr.json | 554 ++++++++++ pollen-ui-riot-js/src/main/web/js/FetchService.js | 5 +- pollen-ui-riot-js/src/main/web/js/Poll.js | 10 + pollen-ui-riot-js/src/main/web/js/PollForm.js | 12 +- pollen-ui-riot-js/src/main/web/js/Session.js | 5 +- .../src/main/web/tag/poll/Poll.tag.html | 8 +- .../src/main/web/tag/poll/Settings.tag.html | 8 + 12 files changed, 1249 insertions(+), 1118 deletions(-) create mode 100644 pollen-ui-riot-js/src/main/web/homeCL/offers.html delete mode 100644 pollen-ui-riot-js/src/main/web/i18n.json create mode 100644 pollen-ui-riot-js/src/main/web/i18n/en.json create mode 100644 pollen-ui-riot-js/src/main/web/i18n/fr.json -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 15

branch develop updated (18a61096 -> 00f2c6af)
by chorem.org scm 07 Sep '17

07 Sep '17

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 18a61096 Merge branch 'develop' of gitlab.nuiton.org:chorem/pollen into develop new 00f2c6af Pour les participant d'un sondage, ne pas proposer d'inporter une list de favoris si l'utilisateur n'en a pas définis (ref #132) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 00f2c6af9ac54c3d1b803f4d262544260b48fc37 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Sep 7 11:17:19 2017 +0200 Pour les participant d'un sondage, ne pas proposer d'inporter une list de favoris si l'utilisateur n'en a pas définis (ref #132) Summary of changes: pollen-ui-riot-js/src/main/web/i18n/en.json | 1 - pollen-ui-riot-js/src/main/web/i18n/fr.json | 1 - .../tag/voterList/ImportFavoritListModal.tag.html | 29 +++++----------------- .../src/main/web/tag/voterList/VoterList.tag.html | 25 ++++++++++++++++--- .../i18n/pollen-votecounting-api_fr_FR.properties | 2 +- 5 files changed, 28 insertions(+), 30 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch feature/1_socialauth updated (0821907e -> 445695a5)
by chorem.org scm 07 Sep '17

07 Sep '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/1_socialauth in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 0821907e fix build new e18b813c refs #1 mise en page des comptes externes dans le profil new 445695a5 refs #1 gestion de la suppression des credentials The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 445695a58820b7ddf47fe6a8a5630fbdb04b934d Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Sep 7 11:01:10 2017 +0200 refs #1 gestion de la suppression des credentials commit e18b813c7b01bd9ced24be48beabdbd7753c321f Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Sep 7 10:48:45 2017 +0200 refs #1 mise en page des comptes externes dans le profil Summary of changes: .../pollen/services/bean/UserCredentialBean.java | 11 +++ pollen-ui-riot-js/src/main/web/css/custom.css | 2 + pollen-ui-riot-js/src/main/web/i18n.json | 4 + .../src/main/web/tag/UserProfile.tag.html | 85 +++++++++++++++------- .../src/main/web/tag/admin/LoginProviders.tag.html | 2 +- 5 files changed, 76 insertions(+), 28 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2

branch develop updated (bea5382f -> 18a61096)
by chorem.org scm 06 Sep '17

06 Sep '17

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from bea5382f Vérification des traductions, Séparation des traductions (1 fichier par langue) rechargement de type de vote à la modification de la locale (ref #123) new c3efed1b Add an offer page new 18a61096 Merge branch 'develop' of gitlab.nuiton.org:chorem/pollen into develop The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 18a61096f62c53b532e61b7e69d8b657817c85ce Merge: c3efed1b bea5382f Author: Samuel Maisonneuve <maisonneuve(a)codelutin.com> Date: Wed Sep 6 18:28:27 2017 +0200 Merge branch 'develop' of gitlab.nuiton.org:chorem/pollen into develop commit c3efed1b8f853a300cdc53758607cc0035e8f464 Author: Samuel Maisonneuve <maisonneuve(a)codelutin.com> Date: Wed Sep 6 18:27:45 2017 +0200 Add an offer page Summary of changes: pollen-ui-riot-js/src/main/web/homeCL/offers.html | 74 +++++++++++++++++++++++ pollen-ui-riot-js/src/main/web/homeCL/style.css | 14 ++++- 2 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 pollen-ui-riot-js/src/main/web/homeCL/offers.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2

branch develop updated (d5dd29cf -> bea5382f)
by chorem.org scm 06 Sep '17

06 Sep '17

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from d5dd29cf fix build new bea5382f Vérification des traductions, Séparation des traductions (1 fichier par langue) rechargement de type de vote à la modification de la locale (ref #123) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit bea5382f7f874885ec300ceb12e7ef76183f8d03 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Wed Sep 6 17:11:56 2017 +0200 Vérification des traductions, Séparation des traductions (1 fichier par langue) rechargement de type de vote à la modification de la locale (ref #123) Summary of changes: .../rest/api/PollenRestApiRequestFilter.java | 24 +- pollen-ui-riot-js/src/main/web/i18n.json | 1063 -------------------- pollen-ui-riot-js/src/main/web/i18n/en.json | 536 ++++++++++ pollen-ui-riot-js/src/main/web/i18n/fr.json | 536 ++++++++++ pollen-ui-riot-js/src/main/web/js/FetchService.js | 5 +- pollen-ui-riot-js/src/main/web/js/Poll.js | 10 + pollen-ui-riot-js/src/main/web/js/PollForm.js | 12 +- pollen-ui-riot-js/src/main/web/js/Session.js | 5 +- .../src/main/web/tag/poll/Poll.tag.html | 8 +- .../src/main/web/tag/poll/Settings.tag.html | 8 + 10 files changed, 1126 insertions(+), 1081 deletions(-) delete mode 100644 pollen-ui-riot-js/src/main/web/i18n.json create mode 100644 pollen-ui-riot-js/src/main/web/i18n/en.json create mode 100644 pollen-ui-riot-js/src/main/web/i18n/fr.json -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch feature/1_socialauth updated (dfd6aa67 -> 0821907e)
by chorem.org scm 05 Sep '17

05 Sep '17

This is an automated email from the git hooks/post-receive script. New change to branch feature/1_socialauth in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from dfd6aa67 refs #1 ajout de credentials depuis le profil new 0821907e fix build The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 0821907e003603c97970e50218fa4ffc7e1425fe Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Sep 5 16:48:06 2017 +0200 fix build Summary of changes: .../main/java/org/chorem/pollen/rest/api/v1/AuthApi.java | 2 +- .../org/chorem/pollen/services/bean/PollenUserBean.java | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1