branch develop updated (c4ed02bf -> 0ef235dc)
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 c4ed02bf réactivation d'un utilisateur + forcage de la validation de l'email. new 0ef235dc correction des test + ne pas pouvoir se bannir sois-même 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 0ef235dcac9979eac0e351a4dfe0a5e7c9d11711 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Jul 31 14:43:27 2017 +0200 correction des test + ne pas pouvoir se bannir sois-même Summary of changes: .../org/chorem/pollen/services/service/PollenUserService.java | 4 ++++ .../src/main/resources/i18n/pollen-services_en_GB.properties | 1 + .../src/main/resources/i18n/pollen-services_fr_FR.properties | 1 + .../org/chorem/pollen/services/AbstractPollenServiceTest.java | 3 ++- .../pollen/services/service/FavoriteListServiceTest.java | 11 ++++++----- .../org/chorem/pollen/services/service/PollServiceTest.java | 3 ++- .../chorem/pollen/services/service/PollenUserServiceTest.java | 7 ++++--- .../chorem/pollen/services/service/VoterListServiceTest.java | 3 ++- 8 files changed, 22 insertions(+), 11 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 0ef235dcac9979eac0e351a4dfe0a5e7c9d11711 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Jul 31 14:43:27 2017 +0200 correction des test + ne pas pouvoir se bannir sois-même --- .../org/chorem/pollen/services/service/PollenUserService.java | 4 ++++ .../src/main/resources/i18n/pollen-services_en_GB.properties | 1 + .../src/main/resources/i18n/pollen-services_fr_FR.properties | 1 + .../org/chorem/pollen/services/AbstractPollenServiceTest.java | 3 ++- .../pollen/services/service/FavoriteListServiceTest.java | 11 ++++++----- .../org/chorem/pollen/services/service/PollServiceTest.java | 3 ++- .../chorem/pollen/services/service/PollenUserServiceTest.java | 7 ++++--- .../chorem/pollen/services/service/VoterListServiceTest.java | 3 ++- 8 files changed, 22 insertions(+), 11 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java index 1edc1687..b3cf72ef 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java @@ -300,6 +300,10 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer checkNotBlank(errors, "password", user.getPassword(), l(getLocale(), "pollen.error.user.passwordEmpty")); } + check(errors, PollenUser.PROPERTY_BANNED, + !(user.isBanned() && user.isPersisted() && getConnectedUser() != null && user.getEntityId().equals(getConnectedUser().getTopiaId())), + l(getLocale(), "pollen.error.user.bannedSelf")); + return errors; } diff --git a/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties b/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties index fb24a918..77428b70 100644 --- a/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties +++ b/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties @@ -89,6 +89,7 @@ pollen.error.report.level.mandatory=Report level can not be empty pollen.error.resource.empty=No resource sent pollen.error.resource.maxSize=File "%s" of %4.2f %s can't be over %4.2f %s. pollen.error.resource.notExist=Image don't exist +pollen.error.user.bannedSelf=You can't banned yourself pollen.error.user.mailEmpty=The email address can not be empty pollen.error.user.mailExist=The email address already exists pollen.error.user.mailInvalid=The email address is not valid diff --git a/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties b/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties index 4f3b232a..f8305bf5 100644 --- a/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties +++ b/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties @@ -88,6 +88,7 @@ pollen.error.report.level.mandatory=Le type de signalement est obligatoire pollen.error.resource.empty=Aucune resource envoyé pollen.error.resource.maxSize=Le fichier « %s » de %4.2f %s ne doit pas dépasser %4.2f %s. pollen.error.resource.notExist=L'image n'existe pas sur le serveur +pollen.error.user.bannedSelf=Vous ne pouvez pas vous bannir vous-même pollen.error.user.mailEmpty=L'adresse de courriel ne peut pas être vide pollen.error.user.mailExist=L'adresse de courriel existe déjà pollen.error.user.mailInvalid=L'adresse de courriel est invalide diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java index b2cd7c11..62c7b8c7 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java @@ -29,6 +29,7 @@ import org.chorem.pollen.services.service.InvalidFormException; import org.chorem.pollen.services.service.security.PollenAuthenticationException; import org.chorem.pollen.services.service.security.PollenEmailNotValidatedException; import org.chorem.pollen.services.service.security.PollenInvalidSessionTokenException; +import org.chorem.pollen.services.service.security.PollenUserBannedException; import org.chorem.pollen.services.service.security.SecurityService; import org.chorem.pollen.services.test.FakePollenApplicationContext; import org.chorem.pollen.services.test.FakePollenServiceContext; @@ -87,7 +88,7 @@ public abstract class AbstractPollenServiceTest { } protected void login(String login, String password) throws PollenInvalidSessionTokenException, - PollenAuthenticationException, PollenEmailNotValidatedException { + PollenAuthenticationException, PollenEmailNotValidatedException, PollenUserBannedException { SecurityService securityService = newService(SecurityService.class); diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/service/FavoriteListServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/service/FavoriteListServiceTest.java index 1d9baedb..aea159c4 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/service/FavoriteListServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/service/FavoriteListServiceTest.java @@ -36,6 +36,7 @@ import org.chorem.pollen.services.bean.PollenEntityRef; import org.chorem.pollen.services.service.security.PollenAuthenticationException; import org.chorem.pollen.services.service.security.PollenEmailNotValidatedException; import org.chorem.pollen.services.service.security.PollenInvalidSessionTokenException; +import org.chorem.pollen.services.service.security.PollenUserBannedException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -76,7 +77,7 @@ public class FavoriteListServiceTest extends AbstractPollenServiceTest { "user2@pollen.org"; @Test - public void importFavoriteListFromFile() throws PollenInvalidSessionTokenException, PollenAuthenticationException, InvalidFormException, IOException, FavoriteListImportException, PollenEmailNotValidatedException { + public void importFavoriteListFromFile() throws PollenInvalidSessionTokenException, PollenAuthenticationException, InvalidFormException, IOException, FavoriteListImportException, PollenEmailNotValidatedException, PollenUserBannedException { login("jean@pollen.fake", "fake"); @@ -106,7 +107,7 @@ public class FavoriteListServiceTest extends AbstractPollenServiceTest { } @Test - public void createFavoriteList() throws PollenInvalidSessionTokenException, PollenAuthenticationException, InvalidFormException, PollenEmailNotValidatedException { + public void createFavoriteList() throws PollenInvalidSessionTokenException, PollenAuthenticationException, InvalidFormException, PollenEmailNotValidatedException, PollenUserBannedException { login("jean@pollen.fake", "fake"); @@ -223,7 +224,7 @@ public class FavoriteListServiceTest extends AbstractPollenServiceTest { } @Test - public void editFavoriteList() throws PollenInvalidSessionTokenException, PollenAuthenticationException, InvalidFormException, PollenEmailNotValidatedException { + public void editFavoriteList() throws PollenInvalidSessionTokenException, PollenAuthenticationException, InvalidFormException, PollenEmailNotValidatedException, PollenUserBannedException { login("jean@pollen.fake", "fake"); @@ -292,7 +293,7 @@ public class FavoriteListServiceTest extends AbstractPollenServiceTest { } @Test - public void editFavoriteListMember() throws PollenInvalidSessionTokenException, PollenAuthenticationException, InvalidFormException, PollenEmailNotValidatedException { + public void editFavoriteListMember() throws PollenInvalidSessionTokenException, PollenAuthenticationException, InvalidFormException, PollenEmailNotValidatedException, PollenUserBannedException { login("jean@pollen.fake", "fake"); @@ -387,7 +388,7 @@ public class FavoriteListServiceTest extends AbstractPollenServiceTest { @Test - public void editChildFavoriteList() throws PollenInvalidSessionTokenException, PollenAuthenticationException, InvalidFormException, PollenEmailNotValidatedException { + public void editChildFavoriteList() throws PollenInvalidSessionTokenException, PollenAuthenticationException, InvalidFormException, PollenEmailNotValidatedException, PollenUserBannedException { login("jean@pollen.fake", "fake"); // create a first list diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/service/PollServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/service/PollServiceTest.java index 0f67bc10..13897562 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/service/PollServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/service/PollServiceTest.java @@ -35,6 +35,7 @@ import org.chorem.pollen.services.service.security.PollenEmailNotValidatedExcept import org.chorem.pollen.services.service.security.PollenInvalidPermissionException; import org.chorem.pollen.services.service.security.PollenInvalidSessionTokenException; import org.chorem.pollen.services.service.security.PollenUnauthorizedException; +import org.chorem.pollen.services.service.security.PollenUserBannedException; import org.chorem.pollen.services.service.security.SecurityService; import org.chorem.pollen.services.test.FakePollenSecurityContext; import org.junit.Assert; @@ -537,7 +538,7 @@ public class PollServiceTest extends AbstractPollenServiceTest { // } @Test - public void testAssignPollToConnectedUser() throws PollenInvalidSessionTokenException, PollenAuthenticationException, PollenEmailNotValidatedException { + public void testAssignPollToConnectedUser() throws PollenInvalidSessionTokenException, PollenAuthenticationException, PollenEmailNotValidatedException, PollenUserBannedException { Poll poll = fixture(PollenFixtures.POLL_NORMAL_ID); Assert.assertNull(poll.getCreator().getPollenUser()); try { diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/service/PollenUserServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/service/PollenUserServiceTest.java index a06e0bcb..13a97308 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/service/PollenUserServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/service/PollenUserServiceTest.java @@ -31,6 +31,7 @@ import org.chorem.pollen.services.bean.PollenUserBean; import org.chorem.pollen.services.service.security.PollenAuthenticationException; import org.chorem.pollen.services.service.security.PollenEmailNotValidatedException; import org.chorem.pollen.services.service.security.PollenInvalidSessionTokenException; +import org.chorem.pollen.services.service.security.PollenUserBannedException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -64,7 +65,7 @@ public class PollenUserServiceTest extends AbstractPollenServiceTest { } @Test - public void testGetPollenUsers() throws PollenAuthenticationException, PollenInvalidSessionTokenException, PollenEmailNotValidatedException { + public void testGetPollenUsers() throws PollenAuthenticationException, PollenInvalidSessionTokenException, PollenEmailNotValidatedException, PollenUserBannedException { login("jean@pollen.fake", "fake"); @@ -76,7 +77,7 @@ public class PollenUserServiceTest extends AbstractPollenServiceTest { } @Test - public void testGetPollenUser() throws PollenInvalidSessionTokenException, PollenAuthenticationException, PollenEmailNotValidatedException { + public void testGetPollenUser() throws PollenInvalidSessionTokenException, PollenAuthenticationException, PollenEmailNotValidatedException, PollenUserBannedException { login("jean@pollen.fake", "fake"); @@ -183,7 +184,7 @@ public class PollenUserServiceTest extends AbstractPollenServiceTest { } @Test - public void testEditUser() throws InvalidFormException, PollenInvalidSessionTokenException, PollenAuthenticationException, PollenEmailNotValidatedException { + public void testEditUser() throws InvalidFormException, PollenInvalidSessionTokenException, PollenAuthenticationException, PollenEmailNotValidatedException, PollenUserBannedException { login("jean@pollen.fake", "fake"); diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/service/VoterListServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/service/VoterListServiceTest.java index f1f2e990..86d32982 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/service/VoterListServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/service/VoterListServiceTest.java @@ -36,6 +36,7 @@ import org.chorem.pollen.services.bean.VoterListMemberBean; import org.chorem.pollen.services.service.security.PollenAuthenticationException; import org.chorem.pollen.services.service.security.PollenEmailNotValidatedException; import org.chorem.pollen.services.service.security.PollenInvalidSessionTokenException; +import org.chorem.pollen.services.service.security.PollenUserBannedException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -143,7 +144,7 @@ public class VoterListServiceTest extends AbstractPollenServiceTest { // } @Test - public void createVoterList() throws InvalidFormException, PollenInvalidSessionTokenException, PollenAuthenticationException, PollenEmailNotValidatedException { + public void createVoterList() throws InvalidFormException, PollenInvalidSessionTokenException, PollenAuthenticationException, PollenEmailNotValidatedException, PollenUserBannedException { login("jean@pollen.fake", "fake"); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm