keycloak-uncached

KEYCLOAK-777 No login event for social login

10/28/2014 4:56:41 PM

Stian Thorgersen

Commit: 6e4785e

Tree: 269cbf9

Parents: 4eb60a1

Changes

events/api/src/main/java/org/keycloak/events/EventType.java 4(+2 -2)

services/src/main/java/org/keycloak/services/resources/SocialResource.java 2(+1 -1)

testsuite/integration/src/test/java/org/keycloak/testsuite/AssertEvents.java 2(+1 -1)

Details

events/api/src/main/java/org/keycloak/events/EventType.java 4(+2 -2)

diff --git a/events/api/src/main/java/org/keycloak/events/EventType.java b/events/api/src/main/java/org/keycloak/events/EventType.java
index bdfdb0e..d41fb81 100755
--- a/events/api/src/main/java/org/keycloak/events/EventType.java
+++ b/events/api/src/main/java/org/keycloak/events/EventType.java
@@ -40,9 +40,9 @@ public enum EventType {
     SEND_VERIFY_EMAIL_ERROR,
     SEND_RESET_PASSWORD,
     SEND_RESET_PASSWORD_ERROR,
-    SOCIAL_LOGIN,
-    SOCIAL_LOGIN_ERROR,
+
     INVALID_SIGNATURE_ERROR,
     REGISTER_NODE,
     UNREGISTER_NODE
+
 }

services/src/main/java/org/keycloak/services/resources/SocialResource.java 2(+1 -1)

diff --git a/services/src/main/java/org/keycloak/services/resources/SocialResource.java b/services/src/main/java/org/keycloak/services/resources/SocialResource.java
index ce40497..195a9bf 100755
--- a/services/src/main/java/org/keycloak/services/resources/SocialResource.java
+++ b/services/src/main/java/org/keycloak/services/resources/SocialResource.java
@@ -121,7 +121,7 @@ public class SocialResource {
         RealmModel realm = clientSession.getRealm();
 
         EventBuilder event = new EventsManager(realm, session, clientConnection).createEventBuilder()
-                .event(EventType.SOCIAL_LOGIN)
+                .event(EventType.LOGIN)
                 .client(clientSession.getClient())
                 .detail(Details.REDIRECT_URI, clientSession.getRedirectUri())
                 .detail(Details.AUTH_METHOD, authMethod);

testsuite/integration/src/test/java/org/keycloak/testsuite/AssertEvents.java 2(+1 -1)

diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/AssertEvents.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/AssertEvents.java
index 0a3f6c3..c8b41c2 100755
--- a/testsuite/integration/src/test/java/org/keycloak/testsuite/AssertEvents.java
+++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/AssertEvents.java
@@ -125,7 +125,7 @@ public class AssertEvents implements TestRule, EventListenerProviderFactory {
     }
 
     public ExpectedEvent expectSocialLogin() {
-        return expect(EventType.SOCIAL_LOGIN)
+        return expect(EventType.LOGIN)
                 .detail(Details.CODE_ID, isCodeId())
                 .detail(Details.USERNAME, DEFAULT_USERNAME)
                 .detail(Details.AUTH_METHOD, "form")