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

First parts of Create User functionality in new Admin Console.

Browse Source 
- Can create new users - no form validation etc. yet.
 - User password is set.
ChangePassword webscript improved to support admin user setting a user password without knowing the old one.
JavaScript People API fixes.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14097 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-04-28 08:57:04 +00:00
parent 1a77817c0e
commit 126fc1ebbb
3 changed files with 63 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
config/alfresco/templates/webscripts/org/alfresco/repository/person/people.post.json.js
View File

@@ -22,9 +22,15 @@ function main()
return;
}
if ((json.isNull("email")) || (json.get("email").length() == 0))
{
status.setCode(status.STATUS_BAD_REQUEST, "Email missing when creating person");
return;
}
// Create the person with the supplied user name
var userName = json.get("userName");
var person = people.createPerson(userName);
var person = people.createPerson(userName, json.get("firstName"), json.get("lastName"), json.get("email"));
// return error message if a person with that user name could not be created
if (person === null)
@@ -34,12 +40,18 @@ function main()
}
// assign values to the person's properties
person.properties["title"] = json.get("title");
person.properties["firstName"] = json.get("firstName");
person.properties["lastName"] = json.get("lastName");
person.properties["organization"] = json.get("organisation");
person.properties["jobtitle"] = json.get("jobtitle");
person.properties["email"] = json.get("email");
if (json.has("title"))
{
person.properties["title"] = json.get("title");
}
if (json.has("organisation"))
{
person.properties["organization"] = json.get("organisation");
}
if (json.has("jobtitle"))
{
person.properties["jobtitle"] = json.get("jobtitle");
}
person.save();
// Put the created person into the model

3
config/alfresco/web-scripts-application-context.xml
View File

@@ -436,7 +436,8 @@
<bean id="webscript.org.alfresco.repository.person.changepassword.post"
class="org.alfresco.repo.web.scripts.person.ChangePasswordPost"
parent="webscript">
<property name="authenticationService" ref="AuthenticationService"/>
<property name="authenticationService" ref="AuthenticationService" />
<property name="authorityService" ref="AuthorityService" />
</bean>

49
source/java/org/alfresco/repo/web/scripts/person/ChangePasswordPost.java
View File

@@ -30,6 +30,7 @@ import java.util.Map;
import org.alfresco.repo.security.authentication.AuthenticationException;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.util.Content;
import org.alfresco.web.scripts.DeclarativeWebScript;
import org.alfresco.web.scripts.Status;
@@ -45,7 +46,10 @@ import org.json.JSONObject;
*/
public class ChangePasswordPost extends DeclarativeWebScript
{
private static final String PARAM_NEWPW = "newpw";
private static final String PARAM_OLDPW = "oldpw";
private AuthenticationService authenticationService;
private AuthorityService authorityService;
/**
@@ -56,6 +60,14 @@ public class ChangePasswordPost extends DeclarativeWebScript
this.authenticationService = authenticationService;
}
/**
* @param authorityService the AuthorityService to set
*/
public void setAuthorityService(AuthorityService authorityService)
{
this.authorityService = authorityService;
}
/* (non-Javadoc)
* @see org.alfresco.web.scripts.DeclarativeWebScript#executeImpl(org.alfresco.web.scripts.WebScriptRequest, org.alfresco.web.scripts.Status)
@@ -70,30 +82,43 @@ public class ChangePasswordPost extends DeclarativeWebScript
Content c = req.getContent();
if (c == null)
{
throw new WebScriptException(Status.STATUS_INTERNAL_SERVER_ERROR,
"Missing POST body.");
throw new WebScriptException(Status.STATUS_INTERNAL_SERVER_ERROR, "Missing POST body.");
}
JSONObject json;
try
{
json = new JSONObject(c.getContent());
String oldPassword = json.getString("oldpw");
String newPassword = json.getString("newpw");
String oldPassword = null;
String newPassword;
if (oldPassword == null || oldPassword.length() == 0)
// admin users can change/set a password without knowing the old one
boolean isAdmin = authorityService.hasAdminAuthority();
if (!isAdmin)
{
if (!json.has(PARAM_OLDPW) || json.getString(PARAM_OLDPW).length() == 0)
{
throw new WebScriptException(Status.STATUS_BAD_REQUEST,
"Old password 'oldpw' is a required POST parameter.");
}
oldPassword = json.getString(PARAM_OLDPW);
}
if (!json.has(PARAM_NEWPW) || json.getString(PARAM_NEWPW).length() == 0)
{
throw new WebScriptException(Status.STATUS_BAD_REQUEST,
"Old password 'oldpw' is a required POST parameter.");
}
if (newPassword == null || newPassword.length() == 0)
{
throw new WebScriptException(Status.STATUS_BAD_REQUEST,
"New password 'newpw' is a required POST parameter.");
"New password 'newpw' is a required POST parameter.");
}
newPassword = json.getString(PARAM_NEWPW);
// update the password
authenticationService.updateAuthentication(userName, oldPassword.toCharArray(), newPassword.toCharArray());
if (!isAdmin)
{
authenticationService.updateAuthentication(userName, oldPassword.toCharArray(), newPassword.toCharArray());
}
else
{
authenticationService.setAuthentication(userName, newPassword.toCharArray());
}
}
catch (AuthenticationException err)
{