inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

REPO-892: allow creation of enabled/disabled users

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131909 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2016-10-31 16:56:32 +00:00
parent 4d8673f058
commit a8d705bb8c
3 changed files with 52 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/java/org/alfresco/rest/api/impl/PeopleImpl.java
View File

@@ -25,18 +25,12 @@
*/
package org.alfresco.rest.api.impl;
import java.io.Serializable;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.rest.api.Nodes;
import org.alfresco.rest.api.People;
import org.alfresco.rest.api.Sites;
import org.alfresco.rest.api.model.Company;
import org.alfresco.rest.api.model.Person;
import org.alfresco.rest.api.model.PersonUpdate;
import org.alfresco.rest.framework.core.exceptions.ConstraintViolatedException;
@@ -44,6 +38,7 @@ import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
import org.alfresco.service.cmr.repository.*;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.NoSuchPersonException;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.cmr.site.SiteService;
@@ -51,6 +46,11 @@ import org.alfresco.service.cmr.thumbnail.ThumbnailService;
import org.alfresco.service.cmr.usage.ContentUsageService;
import org.alfresco.service.namespace.QName;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
import java.util.UUID;
/**
* Centralises access to people services and maps between representations.
*
@@ -295,6 +295,11 @@ public class PeopleImpl implements People
throw new ConstraintViolatedException("Person '"+person.getUserName()+"' already exists.");
}
Map<QName, Serializable> props = person.toProperties();
MutableAuthenticationService mas = (MutableAuthenticationService) authenticationService;
// TODO: very temporary code, until REPO-1503 (set password) implemented.
mas.createAuthentication(person.getUserName(), UUID.randomUUID().toString().toCharArray());
mas.setAuthenticationEnabled(person.getUserName(), person.isEnabled());
NodeRef nodeRef = personService.createPerson(props);
// Write the contents of PersonUpdate.getDescription() text to a content file
@@ -314,15 +319,7 @@ public class PeopleImpl implements People
}
// Return a fresh retrieval
props = nodeService.getProperties(nodeRef);
// Do not put this pseudo/temp-property into the bag before creating the person
// as it would be created as a residual property.
props.put(Person.PROP_PERSON_DESCRIPTION, person.getDescription());
final boolean enabled = personService.isEnabled(person.getUserName());
return new Person(nodeRef, props, enabled);
// ...or
// return getPerson(person.getUserName());
return getPerson(person.getUserName());
}
private void validateCreatePersonData(PersonUpdate person)

1
source/java/org/alfresco/rest/api/model/PersonUpdate.java
View File

@@ -251,6 +251,7 @@ public class PersonUpdate
addToMap(properties, ContentModel.PROP_MOBILE, getMobile());
addToMap(properties, ContentModel.PROP_TELEPHONE, getTelephone());
addToMap(properties, ContentModel.PROP_USER_STATUS, getUserStatus());
addToMap(properties, ContentModel.PROP_ENABLED, isEnabled());
addToMap(properties, ContentModel.PROP_EMAIL_FEED_DISABLED,
isEmailNotificationsEnabled() != null ? !isEmailNotificationsEnabled() : null);