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

KEYCLOAK-3655: Fix for unexpected server error when adding duplicate auth flow

Browse source
This commit is contained in:
Hynek Mlnarik 2016-10-05 13:39:14 +02:00
parent 36aa3da3d0
commit cfbc9cf14b
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
services/src/main/java/org/keycloak/services/resources/admin/AuthenticationManagementResource.java
View file

@ -290,7 +290,7 @@ public class AuthenticationManagementResource {
String newName = data.get("newName"); String newName = data.get("newName");
if (realm.getFlowByAlias(newName) != null) { if (realm.getFlowByAlias(newName) != null) {
return Response.status(Response.Status.CONFLICT).build(); return ErrorResponse.exists("New flow alias name already exists");
} }
AuthenticationFlowModel flow = realm.getFlowByAlias(flowAlias); AuthenticationFlowModel flow = realm.getFlowByAlias(flowAlias);
@ -310,7 +310,7 @@ public class AuthenticationManagementResource {
data.put("id", copy.getId()); data.put("id", copy.getId());
adminEvent.operation(OperationType.CREATE).resourcePath(uriInfo).representation(data).success(); adminEvent.operation(OperationType.CREATE).resourcePath(uriInfo).representation(data).success();
return Response.status(201).build(); return Response.status(Response.Status.CREATED).build();
} }
@ -344,12 +344,12 @@ public class AuthenticationManagementResource {
@POST @POST
@NoCache @NoCache
@Consumes(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON)
public void addExecutionFlow(@PathParam("flowAlias") String flowAlias, Map<String, String> data) { public Response addExecutionFlow(@PathParam("flowAlias") String flowAlias, Map<String, String> data) {
auth.requireManage(); auth.requireManage();
AuthenticationFlowModel parentFlow = realm.getFlowByAlias(flowAlias); AuthenticationFlowModel parentFlow = realm.getFlowByAlias(flowAlias);
if (parentFlow == null) { if (parentFlow == null) {
throw new BadRequestException("Parent flow doesn't exists"); return ErrorResponse.error("Parent flow doesn't exists", Response.Status.BAD_REQUEST);
} }
String alias = data.get("alias"); String alias = data.get("alias");
String type = data.get("type"); String type = data.get("type");
@ -359,7 +359,7 @@ public class AuthenticationManagementResource {
AuthenticationFlowModel newFlow = realm.getFlowByAlias(alias); AuthenticationFlowModel newFlow = realm.getFlowByAlias(alias);
if (newFlow != null) { if (newFlow != null) {
throw new BadRequestException("New flow alias name already exists"); return ErrorResponse.exists("New flow alias name already exists");
} }
newFlow = new AuthenticationFlowModel(); newFlow = new AuthenticationFlowModel();
newFlow.setAlias(alias); newFlow.setAlias(alias);
@ -377,6 +377,8 @@ public class AuthenticationManagementResource {
data.put("id", execution.getId()); data.put("id", execution.getId());
adminEvent.operation(OperationType.CREATE).resource(ResourceType.AUTH_EXECUTION_FLOW).resourcePath(uriInfo).representation(data).success(); adminEvent.operation(OperationType.CREATE).resource(ResourceType.AUTH_EXECUTION_FLOW).resourcePath(uriInfo).representation(data).success();
return Response.status(Response.Status.CREATED).build();
} }
private int getNextPriority(AuthenticationFlowModel parentFlow) { private int getNextPriority(AuthenticationFlowModel parentFlow) {