Clean-up in social core

services/src/main/java/org/keycloak/services/resources/SocialResource.java

@@ -61,7 +61,6 @@ import org.keycloak.services.resources.flows.Urls;
 import org.keycloak.social.AuthCallback;
 import org.keycloak.social.AuthRequest;
 import org.keycloak.social.RequestDetails;
-import org.keycloak.social.RequestDetailsBuilder;
 import org.keycloak.social.SocialConstants;
 import org.keycloak.social.SocialProvider;
 import org.keycloak.social.SocialProviderConfig;
@@ -185,10 +184,8 @@ public class SocialResource {
                 // Redirect user to registration screen with prefilled data from social provider
                 MultivaluedMap<String, String> formData = fillRegistrationFormWithSocialData(socialUser);
 
-                RequestDetailsBuilder reqDetailsBuilder = RequestDetailsBuilder.createFromRequestDetails(requestData);
-
                 String requestId = UUID.randomUUID().toString();
-                socialRequestManager.addRequest(requestId, reqDetailsBuilder.build());
+                socialRequestManager.addRequest(requestId, RequestDetails.create(requestData).build());
                 boolean secureOnly = !realm.isSslNotRequired();
                 String cookiePath = Urls.socialBase(uriInfo.getBaseUri()).build().getPath();
                 logger.debug("creating cookie for social registration - name: {0} path: {1}", SocialConstants.SOCIAL_REGISTRATION_COOKIE,
@@ -236,7 +233,7 @@ public class SocialResource {
         try {
             AuthRequest authRequest = provider.getAuthUrl(config);
 
-            RequestDetails socialRequest = RequestDetailsBuilder.create(providerId)
+            RequestDetails socialRequest = RequestDetails.create(providerId)
                     .putSocialAttributes(authRequest.getAttributes()).putClientAttribute("realmId", realmId)
                     .putClientAttribute("clientId", clientId).putClientAttribute("scope", scope)
                     .putClientAttribute("state", state).putClientAttribute("redirectUri", redirectUri).build();

social/core/src/main/java/org/keycloak/social/AuthRequest.java

@@ -21,7 +21,9 @@
  */
 package org.keycloak.social;
 
+import javax.ws.rs.core.UriBuilder;
 import java.net.URI;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -35,7 +37,15 @@ public class AuthRequest {
 
     private Map<String, String> attributes;
 
-    AuthRequest(String id, URI authUri, Map<String, String> attributes) {
+    public static AuthRequestBuilder create(String id, String path) {
+        AuthRequestBuilder req = new AuthRequestBuilder();
+        req.id = id;
+        req.b = UriBuilder.fromUri(path);
+        req.attributes = new HashMap<String, String>();
+        return req;
+    }
+
+    private AuthRequest(String id, URI authUri, Map<String, String> attributes) {
         this.id = id;
         this.authUri = authUri;
         this.attributes = attributes;
@@ -53,4 +63,31 @@ public class AuthRequest {
         return attributes;
     }
 
+    public static class AuthRequestBuilder {
+
+        private UriBuilder b;
+
+        private Map<String, String> attributes;
+
+        private String id;
+
+        private AuthRequestBuilder() {
+        }
+
+        public AuthRequestBuilder setQueryParam(String name, String value) {
+            b.queryParam(name, value);
+            return this;
+        }
+
+        public AuthRequestBuilder setAttribute(String name, String value) {
+            attributes.put(name, value);
+            return this;
+        }
+
+        public AuthRequest build() {
+            return new AuthRequest(id, b.build(), attributes);
+        }
+
+    }
+
 }

social/core/src/main/java/org/keycloak/social/AuthRequestBuilder.java

@@ -1,65 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.keycloak.social;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.ws.rs.core.UriBuilder;
-
-/**
- * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
- */
-public class AuthRequestBuilder {
-
-    private UriBuilder b;
-    
-    private Map<String, String> attributes;
-
-    private String id;
-
-    private AuthRequestBuilder() {
-    }
-
-    public static AuthRequestBuilder create(String id, String path) {
-        AuthRequestBuilder req = new AuthRequestBuilder();
-        req.id = id;
-        req.b = UriBuilder.fromUri(path);
-        req.attributes = new HashMap<String, String>();
-        return req;
-    }
-
-    public AuthRequestBuilder setQueryParam(String name, String value) {
-        b.queryParam(name, value);
-        return this;
-    }
-
-    public AuthRequestBuilder setAttribute(String name, String value) {
-        attributes.put(name, value);
-        return this;
-    }
-
-    public AuthRequest build() {
-        return new AuthRequest(id, b.build(), attributes);
-    }
-
-}

social/core/src/main/java/org/keycloak/social/RequestDetails.java

@@ -21,6 +21,7 @@
  */
 package org.keycloak.social;
 
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -34,7 +35,25 @@ public class RequestDetails {
 
     private Map<String, String> socialAttributes;
 
-    RequestDetails(String providerId, Map<String, String> clientAttributes, Map<String, String> socialAttributes) {
+    public static RequestDetailsBuilder create(String providerId) {
+        RequestDetailsBuilder req = new RequestDetailsBuilder();
+        req.providerId = providerId;
+        req.clientAttributes = new HashMap<String, String>();
+        req.socialAttributes = new HashMap<String, String>();
+        return req;
+    }
+
+    public static RequestDetailsBuilder create(RequestDetails from) {
+        RequestDetailsBuilder req = new RequestDetailsBuilder();
+        req.providerId = from.getProviderId();
+        req.clientAttributes = new HashMap<String, String>();
+        req.clientAttributes.putAll(from.getClientAttributes());
+        req.socialAttributes = new HashMap<String, String>();
+        req.socialAttributes.putAll(from.getSocialAttributes());
+        return req;
+    }
+
+    private RequestDetails(String providerId, Map<String, String> clientAttributes, Map<String, String> socialAttributes) {
         this.providerId = providerId;
         this.clientAttributes = clientAttributes;
         this.socialAttributes = socialAttributes;
@@ -60,4 +79,42 @@ public class RequestDetails {
         return socialAttributes;
     }
 
+
+    public static class RequestDetailsBuilder {
+
+        private String providerId;
+
+        private Map<String, String> clientAttributes;
+
+        private Map<String, String> socialAttributes;
+
+        private RequestDetailsBuilder() {
+        }
+
+        public RequestDetailsBuilder putClientAttribute(String name, String value) {
+            clientAttributes.put(name, value);
+            return this;
+        }
+
+        public RequestDetailsBuilder putClientAttributes(Map<String, String> attributes) {
+            clientAttributes.putAll(attributes);
+            return this;
+        }
+
+        public RequestDetailsBuilder putSocialAttribute(String name, String value) {
+            socialAttributes.put(name, value);
+            return this;
+        }
+
+        public RequestDetailsBuilder putSocialAttributes(Map<String, String> attributes) {
+            socialAttributes.putAll(attributes);
+            return this;
+        }
+
+        public RequestDetails build() {
+            return new RequestDetails(providerId, clientAttributes, socialAttributes);
+        }
+
+    }
+
 }

social/core/src/main/java/org/keycloak/social/RequestDetailsBuilder.java

@@ -1,83 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2012, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.keycloak.social;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
- */
-public class RequestDetailsBuilder {
-
-    private String providerId;
-
-    private Map<String, String> clientAttributes;
-
-    private Map<String, String> socialAttributes;
-
-    private RequestDetailsBuilder() {
-    }
-
-    public static RequestDetailsBuilder create(String providerId) {
-        RequestDetailsBuilder req = new RequestDetailsBuilder();
-        req.providerId = providerId;
-        req.clientAttributes = new HashMap<String, String>();
-        req.socialAttributes = new HashMap<String, String>();
-        return req;
-    }
-
-    public static RequestDetailsBuilder createFromRequestDetails(RequestDetails from) {
-        RequestDetailsBuilder req = new RequestDetailsBuilder();
-        req.providerId = from.getProviderId();
-        req.clientAttributes = new HashMap<String, String>();
-        req.clientAttributes.putAll(from.getClientAttributes());
-        req.socialAttributes = new HashMap<String, String>();
-        req.socialAttributes.putAll(from.getSocialAttributes());
-        return req;
-    }
-
-    public RequestDetailsBuilder putClientAttribute(String name, String value) {
-        clientAttributes.put(name, value);
-        return this;
-    }
-
-    public RequestDetailsBuilder putClientAttributes(Map<String, String> attributes) {
-        clientAttributes.putAll(attributes);
-        return this;
-    }
-
-    public RequestDetailsBuilder putSocialAttribute(String name, String value) {
-        socialAttributes.put(name, value);
-        return this;
-    }
-
-    public RequestDetailsBuilder putSocialAttributes(Map<String, String> attributes) {
-        socialAttributes.putAll(attributes);
-        return this;
-    }
-
-    public RequestDetails build() {
-        return new RequestDetails(providerId, clientAttributes, socialAttributes);
-    }
-
-}

social/facebook/src/main/java/org/keycloak/social/facebook/FacebookProvider.java

@@ -14,7 +14,6 @@ import org.jboss.resteasy.client.jaxrs.ResteasyClient;
 import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
 import org.keycloak.social.AuthCallback;
 import org.keycloak.social.AuthRequest;
-import org.keycloak.social.AuthRequestBuilder;
 import org.keycloak.social.SocialProvider;
 import org.keycloak.social.SocialProviderConfig;
 import org.keycloak.social.SocialProviderException;
@@ -46,13 +45,9 @@ public class FacebookProvider implements SocialProvider {
     public AuthRequest getAuthUrl(SocialProviderConfig config) throws SocialProviderException {
         String state = UUID.randomUUID().toString();
 
-        AuthRequestBuilder b = AuthRequestBuilder.create(state, AUTHENTICATION_ENDPOINT_URL).setQueryParam("client_id", config.getKey())
+        return AuthRequest.create(state, AUTHENTICATION_ENDPOINT_URL).setQueryParam("client_id", config.getKey())
                 .setQueryParam("response_type", DEFAULT_RESPONSE_TYPE).setQueryParam("scope", DEFAULT_SCOPE)
-                .setQueryParam("redirect_uri", config.getCallbackUrl()).setQueryParam("state", state);
+                .setQueryParam("redirect_uri", config.getCallbackUrl()).setQueryParam("state", state).setAttribute("state", state).build();
-
-        b.setAttribute("state", state);
-
-        return b.build();
     }
 
     @Override

social/google/src/main/java/org/keycloak/social/google/GoogleProvider.java

@@ -25,7 +25,6 @@ import java.util.UUID;
 
 import org.keycloak.social.AuthCallback;
 import org.keycloak.social.AuthRequest;
-import org.keycloak.social.AuthRequestBuilder;
 import org.keycloak.social.SocialProvider;
 import org.keycloak.social.SocialProviderConfig;
 import org.keycloak.social.SocialProviderException;
@@ -64,13 +63,9 @@ public class GoogleProvider implements SocialProvider {
     public AuthRequest getAuthUrl(SocialProviderConfig config) throws SocialProviderException {
         String state = UUID.randomUUID().toString();
 
-        AuthRequestBuilder b = AuthRequestBuilder.create(state, AUTH_PATH).setQueryParam("client_id", config.getKey())
+        return AuthRequest.create(state, AUTH_PATH).setQueryParam("client_id", config.getKey())
                 .setQueryParam("response_type", DEFAULT_RESPONSE_TYPE).setQueryParam("scope", DEFAULT_SCOPE)
-                .setQueryParam("redirect_uri", config.getCallbackUrl()).setQueryParam("state", state);
+                .setQueryParam("redirect_uri", config.getCallbackUrl()).setQueryParam("state", state).setAttribute("state", state).build();
-
-        b.setAttribute("state", state);
-
-        return b.build();
     }
 
     @Override

social/twitter/src/main/java/org/keycloak/social/twitter/TwitterProvider.java

@@ -23,7 +23,6 @@ package org.keycloak.social.twitter;
 
 import org.keycloak.social.AuthCallback;
 import org.keycloak.social.AuthRequest;
-import org.keycloak.social.AuthRequestBuilder;
 import org.keycloak.social.SocialProvider;
 import org.keycloak.social.SocialProviderConfig;
 import org.keycloak.social.SocialProviderException;
@@ -51,7 +50,7 @@ public class TwitterProvider implements SocialProvider {
 
             RequestToken requestToken = twitter.getOAuthRequestToken(request.getCallbackUrl());
 
-            return AuthRequestBuilder.create(requestToken.getToken(), requestToken.getAuthenticationURL())
+            return AuthRequest.create(requestToken.getToken(), requestToken.getAuthenticationURL())
                     .setAttribute("token", requestToken.getToken()).setAttribute("tokenSecret", requestToken.getTokenSecret())
                     .build();
         } catch (Exception e) {

testsuite/integration/src/test/java/org/keycloak/testsuite/DummySocial.java

@@ -4,7 +4,6 @@ import java.util.UUID;
 
 import org.keycloak.social.AuthCallback;
 import org.keycloak.social.AuthRequest;
-import org.keycloak.social.AuthRequestBuilder;
 import org.keycloak.social.SocialProvider;
 import org.keycloak.social.SocialProviderConfig;
 import org.keycloak.social.SocialProviderException;
@@ -23,12 +22,8 @@ public class DummySocial implements SocialProvider {
     public AuthRequest getAuthUrl(SocialProviderConfig config) throws SocialProviderException {
         String state = UUID.randomUUID().toString();
 
-        AuthRequestBuilder b = AuthRequestBuilder.create(state, AUTH_PATH).setQueryParam("response_type", "token")
+        return AuthRequest.create(state, AUTH_PATH).setQueryParam("response_type", "token")
-                .setQueryParam("redirect_uri", config.getCallbackUrl()).setQueryParam("state", state);
+                .setQueryParam("redirect_uri", config.getCallbackUrl()).setQueryParam("state", state).setAttribute("state", state).build();
-
-        b.setAttribute("state", state);
-
-        return b.build();
     }
 
     @Override