From 62e90cd0a8db065bb4ed5d635c4d65ad1324c8ba Mon Sep 17 00:00:00 2001 From: Raluca Munteanu Date: Mon, 14 Nov 2016 09:13:08 +0000 Subject: [PATCH] REPO-1530: Create Person - enabled flag should be optional - Added default value true for enable on create person and fixed test git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@132727 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/rest/api/impl/PeopleImpl.java | 10 ++++++++-- .../org/alfresco/rest/api/tests/TestPeople.java | 1 - 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/rest/api/impl/PeopleImpl.java b/source/java/org/alfresco/rest/api/impl/PeopleImpl.java index b8d46875db..0c6ee11026 100644 --- a/source/java/org/alfresco/rest/api/impl/PeopleImpl.java +++ b/source/java/org/alfresco/rest/api/impl/PeopleImpl.java @@ -393,7 +393,14 @@ public class PeopleImpl implements People { throw new ConstraintViolatedException("Person '"+person.getUserName()+"' already exists."); } - Map props = person.toProperties(); + + // set enabled default value true + if (person.isEnabled() == null) + { + person.setEnabled(true); + } + + Map props = person.toProperties(); MutableAuthenticationService mas = (MutableAuthenticationService) authenticationService; mas.createAuthentication(person.getUserName(), person.getPassword().toCharArray()); @@ -437,7 +444,6 @@ public class PeopleImpl implements People checkRequiredField("id", person.getUserName()); checkRequiredField("firstName", person.getFirstName()); checkRequiredField("email", person.getEmail()); - checkRequiredField("enabled", person.isEnabled()); checkRequiredField("password", person.getPassword()); } diff --git a/source/test-java/org/alfresco/rest/api/tests/TestPeople.java b/source/test-java/org/alfresco/rest/api/tests/TestPeople.java index 0fbc0b65c3..2630ab782e 100644 --- a/source/test-java/org/alfresco/rest/api/tests/TestPeople.java +++ b/source/test-java/org/alfresco/rest/api/tests/TestPeople.java @@ -318,7 +318,6 @@ public class TestPeople extends EnterpriseTestApi person.setUserName("joe.bloggs.2@"+account1.getId()); person.setFirstName("Joe"); person.setEmail("joe.bloggs.2@example.com"); - person.setEnabled(true); person.setPassword("password-is-secret"); Person p = people.create(person);