refactor: receive flag on the loggingEnabled method. add getter

auth0 · Nov 25, 2016 · aa98761 · aa98761
1 parent 9439675
commit aa98761
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 6 deletions.
diff --git a/auth0/src/main/java/com/auth0/android/authentication/AuthenticationAPIClient.java b/auth0/src/main/java/com/auth0/android/authentication/AuthenticationAPIClient.java
@@ -137,8 +137,15 @@ private AuthenticationAPIClient(Auth0 auth0, RequestFactory factory, OkHttpClien
      * Log every Request and Response made by this client.
      * You shouldn't enable logging in release builds as it may leak sensitive information.
      */
-    public void enableLogging() {
-        logInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
+    public void setLoggingEnabled(boolean enabled) {
+        logInterceptor.setLevel(enabled ? HttpLoggingInterceptor.Level.BODY : HttpLoggingInterceptor.Level.NONE);
+    }
+
+    /**
+     * Getter for the current client logger enabled state.
+     */
+    public boolean isLoggingEnabled() {
+        return logInterceptor.getLevel() == HttpLoggingInterceptor.Level.BODY;
     }
 
     public String getClientId() {

diff --git a/auth0/src/main/java/com/auth0/android/provider/WebAuthProvider.java b/auth0/src/main/java/com/auth0/android/provider/WebAuthProvider.java
@@ -477,9 +477,7 @@ private Uri buildAuthorizeUri() {
     private PKCE createPKCE(String redirectUri) {
         if (pkce == null) {
             final AuthenticationAPIClient client = new AuthenticationAPIClient(account);
-            if (loggingEnabled) {
-                client.enableLogging();
-            }
+            client.setLoggingEnabled(loggingEnabled);
             return new PKCE(client, redirectUri);
         } else {
             return pkce;

diff --git a/auth0/src/test/java/com/auth0/android/authentication/AuthenticationAPIClientTest.java b/auth0/src/test/java/com/auth0/android/authentication/AuthenticationAPIClientTest.java
@@ -157,14 +157,37 @@ public void shouldEnableHttpLogging() throws Exception {
 
         ArgumentCaptor<Interceptor> interceptorCaptor = ArgumentCaptor.forClass(Interceptor.class);
         AuthenticationAPIClient client = new AuthenticationAPIClient(account, factory, okClient);
-        client.enableLogging();
+        client.setLoggingEnabled(true);
 
         verify(okClient).interceptors();
         verify(list).add(interceptorCaptor.capture());
 
         assertThat(interceptorCaptor.getValue(), is(notNullValue()));
         assertThat(interceptorCaptor.getValue(), is(instanceOf(HttpLoggingInterceptor.class)));
         assertThat(((HttpLoggingInterceptor) interceptorCaptor.getValue()).getLevel(), is(HttpLoggingInterceptor.Level.BODY));
+        assertThat(client.isLoggingEnabled(), is(true));
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void shouldDisableHttpLogging() throws Exception {
+        Auth0 account = mock(Auth0.class);
+        RequestFactory factory = mock(RequestFactory.class);
+        OkHttpClient okClient = mock(OkHttpClient.class);
+        List list = mock(List.class);
+        when(okClient.interceptors()).thenReturn(list);
+
+        ArgumentCaptor<Interceptor> interceptorCaptor = ArgumentCaptor.forClass(Interceptor.class);
+        AuthenticationAPIClient client = new AuthenticationAPIClient(account, factory, okClient);
+        client.setLoggingEnabled(false);
+
+        verify(okClient).interceptors();
+        verify(list).add(interceptorCaptor.capture());
+
+        assertThat(interceptorCaptor.getValue(), is(notNullValue()));
+        assertThat(interceptorCaptor.getValue(), is(instanceOf(HttpLoggingInterceptor.class)));
+        assertThat(((HttpLoggingInterceptor) interceptorCaptor.getValue()).getLevel(), is(HttpLoggingInterceptor.Level.NONE));
+        assertThat(client.isLoggingEnabled(), is(false));
     }
 
     @SuppressWarnings("unchecked")
@@ -185,6 +208,7 @@ public void shouldHaveHttpLoggingDisabledByDefault() throws Exception {
         assertThat(interceptorCaptor.getValue(), is(notNullValue()));
         assertThat(interceptorCaptor.getValue(), is(instanceOf(HttpLoggingInterceptor.class)));
         assertThat(((HttpLoggingInterceptor) interceptorCaptor.getValue()).getLevel(), is(HttpLoggingInterceptor.Level.NONE));
+        assertThat(client.isLoggingEnabled(), is(false));
     }
 
     @Test