Merge pull request #21 from auth0/add-telemetry-to-constructor

Customise Telemetry info

Author: hzalaz

auth0/src/main/java/com/auth0/Auth0.java

@@ -48,17 +48,19 @@ public class Auth0 {
 
     /**
      * Creates a new object using clientId & domain
+     *
      * @param clientId of your Auth0 application
-     * @param domain of your Auth0 account
+     * @param domain   of your Auth0 account
      */
     public Auth0(String clientId, String domain) {
         this(clientId, null, domain, null);
     }
 
     /**
      * Creates a new object using clientId & domain
+     *
      * @param clientId of your Auth0 application
-     * @param domain of your Auth0 account
+     * @param domain   of your Auth0 account
      */
     public Auth0(String clientId, String clientSecret, String domain) {
         this(clientId, clientSecret, domain, null);
@@ -68,9 +70,10 @@ public Auth0(String clientId, String clientSecret, String domain) {
      * Creates a new object using clientId, domain and configuration domain.
      * Useful when using a on-premise auth0 server that is not in the public cloud,
      * otherwise we recommend using the constructor {@link #Auth0(String, String)}
-     * @param clientId of your Auth0 application
-     * @param clientSecret of your Auth0 application. It can be null, specially if used for an Android application
-     * @param domain of your Auth0 account
+     *
+     * @param clientId            of your Auth0 application
+     * @param clientSecret        of your Auth0 application. It can be null, specially if used for an Android application
+     * @param domain              of your Auth0 account
      * @param configurationDomain where Auth0's configuration will be fetched. By default is Auth0 public cloud
      */
     public Auth0(String clientId, String clientSecret, String domain, String configurationDomain) {
@@ -133,6 +136,16 @@ public Telemetry getTelemetry() {
         return telemetry;
     }
 
+
+    /**
+     * Setter for the Telemetry to send in every request to Auth0.
+     *
+     * @param telemetry to send in every request to Auth0
+     */
+    public void setTelemetry(Telemetry telemetry) {
+        this.telemetry = telemetry;
+    }
+
     /**
      * Avoid sending telemetry in every request to Auth0
      */
@@ -148,7 +161,7 @@ private String resolveConfiguration(String configurationDomain, String domainUrl
             if (host.endsWith(DOT_AUTH0_DOT_COM)) {
                 String[] parts = host.split("\\.");
                 if (parts.length > 3) {
-                    url = "https://cdn." + parts[parts.length-3] + DOT_AUTH0_DOT_COM;
+                    url = "https://cdn." + parts[parts.length - 3] + DOT_AUTH0_DOT_COM;
                 } else {
                     url = AUTH0_US_CDN_URL;
                 }

auth0/src/main/java/com/auth0/BuildConfig.java

@@ -1,8 +1,6 @@
 package com.auth0;
 
-abstract class BuildConfig {
-
-    private BuildConfig() {}
+public abstract class BuildConfig {
 
     /**
      * Version of auth0-java

auth0/src/test/java/com/auth0/Auth0Test.java

@@ -25,18 +25,21 @@
 package com.auth0;
 
 import com.auth0.authentication.AuthenticationAPIClient;
+import com.auth0.util.Telemetry;
 
 import org.junit.Test;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertThat;
 
 public class Auth0Test {
 
     private static final String CLIENT_ID = "CLIENT_ID";
+    private static final String CLIENT_SECRET = "CLIENT_SECRET";
+    private static final String CONFIGURATION_DOMAIN = "CONFIGURATION_DOMAIN";
     private static final String DOMAIN = "samples.auth0.com";
     private static final String CONFIG_DOMAIN_CUSTOM = "config.mydomain.com";
     private static final String EU_DOMAIN = "samples.eu.auth0.com";
@@ -112,4 +115,12 @@ public void shouldNotReturnTelemetryWhenExplicitlyDisabledThem() throws Exceptio
         auth0.doNotSendTelemetry();
         assertThat(auth0.getTelemetry(), is(nullValue()));
     }
+
+    @Test
+    public void shouldSetCustomTelemetry() throws Exception {
+        Telemetry customTelemetry = new Telemetry("custom", "9.9.9", "1.1.1");
+        Auth0 auth0 = new Auth0(CLIENT_ID, DOMAIN);
+        auth0.setTelemetry(customTelemetry);
+        assertThat(auth0.getTelemetry(), is(equalTo(customTelemetry)));
+    }
 }