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@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@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@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@chorem.org>.