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 8281c4c0 ajout du type de bouton adds 681c5f06 refs #44 debut de modifs du back pour accepter plusieurs emails par utilisateur adds 4984c6df fichier oublié adds 062dbeac refs #44 checks de sécurité + refactoring + tests unitaires adds 36295f55 corrections exceptions adds 36c7fa73 refs #44 correction de la migration adds e574d5ce refs #44 envoi d'un mail pour validation de l'adresse email adds cd10e94e refs #44 corrections adds 8c99b526 refs #44 nouvelle ui pour les adresses email adds 41a0c8a3 refs #44 meilleure gestion des emails de validation adds 86a73fba refs #44 validation de l'adresse email par l'admin adds ca0eeef8 refs #44 gestion des adresses email par l'admin adds 90f30944 gestion de l'avatar par l'admin adds afb6df3c refs #44 correction de la migration pour ajouter les emails des providers new 1a9d7396 fixes #44 Several email addresses for the users 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 1a9d739657f12250a6fc32a01fcaee41c552e557 Merge: 8281c4c0 afb6df3c Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 16 11:59:20 2017 +0200 fixes #44 Several email addresses for the users Summary of changes: .../common/V3_1_0_5__Extract_email_addresses.java | 107 +++++++++++ .../entity/PollenUserEmailAddressTopiaDao.java | 21 ++ .../pollen/persistence/entity/PollenUserImpl.java | 2 +- .../persistence/entity/PollenUserTopiaDao.java | 23 ++- .../pollen/persistence/entity/PollenUsers.java | 35 ---- .../persistence/entity/UserCredentialTopiaDao.java | 18 +- .../h2/V3_1_0_4__add_email_address_table.sql | 13 ++ .../h2/V3_1_0_6__drop_email_from_user.sql | 2 + .../V3_1_0_4__add_email_address_table.sql | 13 ++ .../postgresql/V3_1_0_6__drop_email_from_user.sql | 2 + pollen-persistence/src/main/xmi/pollen.properties | 2 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 29234 -> 30366 bytes .../pollen/rest/api/PollenRestApiApplication.java | 2 + .../rest/api/PollenRestApiApplicationListener.java | 4 +- ... PollenDefaultEmailAddressExceptionMapper.java} | 12 +- .../chorem/pollen/rest/api/v1/PollenUserApi.java | 69 +++++++ .../chorem/pollen/rest/api/PollenUserApiTest.java | 2 +- .../org/chorem/pollen/services/PollenFixtures.java | 4 + .../pollen/services/bean/PollenUserBean.java | 30 ++- .../services/bean/PollenUserEmailAddressBean.java | 33 ++++ .../pollen/services/service/FixturesService.java | 7 + .../services/service/NotificationService.java | 49 +++-- .../pollen/services/service/PollService.java | 6 +- .../services/service/PollenServiceSupport.java | 5 + .../pollen/services/service/PollenUserService.java | 214 +++++++++++++++------ .../pollen/services/service/SocialAuthService.java | 36 +++- .../pollen/services/service/VoterListService.java | 82 +------- .../pollen/services/service/mail/EmailService.java | 22 ++- .../services/service/mail/LostPasswordEmail.java | 3 - .../service/mail/ResendValidationEmail.java | 12 -- .../service/mail/UserAccountCreatedEmail.java | 20 -- .../mail/UserAccountCreatedFromProviderEmail.java | 3 - .../service/mail/UserAccountDeletedEmail.java | 3 - .../service/mail/UserAccountEditedEmail.java | 3 - ...java => UserAccountEmailAddressAddedEmail.java} | 23 ++- .../mail/UserAccountEmailValidatedEmail.java | 3 - .../mail/UserAccountPasswordChangedEmail.java | 3 - ...ava => PollenDefaultEmailAddressException.java} | 6 +- .../service/security/PollenSecurityRealm.java | 2 +- .../services/service/security/SecurityService.java | 21 +- .../resources/email/ResendValidationEmail.mustache | 6 +- .../email/ResendValidationEmail_fr.mustache | 6 +- .../email/UserAccountCreatedEmail.mustache | 8 +- .../email/UserAccountCreatedEmail_fr.mustache | 8 +- .../UserAccountEmailAddressAddedEmail.mustache | 5 + .../UserAccountEmailAddressAddedEmail_fr.mustache | 5 + .../email/UserAccountEmailValidatedEmail.mustache | 4 +- .../UserAccountEmailValidatedEmail_fr.mustache | 4 +- pollen-services/src/main/resources/fixtures.yaml | 49 ++++- .../i18n/pollen-services_en_GB.properties | 38 ++-- .../i18n/pollen-services_fr_FR.properties | 6 +- .../services/service/FavoriteListServiceTest.java | 10 +- .../pollen/services/service/PollServiceTest.java | 10 +- .../services/service/PollenUserServiceTest.java | 151 +++++++++------ .../services/service/VoterListServiceTest.java | 6 +- pollen-ui-riot-js/src/main/web/css/main.css | 8 + pollen-ui-riot-js/src/main/web/i18n/en.json | 33 ++-- pollen-ui-riot-js/src/main/web/i18n/fr.json | 72 ++++--- pollen-ui-riot-js/src/main/web/js/AuthService.js | 4 + pollen-ui-riot-js/src/main/web/js/UserService.js | 43 ++++- .../src/main/web/tag/PollenHeader.tag.html | 4 +- .../src/main/web/tag/SignCheck.tag.html | 17 +- .../src/main/web/tag/UserProfile.tag.html | 118 ++++++------ .../src/main/web/tag/admin/UserCard.tag.html | 7 +- .../src/main/web/tag/admin/UserEditModal.tag.html | 169 +++++++++------- .../src/main/web/tag/components/Card.tag.html | 8 +- .../tag/components/UserEmailAddressList.tag.html | 139 +++++++++++++ .../main/web/tag/popup/InformationPopup.tag.html | 2 +- .../src/main/web/tag/popup/Modal.tag.html | 2 +- 69 files changed, 1228 insertions(+), 631 deletions(-) create mode 100644 pollen-persistence/src/main/java/db/migration/common/V3_1_0_5__Extract_email_addresses.java create mode 100644 pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenUserEmailAddressTopiaDao.java delete mode 100644 pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenUsers.java create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_1_0_4__add_email_address_table.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_1_0_6__drop_email_from_user.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_1_0_4__add_email_address_table.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_1_0_6__drop_email_from_user.sql copy pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/exceptionMappers/{PollenUserBannedExceptionMapper.java => PollenDefaultEmailAddressExceptionMapper.java} (68%) create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenUserEmailAddressBean.java copy pollen-services/src/main/java/org/chorem/pollen/services/service/mail/{UserAccountDeletedEmail.java => UserAccountEmailAddressAddedEmail.java} (70%) copy pollen-services/src/main/java/org/chorem/pollen/services/service/security/{PollenUserBannedException.java => PollenDefaultEmailAddressException.java} (86%) create mode 100644 pollen-services/src/main/resources/email/UserAccountEmailAddressAddedEmail.mustache create mode 100644 pollen-services/src/main/resources/email/UserAccountEmailAddressAddedEmail_fr.mustache create mode 100644 pollen-ui-riot-js/src/main/web/tag/components/UserEmailAddressList.tag.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.