Merge pull request #3383 from ssilvert/duplicate-fed-provider

KEYCLOAK-2892: Bad error when create fed provider w/ same name.

services/src/main/java/org/keycloak/services/resources/admin/UserFederationProviderResource.java

@@ -26,6 +26,8 @@ import org.keycloak.mappers.UserFederationMapper;
 import org.keycloak.mappers.UserFederationMapperFactory;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.KeycloakSessionFactory;
+import org.keycloak.models.ModelDuplicateException;
+import org.keycloak.models.ModelException;
 import org.keycloak.models.RealmModel;
 import org.keycloak.models.UserFederationMapperModel;
 import org.keycloak.models.UserFederationProvider;
@@ -41,6 +43,7 @@ import org.keycloak.representations.idm.ConfigPropertyRepresentation;
 import org.keycloak.representations.idm.UserFederationMapperRepresentation;
 import org.keycloak.representations.idm.UserFederationMapperTypeRepresentation;
 import org.keycloak.representations.idm.UserFederationProviderRepresentation;
+import org.keycloak.services.ErrorResponse;
 import org.keycloak.services.ErrorResponseException;
 import org.keycloak.services.ServicesLogger;
 import org.keycloak.services.managers.UsersSyncManager;
@@ -99,13 +102,14 @@ public class UserFederationProviderResource {
     @PUT
     @NoCache
     @Consumes(MediaType.APPLICATION_JSON)
-    public void updateProviderInstance(UserFederationProviderRepresentation rep) {
+    public Response updateProviderInstance(UserFederationProviderRepresentation rep) {
         auth.requireManage();
 
         if (federationProviderModel == null) {
             throw new NotFoundException("Could not find federation provider");
         }
 
+        try {
             String displayName = rep.getDisplayName();
             if (displayName != null && displayName.trim().equals("")) {
                 displayName = null;
@@ -123,7 +127,18 @@ public class UserFederationProviderResource {
             }
 
             adminEvent.operation(OperationType.UPDATE).resourcePath(uriInfo).representation(rep).success();
-
+            return Response.noContent().build();
+        } catch (ModelDuplicateException e) {
+            if (session.getTransactionManager().isActive()) {
+                session.getTransactionManager().setRollbackOnly();
+            }
+            return ErrorResponse.exists("Federation provider exists with same name.");
+        } catch (ModelException me) {
+            if (session.getTransactionManager().isActive()) {
+                session.getTransactionManager().setRollbackOnly();
+            }
+            return ErrorResponse.error("Unable to update federation provider.", Response.Status.INTERNAL_SERVER_ERROR);
+        }
     }
 
     /**

services/src/main/java/org/keycloak/services/resources/admin/UserFederationProvidersResource.java

@@ -26,6 +26,8 @@ import org.keycloak.events.admin.ResourceType;
 import org.keycloak.mappers.FederationConfigValidationException;
 import org.keycloak.models.AuthenticationExecutionModel;
 import org.keycloak.models.KeycloakSession;
+import org.keycloak.models.ModelDuplicateException;
+import org.keycloak.models.ModelException;
 import org.keycloak.models.RealmModel;
 import org.keycloak.models.UserFederationProvider;
 import org.keycloak.models.UserFederationProviderFactory;
@@ -40,6 +42,7 @@ import org.keycloak.representations.idm.ConfigPropertyRepresentation;
 import org.keycloak.representations.idm.CredentialRepresentation;
 import org.keycloak.representations.idm.UserFederationProviderFactoryRepresentation;
 import org.keycloak.representations.idm.UserFederationProviderRepresentation;
+import org.keycloak.services.ErrorResponse;
 import org.keycloak.services.ErrorResponseException;
 import org.keycloak.services.ServicesLogger;
 import org.keycloak.services.managers.UsersSyncManager;
@@ -196,6 +199,7 @@ public class UserFederationProvidersResource {
     public Response createProviderInstance(UserFederationProviderRepresentation rep) {
         auth.requireManage();
 
+        try {
             String displayName = rep.getDisplayName();
             if (displayName != null && displayName.trim().equals("")) {
                 displayName = null;
@@ -216,6 +220,17 @@ public class UserFederationProvidersResource {
             adminEvent.operation(OperationType.CREATE).resourcePath(uriInfo, model.getId()).representation(rep).success();
 
             return Response.created(uriInfo.getAbsolutePathBuilder().path(model.getId()).build()).build();
+        } catch (ModelDuplicateException e) {
+            if (session.getTransactionManager().isActive()) {
+                session.getTransactionManager().setRollbackOnly();
+            }
+            return ErrorResponse.exists("Federation provider exists with same name.");
+        } catch (ModelException me){
+            if (session.getTransactionManager().isActive()) {
+                session.getTransactionManager().setRollbackOnly();
+            }
+            return ErrorResponse.error("Could not create federation provider.", Response.Status.INTERNAL_SERVER_ERROR);
+        }
     }
 
     /**