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