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

branch develop updated (00f2c6af -> e56d7236)
by chorem.org scm Sept. 7, 2017

Sept. 7, 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 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) adds ea9adfde refs #1 ajout des credentials sur le user adds 64cc7bbc refs #1 utilisation de la lib socialauth pour se connecter via des services tiers adds 253dd540 refs #1 connexion avec google adds b5c67229 refs #1 ajout de la conf des providers dans la base (plus simple à modifier) + début de l'admin adds 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 adds cfa63ad2 refs #1 gestion des tiers de connexion + style du login adds 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 adds 1cbe1725 refs #1 envoi d'un mail à la création d'un compte a partir d'un service tiers adds 71bf5022 refs #1 permettre l'ajout d'un mot de passe à des comptes créés à partir de service tiers adds 160da205 refs #1 permettre d'ajouter des comptes tiers à un compte existant adds dee2bf14 refs #1 ajout de credentials depuis le profil adds aacfec6e fix build adds e36db9ab refs #1 mise en page des comptes externes dans le profil adds b34a7a02 refs #1 gestion de la suppression des credentials adds d545965b refs #1 séparaion des langues new e56d7236 fixes #1 3rd services authentication 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 e56d723693347dec90e7076d37ac2bd5e88a0577 Merge: 00f2c6af d545965b Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Sep 7 11:41:17 2017 +0200 fixes #1 3rd services authentication Summary of changes: .../persistence/entity/PollenUserTopiaDao.java | 22 +- .../persistence/entity/UserCredentialTopiaDao.java | 30 +++ .../db/migration/h2/V3_0_0_8__add_credentials.sql | 14 ++ .../migration/h2/V3_0_0_9__add_loginproviders.sql | 13 ++ .../postgresql/V3_0_0_8__add_credentials.sql | 13 ++ .../postgresql/V3_0_0_9__add_loginproviders.sql | 12 + pollen-persistence/src/main/xmi/pollen.properties | 2 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 26949 -> 28138 bytes .../pollen/rest/api/PollenRestApiApplication.java | 2 + .../rest/api/PollenRestApiRequestFilter.java | 2 + ...rProviderAccountAlreadyUsedExceptionMapper.java | 20 ++ .../org/chorem/pollen/rest/api/v1/ApiUtils.java | 2 + .../org/chorem/pollen/rest/api/v1/AuthApi.java | 169 ++++++++++---- .../chorem/pollen/rest/api/v1/PollenUserApi.java | 39 +++- pollen-services/pom.xml | 5 + .../chorem/pollen/services/PollenUIContext.java | 10 + .../pollen/services/bean/LoginProviderBean.java | 82 +++++++ .../pollen/services/bean/PollenUserBean.java | 35 ++- .../pollen/services/bean/UserCredentialBean.java | 60 +++++ .../services/service/NotificationService.java | 61 +++-- .../services/service/PollenServiceSupport.java | 10 + .../pollen/services/service/PollenUserService.java | 9 +- .../pollen/services/service/SocialAuthService.java | 246 +++++++++++++++++++++ .../pollen/services/service/mail/EmailService.java | 35 +++ ...va => UserAccountCreatedFromProviderEmail.java} | 38 ++-- .../security/PollenAuthenticationException.java | 4 + ...EmailOrProviderAccountAlreadyUsedException.java | 11 + .../services/service/security/SecurityService.java | 16 +- .../UserAccountCreatedFromProviderEmail.mustache | 10 + ...UserAccountCreatedFromProviderEmail_fr.mustache | 11 + .../i18n/pollen-services_en_GB.properties | 20 ++ .../i18n/pollen-services_fr_FR.properties | 20 ++ .../src/main/resources/oauth_consumer.properties | 87 ++++++++ .../service/PollenUIUrlRenderServiceTest.java | 1 + pollen-ui-riot-js/package.json | 2 +- pollen-ui-riot-js/src/main/web/css/custom.css | 2 + pollen-ui-riot-js/src/main/web/css/main.css | 8 + pollen-ui-riot-js/src/main/web/i18n/en.json | 20 +- pollen-ui-riot-js/src/main/web/i18n/fr.json | 20 +- pollen-ui-riot-js/src/main/web/img/logo.png | Bin 0 -> 10506 bytes pollen-ui-riot-js/src/main/web/js/AuthService.js | 43 ++++ pollen-ui-riot-js/src/main/web/js/FetchService.js | 5 +- pollen-ui-riot-js/src/main/web/js/Session.js | 52 +++-- pollen-ui-riot-js/src/main/web/js/UserService.js | 11 + pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 69 +++++- .../src/main/web/tag/PollenHeader.tag.html | 1 + .../src/main/web/tag/PollenMessageManager.tag.html | 2 + pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html | 128 +++++++---- pollen-ui-riot-js/src/main/web/tag/SignUp.tag.html | 4 +- .../src/main/web/tag/UserProfile.tag.html | 96 +++++++- .../src/main/web/tag/admin/LoginProviders.tag.html | 164 ++++++++++++++ .../src/main/web/tag/{ => admin}/UserCard.tag.html | 6 +- .../web/tag/{ => admin}/UserEditModal.tag.html | 8 +- .../src/main/web/tag/{ => admin}/Users.tag.html | 14 +- .../src/main/web/tag/poll/Polls.tag.html | 2 +- pollen-ui-riot-js/webpack.config.js | 2 +- pom.xml | 6 + 57 files changed, 1581 insertions(+), 195 deletions(-) create mode 100644 pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/UserCredentialTopiaDao.java create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_0_0_8__add_credentials.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_0_0_9__add_loginproviders.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_0_0_8__add_credentials.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_0_0_9__add_loginproviders.sql 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/LoginProviderBean.java create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/bean/UserCredentialBean.java create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/service/SocialAuthService.java copy pollen-services/src/main/java/org/chorem/pollen/services/service/mail/{UserAccountCreatedEmail.java => UserAccountCreatedFromProviderEmail.java} (66%) 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 create mode 100644 pollen-services/src/main/resources/oauth_consumer.properties create mode 100644 pollen-ui-riot-js/src/main/web/img/logo.png create mode 100644 pollen-ui-riot-js/src/main/web/tag/admin/LoginProviders.tag.html rename pollen-ui-riot-js/src/main/web/tag/{ => admin}/UserCard.tag.html (95%) rename pollen-ui-riot-js/src/main/web/tag/{ => admin}/UserEditModal.tag.html (94%) rename pollen-ui-riot-js/src/main/web/tag/{ => admin}/Users.tag.html (83%) -- 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 (aa859951 -> d545965b)
by chorem.org scm Sept. 7, 2017

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

branch feature/1_socialauth updated (445695a5 -> aa859951)
by chorem.org scm Sept. 7, 2017

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

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

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