This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git 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 .../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 +++ .../mail/UserAccountCreatedFromProviderEmail.java | 76 +++++++ .../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, 1643 insertions(+), 171 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.