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

branch develop updated (bea5382f -> 18a61096)
by chorem.org scm Sept. 6, 2017

Sept. 6, 2017

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 Sept. 6, 2017

Sept. 6, 2017

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 Sept. 5, 2017

Sept. 5, 2017

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

branch feature/1_socialauth updated (d20e8ccc -> dfd6aa67)
by chorem.org scm Sept. 5, 2017

Sept. 5, 2017

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 d20e8ccc refs #1 permettre d'ajouter des comptes tiers à un compte existant new dfd6aa67 refs #1 ajout de credentials depuis le profil 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 dfd6aa671245b7543c18afbfc2d69eb063e537b2 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Sep 5 16:08:48 2017 +0200 refs #1 ajout de credentials depuis le profil Summary of changes: .../org/chorem/pollen/rest/api/v1/AuthApi.java | 2 +- pollen-ui-riot-js/src/main/web/i18n.json | 8 +++- pollen-ui-riot-js/src/main/web/js/AuthService.js | 19 ++++++-- pollen-ui-riot-js/src/main/web/js/Session.js | 2 +- pollen-ui-riot-js/src/main/web/js/UserService.js | 11 +++++ pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 35 +++++++++++--- pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html | 28 +++-------- .../src/main/web/tag/UserProfile.tag.html | 56 ++++++++++++++++++++-- .../src/main/web/tag/admin/Users.tag.html | 4 +- 9 files changed, 124 insertions(+), 41 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 (c04a57ed -> d20e8ccc)
by chorem.org scm Sept. 5, 2017

Sept. 5, 2017

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 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 new 52a15fd5 refs #1 envoi d'un mail à la création d'un compte a partir d'un service tiers new 3b091220 refs #1 permettre l'ajout d'un mot de passe à des comptes créés à partir de service tiers new d20e8ccc refs #1 permettre d'ajouter des comptes tiers à un compte existant The 3 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 d20e8cccd0f2aa719ec15b108a13b583c8f049b8 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 3b0912205a842e282c2be9b4d36ea1e89720a5f1 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 52a15fd5cdd12976cc22c029b18dc438fd8bf2b6 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 Summary of changes: .../persistence/entity/UserCredentialTopiaDao.java | 30 +++++++ .../db/migration/h2/V3_0_0_8__add_credentials.sql | 1 + .../postgresql/V3_0_0_8__add_credentials.sql | 1 + pollen-persistence/src/main/xmi/pollen.zargo | Bin 28069 -> 28138 bytes .../pollen/rest/api/PollenRestApiApplication.java | 4 +- .../PollenEmailAlreadyUsedExceptionMapper.java | 20 ----- ...rProviderAccountAlreadyUsedExceptionMapper.java | 20 +++++ .../org/chorem/pollen/rest/api/v1/ApiUtils.java | 2 + .../org/chorem/pollen/rest/api/v1/AuthApi.java | 11 ++- .../chorem/pollen/rest/api/v1/PollenUserApi.java | 39 +++++++-- .../chorem/pollen/services/PollenUIContext.java | 10 +++ .../pollen/services/bean/PollenUserBean.java | 33 +++++++- .../pollen/services/bean/UserCredentialBean.java | 49 +++++++++++ .../services/service/NotificationService.java | 11 +++ .../pollen/services/service/PollenUserService.java | 9 +- .../pollen/services/service/SocialAuthService.java | 92 +++++++++++++++++---- .../pollen/services/service/mail/EmailService.java | 35 ++++++++ ...va => UserAccountCreatedFromProviderEmail.java} | 38 ++++----- .../security/PollenAuthenticationException.java | 4 + .../security/PollenEmailAlreadyUsedException.java | 11 --- ...EmailOrProviderAccountAlreadyUsedException.java | 11 +++ .../services/service/security/SecurityService.java | 10 ++- .../UserAccountCreatedFromProviderEmail.mustache | 10 +++ ...UserAccountCreatedFromProviderEmail_fr.mustache | 11 +++ .../i18n/pollen-services_en_GB.properties | 20 +++++ .../i18n/pollen-services_fr_FR.properties | 20 +++++ .../service/PollenUIUrlRenderServiceTest.java | 1 + pollen-ui-riot-js/src/main/web/i18n.json | 2 + pollen-ui-riot-js/src/main/web/js/Session.js | 3 +- pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html | 2 +- .../src/main/web/tag/UserProfile.tag.html | 11 ++- .../src/main/web/tag/poll/Polls.tag.html | 2 +- 32 files changed, 426 insertions(+), 97 deletions(-) create mode 100644 pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/UserCredentialTopiaDao.java delete mode 100644 pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/exceptionMappers/PollenEmailAlreadyUsedExceptionMapper.java create mode 100644 pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/exceptionMappers/PollenEmailOrProviderAccountAlreadyUsedExceptionMapper.java create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/bean/UserCredentialBean.java copy pollen-services/src/main/java/org/chorem/pollen/services/service/mail/{UserAccountCreatedEmail.java => UserAccountCreatedFromProviderEmail.java} (66%) delete mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/service/security/PollenEmailAlreadyUsedException.java create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/service/security/PollenEmailOrProviderAccountAlreadyUsedException.java create mode 100644 pollen-services/src/main/resources/email/UserAccountCreatedFromProviderEmail.mustache create mode 100644 pollen-services/src/main/resources/email/UserAccountCreatedFromProviderEmail_fr.mustache -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 3