Merge pull request #24 from auchanretailfrance/fix_NPE_identity_provider

fix NPE in identity provider retrieval
aerogear · Feb 7, 2019 · eecc4e7 · eecc4e7
2 parents 387c3e1 + f92764f
commit eecc4e7
Showing 1 changed file with 21 additions and 6 deletions.
diff --git a/src/main/java/org/jboss/aerogear/keycloak/metrics/PrometheusExporter.java b/src/main/java/org/jboss/aerogear/keycloak/metrics/PrometheusExporter.java
@@ -120,8 +120,7 @@ public void recordGenericAdminEvent(final AdminEvent event) {
      * @param event Login event
      */
     public void recordLogin(final Event event) {
-        final String provider = event.getDetails()
-                .getOrDefault("identity_provider", PROVIDER_KEYCLOAK_OPENID);
+        final String provider = getIdentityProvider(event);
 
         totalLogins.labels(event.getRealmId(), provider).inc();
     }
@@ -132,8 +131,7 @@ public void recordLogin(final Event event) {
      * @param event Register event
      */
     public void recordRegistration(final Event event) {
-        final String provider = event.getDetails()
-                .getOrDefault("identity_provider", PROVIDER_KEYCLOAK_OPENID);
+        final String provider = getIdentityProvider(event);
 
         totalRegistrations.labels(event.getRealmId(), provider).inc();
     }
@@ -145,12 +143,29 @@ public void recordRegistration(final Event event) {
      * @param event LoginError event
      */
     public void recordLoginError(final Event event) {
-        final String provider = event.getDetails()
-                .getOrDefault("identity_provider", PROVIDER_KEYCLOAK_OPENID);
+        final String provider = getIdentityProvider(event);
 
         totalFailedLoginAttempts.labels(event.getRealmId(), provider, event.getError()).inc();
     }
 
+    /**
+     * Retrieve the identity prodiver name from event details or
+     * default to {@value #PROVIDER_KEYCLOAK_OPENID}.
+     *
+     * @param event User event
+     * @return      Identity provider name
+     */
+    private String getIdentityProvider(Event event) {
+        String identityProvider = null;
+        if (event.getDetails() != null) {
+            identityProvider = event.getDetails().get("identity_provider");
+        }
+        if (identityProvider == null) {
+            identityProvider = PROVIDER_KEYCLOAK_OPENID;
+        }
+        return identityProvider;
+    }
+
     /**
      * Write the Prometheus formatted values of all counters and
      * gauges to the stream