branch develop updated (1a9d7396 -> d4cab629)
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 1a9d7396 fixes #44 Several email addresses for the users adds f084635d en fonction de la configuration serveur rendre obligatoire la connexion des utilisateur (refs #85) adds 4a45f10f ajout du lien qui explique comment tester les providers en local adds 6d8f4a2a droit de création de sondage (refs #85) new 9fc5f9a0 Merge branch 'feature/85-droits-utilisateurs' into develop new d4cab629 correction des mails pour la création de compte 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 d4cab6294dd7fb3ae7e72e0fc7f3cde928c8ac4f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Oct 17 11:35:00 2017 +0200 correction des mails pour la création de compte commit 9fc5f9a059dbfb828ce8f975e840f262f9767531 Merge: 1a9d7396 6d8f4a2a Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Oct 17 11:33:35 2017 +0200 Merge branch 'feature/85-droits-utilisateurs' into develop Summary of changes: README.md | 5 +- .../h2/V3_1_0_7__add_user_can_create_poll.sql | 3 + .../V3_1_0_7__add_user_can_create_poll.sql | 3 + pollen-persistence/src/main/xmi/pollen.properties | 2 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 30366 -> 30431 bytes .../pollen/rest/api/PollenRestApiApplication.java | 4 + .../rest/api/PollenRestApiRequestFilter.java | 51 ++- .../PollenUnauthorizedExceptionMapper.java | 2 +- .../PollenUserUnknownExceptionMapper.java | 20 + .../org/chorem/pollen/rest/api/v1/AuthApi.java | 3 +- .../pollen/rest/api/v1/ConfigurationApi.java | 29 ++ .../org/chorem/pollen/rest/api/v1/PollApi.java | 2 +- pollen-services/src/main/config/PollenServices.ini | 14 +- .../pollen/services/bean/ConfigurationBean.java | 27 ++ .../pollen/services/bean/PollenUserBean.java | 10 + .../chorem/pollen/services/bean/UsersRight.java | 12 + .../services/config/PollenServicesConfig.java | 6 + .../pollen/services/service/ChoiceService.java | 6 + .../pollen/services/service/CommentService.java | 7 + .../services/service/ConfigurationService.java | 18 + .../pollen/services/service/FeedService.java | 2 + .../chorem/pollen/services/service/GtuService.java | 2 + .../pollen/services/service/PollService.java | 36 +- .../services/service/PollenResourceService.java | 7 + .../services/service/PollenServiceSupport.java | 28 ++ .../pollen/services/service/PollenUserService.java | 6 + .../pollen/services/service/ReportService.java | 10 + .../pollen/services/service/SocialAuthService.java | 1 + .../services/service/VoteCountingService.java | 1 + .../services/service/VoteCountingTypeService.java | 2 + .../pollen/services/service/VoteService.java | 8 + .../pollen/services/service/VoterListService.java | 15 + .../security/PollenEmailNotValidatedException.java | 2 + .../security/PollenUserBannedException.java | 2 + ...eption.java => PollenUserUnknownException.java} | 8 +- .../services/service/security/SecurityService.java | 33 +- .../i18n/pollen-services_en_GB.properties | 3 + .../i18n/pollen-services_fr_FR.properties | 3 + .../pollen/services/service/PollServiceTest.java | 4 +- .../services/service/VoteCountingServiceTest.java | 3 + pollen-ui-riot-js/package.json | 4 +- pollen-ui-riot-js/src/main/web/home/en.html | 6 +- pollen-ui-riot-js/src/main/web/home/fr.html | 6 +- pollen-ui-riot-js/src/main/web/homeCL/en.html | 6 +- pollen-ui-riot-js/src/main/web/homeCL/fr.html | 6 +- pollen-ui-riot-js/src/main/web/homeCL/offers.html | 6 +- pollen-ui-riot-js/src/main/web/i18n/fr.json | 1 + pollen-ui-riot-js/src/main/web/index.js | 2 +- pollen-ui-riot-js/src/main/web/js/AuthService.js | 4 +- ...{FeedbackService.js => ConfigurationService.js} | 14 +- pollen-ui-riot-js/src/main/web/js/FetchService.js | 2 +- pollen-ui-riot-js/src/main/web/js/PollForm.js | 2 +- pollen-ui-riot-js/src/main/web/js/Session.js | 66 ++-- .../src/main/web/tag/Authorization.tag.html | 74 ++++ .../src/main/web/tag/FilterLoginProvider.tag.js | 46 +++ .../src/main/web/tag/PageChanged.tag.js | 7 + pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 434 +++++++++------------ .../src/main/web/tag/PollenHeader.tag.html | 44 ++- .../src/main/web/tag/SignCheck.tag.html | 8 +- pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html | 27 +- pollen-ui-riot-js/src/main/web/tag/SignUp.tag.html | 6 +- .../src/main/web/tag/SigninAction.tag.js | 13 + .../src/main/web/tag/UserProfile.tag.html | 8 +- .../src/main/web/tag/admin/UserCard.tag.html | 18 +- .../src/main/web/tag/admin/UserEditModal.tag.html | 25 +- .../web/tag/favoriteList/FavoriteList.tag.html | 8 +- .../favoriteList/FavoriteListEditModal.tag.html | 8 +- .../web/tag/favoriteList/ImportCsvModal.tag.html | 6 +- .../web/tag/favoriteList/ImportLdapModal.tag.html | 6 +- .../src/main/web/tag/poll/EditPoll.tag.html | 8 +- .../src/main/web/tag/poll/Poll.tag.html | 6 +- .../src/main/web/tag/poll/Polls.tag.html | 6 +- .../src/main/web/tag/poll/Summary.tag.html | 4 +- .../src/main/web/tag/voterList/VoterList.tag.html | 4 +- 74 files changed, 875 insertions(+), 416 deletions(-) create mode 100644 pollen-persistence/src/main/resources/db/migration/h2/V3_1_0_7__add_user_can_create_poll.sql create mode 100644 pollen-persistence/src/main/resources/db/migration/postgresql/V3_1_0_7__add_user_can_create_poll.sql create mode 100644 pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/exceptionMappers/PollenUserUnknownExceptionMapper.java create mode 100644 pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/ConfigurationApi.java create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/bean/ConfigurationBean.java create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/bean/UsersRight.java create mode 100644 pollen-services/src/main/java/org/chorem/pollen/services/service/ConfigurationService.java copy pollen-services/src/main/java/org/chorem/pollen/services/service/security/{PollenUserBannedException.java => PollenUserUnknownException.java} (82%) copy pollen-ui-riot-js/src/main/web/js/{FeedbackService.js => ConfigurationService.js} (75%) create mode 100644 pollen-ui-riot-js/src/main/web/tag/Authorization.tag.html create mode 100644 pollen-ui-riot-js/src/main/web/tag/FilterLoginProvider.tag.js create mode 100644 pollen-ui-riot-js/src/main/web/tag/PageChanged.tag.js create mode 100644 pollen-ui-riot-js/src/main/web/tag/SigninAction.tag.js -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 9fc5f9a059dbfb828ce8f975e840f262f9767531 Merge: 1a9d7396 6d8f4a2a Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Oct 17 11:33:35 2017 +0200 Merge branch 'feature/85-droits-utilisateurs' into develop README.md | 5 +- .../h2/V3_1_0_7__add_user_can_create_poll.sql | 3 + .../V3_1_0_7__add_user_can_create_poll.sql | 3 + pollen-persistence/src/main/xmi/pollen.properties | 2 +- pollen-persistence/src/main/xmi/pollen.zargo | Bin 30366 -> 30431 bytes .../pollen/rest/api/PollenRestApiApplication.java | 4 + .../rest/api/PollenRestApiRequestFilter.java | 51 ++- .../PollenUnauthorizedExceptionMapper.java | 2 +- .../PollenUserUnknownExceptionMapper.java | 20 + .../org/chorem/pollen/rest/api/v1/AuthApi.java | 3 +- .../pollen/rest/api/v1/ConfigurationApi.java | 29 ++ .../org/chorem/pollen/rest/api/v1/PollApi.java | 2 +- pollen-services/src/main/config/PollenServices.ini | 14 +- .../pollen/services/bean/ConfigurationBean.java | 27 ++ .../pollen/services/bean/PollenUserBean.java | 10 + .../chorem/pollen/services/bean/UsersRight.java | 12 + .../services/config/PollenServicesConfig.java | 6 + .../pollen/services/service/ChoiceService.java | 6 + .../pollen/services/service/CommentService.java | 7 + .../services/service/ConfigurationService.java | 18 + .../pollen/services/service/FeedService.java | 2 + .../chorem/pollen/services/service/GtuService.java | 2 + .../pollen/services/service/PollService.java | 36 +- .../services/service/PollenResourceService.java | 7 + .../services/service/PollenServiceSupport.java | 28 ++ .../pollen/services/service/PollenUserService.java | 6 + .../pollen/services/service/ReportService.java | 10 + .../pollen/services/service/SocialAuthService.java | 1 + .../services/service/VoteCountingService.java | 1 + .../services/service/VoteCountingTypeService.java | 2 + .../pollen/services/service/VoteService.java | 8 + .../pollen/services/service/VoterListService.java | 15 + .../security/PollenEmailNotValidatedException.java | 2 + .../security/PollenUserBannedException.java | 2 + ...eption.java => PollenUserUnknownException.java} | 8 +- .../services/service/security/SecurityService.java | 33 +- .../i18n/pollen-services_en_GB.properties | 3 + .../i18n/pollen-services_fr_FR.properties | 3 + .../pollen/services/service/PollServiceTest.java | 4 +- .../services/service/VoteCountingServiceTest.java | 3 + pollen-ui-riot-js/package.json | 4 +- pollen-ui-riot-js/src/main/web/home/en.html | 6 +- pollen-ui-riot-js/src/main/web/home/fr.html | 6 +- pollen-ui-riot-js/src/main/web/homeCL/en.html | 6 +- pollen-ui-riot-js/src/main/web/homeCL/fr.html | 6 +- pollen-ui-riot-js/src/main/web/homeCL/offers.html | 6 +- pollen-ui-riot-js/src/main/web/i18n/fr.json | 1 + pollen-ui-riot-js/src/main/web/index.js | 2 +- pollen-ui-riot-js/src/main/web/js/AuthService.js | 2 +- .../src/main/web/js/ConfigurationService.js | 33 +- pollen-ui-riot-js/src/main/web/js/FetchService.js | 2 +- pollen-ui-riot-js/src/main/web/js/PollForm.js | 2 +- pollen-ui-riot-js/src/main/web/js/Session.js | 66 ++-- .../src/main/web/tag/Authorization.tag.html | 74 ++++ .../src/main/web/tag/FilterLoginProvider.tag.js | 46 +++ .../src/main/web/tag/PageChanged.tag.js | 7 + pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 434 +++++++++------------ .../src/main/web/tag/PollenHeader.tag.html | 44 ++- .../src/main/web/tag/SignCheck.tag.html | 8 +- pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html | 27 +- pollen-ui-riot-js/src/main/web/tag/SignUp.tag.html | 6 +- .../src/main/web/tag/SigninAction.tag.js | 13 + .../src/main/web/tag/UserProfile.tag.html | 8 +- .../src/main/web/tag/admin/UserCard.tag.html | 18 +- .../src/main/web/tag/admin/UserEditModal.tag.html | 25 +- .../web/tag/favoriteList/FavoriteList.tag.html | 8 +- .../favoriteList/FavoriteListEditModal.tag.html | 8 +- .../web/tag/favoriteList/ImportCsvModal.tag.html | 6 +- .../web/tag/favoriteList/ImportLdapModal.tag.html | 6 +- .../src/main/web/tag/poll/EditPoll.tag.html | 8 +- .../src/main/web/tag/poll/Poll.tag.html | 6 +- .../src/main/web/tag/poll/Polls.tag.html | 6 +- .../src/main/web/tag/poll/Summary.tag.html | 4 +- .../src/main/web/tag/voterList/VoterList.tag.html | 4 +- 74 files changed, 883 insertions(+), 425 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 d4cab6294dd7fb3ae7e72e0fc7f3cde928c8ac4f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Oct 17 11:35:00 2017 +0200 correction des mails pour la création de compte --- pollen-ui-riot-js/src/main/web/js/AuthService.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pollen-ui-riot-js/src/main/web/js/AuthService.js b/pollen-ui-riot-js/src/main/web/js/AuthService.js index 188b1045..b1ab27b2 100644 --- a/pollen-ui-riot-js/src/main/web/js/AuthService.js +++ b/pollen-ui-riot-js/src/main/web/js/AuthService.js @@ -52,7 +52,7 @@ class AuthService extends FetchService { signUp(user) { let user1 = { name: user.name, - email: user.email, + defaultEmailAddress: {emailAddress: user.email}, password: user.password, gtuValidated: user.gtuValidated }; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm