KEYCLOAK-364 Show access denied if social login is cancelled

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

@@ -51,6 +51,15 @@ public abstract class AbstractOAuth2Provider implements SocialProvider {
 
     @Override
     public SocialUser processCallback(SocialProviderConfig config, AuthCallback callback) throws SocialProviderException {
+        String error = callback.getQueryParam("error");
+        if (error != null) {
+            if (error.equals("access_denied")) {
+                throw new SocialAccessDeniedException();
+            } else {
+                throw new SocialProviderException(error);
+            }
+        }
+
         try {
             String code = callback.getQueryParam(CODE);
 
@@ -82,9 +91,4 @@ public abstract class AbstractOAuth2Provider implements SocialProvider {
         }
     }
 
-    @Override
-    public String getRequestIdParamName() {
-        return STATE;
-    }
-
 }

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

@@ -0,0 +1,7 @@
+package org.keycloak.social;
+
+/**
+ * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
+ */
+public class SocialAccessDeniedException extends SocialProviderException {
+}

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

@@ -31,8 +31,6 @@ public interface SocialProvider {
 
     AuthRequest getAuthUrl(SocialProviderConfig config) throws SocialProviderException;
 
-    String getRequestIdParamName();
-
     String getName();
 
     SocialUser processCallback(SocialProviderConfig config, AuthCallback callback) throws SocialProviderException;

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

@@ -28,6 +28,9 @@ public class SocialProviderException extends Exception {
 
     private static final long serialVersionUID = 1L;
 
+    protected SocialProviderException() {
+    }
+
     public SocialProviderException(String message) {
         super(message);
     }

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

@@ -23,6 +23,7 @@ package org.keycloak.social.twitter;
 
 import org.keycloak.social.AuthCallback;
 import org.keycloak.social.AuthRequest;
+import org.keycloak.social.SocialAccessDeniedException;
 import org.keycloak.social.SocialProvider;
 import org.keycloak.social.SocialProviderConfig;
 import org.keycloak.social.SocialProviderException;
@@ -67,6 +68,10 @@ public class TwitterProvider implements SocialProvider {
 
     @Override
     public SocialUser processCallback(SocialProviderConfig config, AuthCallback callback) throws SocialProviderException {
+        if (callback.getQueryParam("denied") != null) {
+            throw new SocialAccessDeniedException();
+        }
+
         try {
             Twitter twitter = new TwitterFactory().getInstance();
             twitter.setOAuthConsumer(config.getKey(), config.getSecret());
@@ -86,9 +91,4 @@ public class TwitterProvider implements SocialProvider {
         }
     }
 
-    @Override
-    public String getRequestIdParamName() {
-        return "oauth_token";
-    }
-
 }