You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2013/10/25 10:27:12 UTC
svn commit: r1535655 - in /syncope/branches/1_1_X:
client/src/main/java/org/apache/syncope/client/services/proxy/
core/src/main/java/org/apache/syncope/core/services/
core/src/test/java/org/apache/syncope/core/rest/
Author: ilgrosso
Date: Fri Oct 25 08:27:12 2013
New Revision: 1535655
URL: http://svn.apache.org/r1535655
Log:
[SYNCOPE-426] Setting UserMod#id and RoleMod#id in service implementations, prior to call to controllers
Modified:
syncope/branches/1_1_X/client/src/main/java/org/apache/syncope/client/services/proxy/RoleServiceProxy.java
syncope/branches/1_1_X/client/src/main/java/org/apache/syncope/client/services/proxy/UserServiceProxy.java
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/services/RoleServiceImpl.java
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/services/UserServiceImpl.java
syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
Modified: syncope/branches/1_1_X/client/src/main/java/org/apache/syncope/client/services/proxy/RoleServiceProxy.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/client/src/main/java/org/apache/syncope/client/services/proxy/RoleServiceProxy.java?rev=1535655&r1=1535654&r2=1535655&view=diff
==============================================================================
--- syncope/branches/1_1_X/client/src/main/java/org/apache/syncope/client/services/proxy/RoleServiceProxy.java (original)
+++ syncope/branches/1_1_X/client/src/main/java/org/apache/syncope/client/services/proxy/RoleServiceProxy.java Fri Oct 25 08:27:12 2013
@@ -108,6 +108,7 @@ public class RoleServiceProxy extends Sp
@Override
public RoleTO update(final Long roleId, final RoleMod roleMod) {
+ roleMod.setId(roleId);
return getRestTemplate().postForObject(baseUrl + "role/update", roleMod, RoleTO.class);
}
}
Modified: syncope/branches/1_1_X/client/src/main/java/org/apache/syncope/client/services/proxy/UserServiceProxy.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/client/src/main/java/org/apache/syncope/client/services/proxy/UserServiceProxy.java?rev=1535655&r1=1535654&r2=1535655&view=diff
==============================================================================
--- syncope/branches/1_1_X/client/src/main/java/org/apache/syncope/client/services/proxy/UserServiceProxy.java (original)
+++ syncope/branches/1_1_X/client/src/main/java/org/apache/syncope/client/services/proxy/UserServiceProxy.java Fri Oct 25 08:27:12 2013
@@ -77,6 +77,7 @@ public class UserServiceProxy extends Sp
@Override
public UserTO update(final Long userId, final UserMod userMod) {
+ userMod.setId(userId);
return getRestTemplate().postForObject(baseUrl + "user/update", userMod, UserTO.class);
}
Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/services/RoleServiceImpl.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/services/RoleServiceImpl.java?rev=1535655&r1=1535654&r2=1535655&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/services/RoleServiceImpl.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/services/RoleServiceImpl.java Fri Oct 25 08:27:12 2013
@@ -115,6 +115,7 @@ public class RoleServiceImpl implements
@Override
public RoleTO update(final Long roleId, final RoleMod roleMod) {
+ roleMod.setId(roleId);
return roleController.update(roleMod);
}
Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/services/UserServiceImpl.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/services/UserServiceImpl.java?rev=1535655&r1=1535654&r2=1535655&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/services/UserServiceImpl.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/services/UserServiceImpl.java Fri Oct 25 08:27:12 2013
@@ -165,6 +165,7 @@ public class UserServiceImpl implements
@Override
public UserTO update(final Long userId, final UserMod userMod) {
+ userMod.setId(userId);
return userController.update(userMod);
}
Modified: syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java?rev=1535655&r1=1535654&r2=1535655&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java (original)
+++ syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java Fri Oct 25 08:27:12 2013
@@ -560,8 +560,8 @@ public class UserTestITCase extends Abst
assertNull(form.getOwner());
// 3. claim task from rossini, not in role 7 (designated for approval in workflow definition): fail
- UserWorkflowService userService2 =
- setupCredentials(userWorkflowService, UserWorkflowService.class, "rossini", ADMIN_PWD);
+ UserWorkflowService userService2 = setupCredentials(
+ userWorkflowService, UserWorkflowService.class, "rossini", ADMIN_PWD);
try {
userService2.claimForm(form.getTaskId());
@@ -571,8 +571,8 @@ public class UserTestITCase extends Abst
}
// 4. claim task from bellini, in role 7
- UserWorkflowService userService3 =
- setupCredentials(userWorkflowService, UserWorkflowService.class, "bellini", ADMIN_PWD);
+ UserWorkflowService userService3 = setupCredentials(userWorkflowService, UserWorkflowService.class, "bellini",
+ ADMIN_PWD);
form = userService3.claimForm(form.getTaskId());
assertNotNull(form);
@@ -593,7 +593,7 @@ public class UserTestITCase extends Abst
Exception exception = null;
try {
jdbcTemplate.queryForObject("SELECT id FROM test WHERE id=?",
- new String[] {userTO.getUsername()}, Integer.class);
+ new String[] { userTO.getUsername() }, Integer.class);
} catch (EmptyResultDataAccessException e) {
exception = e;
}
@@ -630,7 +630,7 @@ public class UserTestITCase extends Abst
Exception exception = null;
try {
jdbcTemplate.queryForObject("SELECT id FROM test WHERE id=?",
- new String[] {userTO.getUsername()}, Integer.class);
+ new String[] { userTO.getUsername() }, Integer.class);
} catch (EmptyResultDataAccessException e) {
exception = e;
}
@@ -947,7 +947,6 @@ public class UserTestITCase extends Abst
// --------------------------------------
// Create operation
// --------------------------------------
-
UserTO userTO = getUniqueSampleTO("t@p.mode");
// add a membership
@@ -1843,16 +1842,16 @@ public class UserTestITCase extends Abst
final String pwdOnSyncope = userTO.getPassword();
- ConnObjectTO userOnDb =
- resourceService.getConnectorObject(RESOURCE_NAME_TESTDB, AttributableType.USER, userTO.getId());
+ ConnObjectTO userOnDb = resourceService.getConnectorObject(
+ RESOURCE_NAME_TESTDB, AttributableType.USER, userTO.getId());
final AttributeTO pwdOnTestDbAttr = userOnDb.getAttributeMap().get(OperationalAttributes.PASSWORD_NAME);
assertNotNull(pwdOnTestDbAttr);
assertNotNull(pwdOnTestDbAttr.getValues());
assertFalse(pwdOnTestDbAttr.getValues().isEmpty());
final String pwdOnTestDb = pwdOnTestDbAttr.getValues().iterator().next();
- ConnObjectTO userOnDb2 =
- resourceService.getConnectorObject("resource-testdb2", AttributableType.USER, userTO.getId());
+ ConnObjectTO userOnDb2 = resourceService.getConnectorObject(
+ "resource-testdb2", AttributableType.USER, userTO.getId());
final AttributeTO pwdOnTestDb2Attr = userOnDb2.getAttributeMap().get(OperationalAttributes.PASSWORD_NAME);
assertNotNull(pwdOnTestDb2Attr);
assertNotNull(pwdOnTestDb2Attr.getValues());
@@ -2126,8 +2125,8 @@ public class UserTestITCase extends Abst
assertTrue(userTO.getResources().contains(RESOURCE_NAME_LDAP));
// 3. read role on resource, check that user DN is included in uniqueMember
- ConnObjectTO connObj =
- resourceService.getConnectorObject(RESOURCE_NAME_LDAP, AttributableType.ROLE, roleTO.getId());
+ ConnObjectTO connObj = resourceService.getConnectorObject(
+ RESOURCE_NAME_LDAP, AttributableType.ROLE, roleTO.getId());
assertNotNull(connObj);
assertTrue(connObj.getAttributeMap().get("uniqueMember").getValues().
contains("uid=" + userTO.getUsername() + ",ou=people,o=isp"));
@@ -2176,8 +2175,8 @@ public class UserTestITCase extends Abst
assertTrue(userTO.getResources().contains(RESOURCE_NAME_LDAP));
// 3. read user on resource
- ConnObjectTO connObj =
- resourceService.getConnectorObject(RESOURCE_NAME_LDAP, AttributableType.USER, userTO.getId());
+ ConnObjectTO connObj = resourceService.getConnectorObject(
+ RESOURCE_NAME_LDAP, AttributableType.USER, userTO.getId());
assertNotNull(connObj);
// 4. remove role
@@ -2344,6 +2343,18 @@ public class UserTestITCase extends Abst
assertEquals("14", userTO.getAttributeMap().get("makeItDouble").getValues().get(0));
}
+ @Test
+ public void issueSYNCOPE426() {
+ UserTO userTO = getUniqueSampleTO("syncope426@syncope.apache.org");
+ userTO = createUser(userTO);
+ assertNotNull(userTO);
+
+ UserMod userMod = new UserMod();
+ userMod.setPassword("anotherPassword123");
+ userTO = userService.update(userTO.getId(), userMod);
+ assertNotNull(userTO);
+ }
+
private boolean getBooleanAttribute(ConnObjectTO connObjectTO, String attrName) {
return Boolean.parseBoolean(getStringAttribute(connObjectTO, attrName));
}