libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

KEYCLOAK-2712 Default required actions not added when user created through admin console

Browse source
This commit is contained in:
mposolda 2016-03-24 10:43:39 +01:00
parent 20fe2b75b5
commit 16ec76e864
2 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java
View file

@ -173,7 +173,7 @@ public class UsersResource {
} }
} }
updateUserFromRep(user, rep, attrsToRemove, realm, session); updateUserFromRep(user, rep, attrsToRemove, realm, session, true);
adminEvent.operation(OperationType.UPDATE).resourcePath(uriInfo).representation(rep).success(); adminEvent.operation(OperationType.UPDATE).resourcePath(uriInfo).representation(rep).success();
if (session.getTransaction().isActive()) { if (session.getTransaction().isActive()) {
@ -212,7 +212,7 @@ public class UsersResource {
try { try {
UserModel user = session.users().addUser(realm, rep.getUsername()); UserModel user = session.users().addUser(realm, rep.getUsername());
Set<String> emptySet = Collections.emptySet(); Set<String> emptySet = Collections.emptySet();
updateUserFromRep(user, rep, emptySet, realm, session); updateUserFromRep(user, rep, emptySet, realm, session, false);
adminEvent.operation(OperationType.CREATE).resourcePath(uriInfo, user.getId()).representation(rep).success(); adminEvent.operation(OperationType.CREATE).resourcePath(uriInfo, user.getId()).representation(rep).success();
@ -229,7 +229,7 @@ public class UsersResource {
} }
} }
public static void updateUserFromRep(UserModel user, UserRepresentation rep, Set<String> attrsToRemove, RealmModel realm, KeycloakSession session) { public static void updateUserFromRep(UserModel user, UserRepresentation rep, Set<String> attrsToRemove, RealmModel realm, KeycloakSession session, boolean removeMissingRequiredActions) {
if (rep.getUsername() != null && realm.isEditUsernameAllowed()) { if (rep.getUsername() != null && realm.isEditUsernameAllowed()) {
user.setUsername(rep.getUsername()); user.setUsername(rep.getUsername());
} }
@ -251,7 +251,7 @@ public class UsersResource {
for (String action : allActions) { for (String action : allActions) {
if (reqActions.contains(action)) { if (reqActions.contains(action)) {
user.addRequiredAction(action); user.addRequiredAction(action);
} else { } else if (removeMissingRequiredActions) {
user.removeRequiredAction(action); user.removeRequiredAction(action);
} }
} }

23
testsuite/integration/src/test/java/org/keycloak/testsuite/admin/UserTest.java
View file

@ -42,6 +42,7 @@ import javax.ws.rs.core.UriBuilder;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@ -81,6 +82,7 @@ public class UserTest extends AbstractClientTest {
UserRepresentation user = new UserRepresentation(); UserRepresentation user = new UserRepresentation();
user.setUsername(username); user.setUsername(username);
user.setEmail(email); user.setEmail(email);
user.setRequiredActions(Collections.<String>emptyList());
user.setEnabled(true); user.setEnabled(true);
Response response = realm.users().create(user); Response response = realm.users().create(user);
@ -663,6 +665,27 @@ public class UserTest extends AbstractClientTest {
} }
} }
@Test
public void testDefaultRequiredActionAdded() {
// Add UPDATE_PASSWORD as default required action
RequiredActionProviderRepresentation updatePasswordReqAction = realm.flows().getRequiredAction(UserModel.RequiredAction.UPDATE_PASSWORD.toString());
updatePasswordReqAction.setDefaultAction(true);
realm.flows().updateRequiredAction(UserModel.RequiredAction.UPDATE_PASSWORD.toString(), updatePasswordReqAction);
// Create user
String userId = createUser("user1", "user1@localhost");
UserRepresentation userRep = realm.users().get(userId).toRepresentation();
Assert.assertEquals(1, userRep.getRequiredActions().size());
Assert.assertEquals(UserModel.RequiredAction.UPDATE_PASSWORD.toString(), userRep.getRequiredActions().get(0));
// Remove UPDATE_PASSWORD default action
updatePasswordReqAction = realm.flows().getRequiredAction(UserModel.RequiredAction.UPDATE_PASSWORD.toString());
updatePasswordReqAction.setDefaultAction(true);
realm.flows().updateRequiredAction(UserModel.RequiredAction.UPDATE_PASSWORD.toString(), updatePasswordReqAction);
}
private void switchEditUsernameAllowedOn() { private void switchEditUsernameAllowedOn() {
RealmRepresentation rep = realm.toRepresentation(); RealmRepresentation rep = realm.toRepresentation();
rep.setEditUsernameAllowed(true); rep.setEditUsernameAllowed(true);