Resolved review comments

utkrishtsahu · utkrishtsahu · commit 16bc8eaf066d · 2026-02-13T16:34:43.000+05:30
diff --git a/auth0/src/main/java/com/auth0/android/request/DefaultClient.kt b/auth0/src/main/java/com/auth0/android/request/DefaultClient.kt
@@ -9,7 +9,6 @@ import okhttp3.Headers
 import okhttp3.Headers.Companion.toHeaders
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
-import okhttp3.Interceptor
 import okhttp3.MediaType
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
@@ -33,7 +32,6 @@ import javax.net.ssl.X509TrustManager
  *     .readTimeout(30)
  *     .writeTimeout(30)
  *     .enableLogging(true)
- *     .addInterceptor(myInterceptor)
  *     .build()
  * ```
  *
@@ -57,9 +55,7 @@ public class DefaultClient private constructor(
      *     .callTimeout(60)
      *     .defaultHeaders(mapOf("X-Custom" to "value"))
      *     .enableLogging(true)
-     *     .logLevel(HttpLoggingInterceptor.Level.HEADERS)
      *     .logger(myCustomLogger)
-     *     .addInterceptor(myInterceptor)
      *     .build()
      * ```
      */
@@ -70,9 +66,7 @@ public class DefaultClient private constructor(
         private var callTimeout: Int = 0
         private var defaultHeaders: Map<String, String> = mapOf()
         private var enableLogging: Boolean = false
-        private var logLevel: HttpLoggingInterceptor.Level = HttpLoggingInterceptor.Level.BODY
         private var logger: HttpLoggingInterceptor.Logger? = null
-        private val interceptors: MutableList<Interceptor> = mutableListOf()
         private var gson: Gson = GsonProvider.gson
         private var sslSocketFactory: SSLSocketFactory? = null
         private var trustManager: X509TrustManager? = null
@@ -113,14 +107,6 @@ public class DefaultClient private constructor(
          */
         public fun enableLogging(enable: Boolean): Builder = apply { this.enableLogging = enable }
 
-        /**
-         * Sets the log level for the HTTP logging interceptor.
-         * Only takes effect if [enableLogging] is set to `true`.
-         * Default is [HttpLoggingInterceptor.Level.BODY].
-         */
-        public fun logLevel(level: HttpLoggingInterceptor.Level): Builder =
-            apply { this.logLevel = level }
-
         /**
          * Sets a custom logger for the HTTP logging interceptor.
          * Only takes effect if [enableLogging] is set to `true`.
@@ -129,14 +115,6 @@ public class DefaultClient private constructor(
         public fun logger(logger: HttpLoggingInterceptor.Logger): Builder =
             apply { this.logger = logger }
 
-        /**
-         * Adds a custom OkHttp [Interceptor]. Multiple interceptors can be added
-         * by calling this method multiple times. They are invoked in the order they were added,
-         * after the built-in [RetryInterceptor] and before the logging interceptor.
-         */
-        public fun addInterceptor(interceptor: Interceptor): Builder =
-            apply { this.interceptors.add(interceptor) }
-
         @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
         internal fun gson(gson: Gson): Builder = apply { this.gson = gson }
 
@@ -157,15 +135,13 @@ public class DefaultClient private constructor(
 
             okBuilder.addInterceptor(RetryInterceptor())
 
-            interceptors.forEach { okBuilder.addInterceptor(it) }
-
             if (enableLogging) {
                 val loggingInterceptor = if (logger != null) {
                     HttpLoggingInterceptor(logger!!)
                 } else {
                     HttpLoggingInterceptor()
                 }
-                loggingInterceptor.setLevel(logLevel)
+                loggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY)
                 okBuilder.addInterceptor(loggingInterceptor)
             }
 
@@ -224,34 +200,6 @@ public class DefaultClient private constructor(
         }
     )
 
-    /**
-     * Internal constructor used by tests to inject SSL and Gson.
-     */
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-    internal constructor(
-        connectTimeout: Int,
-        readTimeout: Int,
-        defaultHeaders: Map<String, String>,
-        enableLogging: Boolean,
-        gson: Gson,
-        sslSocketFactory: SSLSocketFactory?,
-        trustManager: X509TrustManager?
-    ) : this(
-        defaultHeaders = defaultHeaders,
-        gson = gson,
-        okHttpClientBuilder = OkHttpClient.Builder().apply {
-            addInterceptor(RetryInterceptor())
-            if (enableLogging) {
-                addInterceptor(HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY))
-            }
-            connectTimeout(connectTimeout.toLong(), TimeUnit.SECONDS)
-            readTimeout(readTimeout.toLong(), TimeUnit.SECONDS)
-            if (sslSocketFactory != null && trustManager != null) {
-                sslSocketFactory(sslSocketFactory, trustManager)
-            }
-        }
-    )
-
     @get:VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
     internal val okHttpClient: OkHttpClient
 
diff --git a/auth0/src/test/java/com/auth0/android/request/DefaultClientTest.kt b/auth0/src/test/java/com/auth0/android/request/DefaultClientTest.kt
@@ -11,7 +11,6 @@ import okhttp3.mockwebserver.MockWebServer
 import okhttp3.mockwebserver.RecordedRequest
 import org.hamcrest.CoreMatchers.*
 import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.Matchers.empty
 import org.hamcrest.Matchers.hasSize
 import org.hamcrest.collection.IsMapContaining.hasEntry
 import org.hamcrest.collection.IsMapWithSize.anEmptyMap
@@ -438,22 +437,10 @@ public class DefaultClientTest {
         assertThat(loggingInterceptor.level, equalTo(HttpLoggingInterceptor.Level.BODY))
     }
 
-    @Test
-    public fun builderShouldSetCustomLogLevel() {
-        val client = DefaultClient.Builder()
-            .enableLogging(true)
-            .logLevel(HttpLoggingInterceptor.Level.HEADERS)
-            .build()
-        assertThat(client.okHttpClient.interceptors, hasSize(2))
-        val loggingInterceptor = client.okHttpClient.interceptors[1] as HttpLoggingInterceptor
-        assertThat(loggingInterceptor.level, equalTo(HttpLoggingInterceptor.Level.HEADERS))
-    }
-
     @Test
     public fun builderShouldNotAddLoggingInterceptorWhenDisabled() {
         val client = DefaultClient.Builder()
             .enableLogging(false)
-            .logLevel(HttpLoggingInterceptor.Level.HEADERS)
             .build()
         assertThat(client.okHttpClient.interceptors, hasSize(1))
         assertThat(client.okHttpClient.interceptors[0] is RetryInterceptor, equalTo(true))
@@ -481,90 +468,6 @@ public class DefaultClientTest {
         assertThat(logs.isEmpty(), equalTo(false))
     }
 
-    @Test
-    public fun builderShouldAddSingleCustomInterceptor() {
-        var intercepted = false
-        val customInterceptor = Interceptor { chain ->
-            intercepted = true
-            chain.proceed(chain.request())
-        }
-
-        val client = DefaultClient.Builder()
-            .addInterceptor(customInterceptor)
-            .sslSocketFactory(
-                SSLTestUtils.clientCertificates.sslSocketFactory(),
-                SSLTestUtils.clientCertificates.trustManager
-            )
-            .build()
-
-        assertThat(client.okHttpClient.interceptors, hasSize(2))
-        assertThat(client.okHttpClient.interceptors[0] is RetryInterceptor, equalTo(true))
-
-        enqueueMockResponse(STATUS_SUCCESS, JSON_OK)
-        executeRequest(HttpMethod.GET, client)
-        assertThat(intercepted, equalTo(true))
-    }
-
-    @Test
-    public fun builderShouldAddMultipleCustomInterceptors() {
-        val callOrder = mutableListOf<String>()
-        val firstInterceptor = Interceptor { chain ->
-            callOrder.add("first")
-            chain.proceed(chain.request())
-        }
-        val secondInterceptor = Interceptor { chain ->
-            callOrder.add("second")
-            chain.proceed(chain.request())
-        }
-
-        val client = DefaultClient.Builder()
-            .addInterceptor(firstInterceptor)
-            .addInterceptor(secondInterceptor)
-            .sslSocketFactory(
-                SSLTestUtils.clientCertificates.sslSocketFactory(),
-                SSLTestUtils.clientCertificates.trustManager
-            )
-            .build()
-
-        assertThat(client.okHttpClient.interceptors, hasSize(3))
-
-        enqueueMockResponse(STATUS_SUCCESS, JSON_OK)
-        executeRequest(HttpMethod.GET, client)
-        assertThat(callOrder, equalTo(listOf("first", "second")))
-    }
-
-    @Test
-    public fun builderShouldPlaceCustomInterceptorsBeforeLogging() {
-        val callOrder = mutableListOf<String>()
-        val customInterceptor = Interceptor { chain ->
-            callOrder.add("custom")
-            chain.proceed(chain.request())
-        }
-        val customLogger = HttpLoggingInterceptor.Logger { callOrder.add("logging") }
-
-        val client = DefaultClient.Builder()
-            .addInterceptor(customInterceptor)
-            .enableLogging(true)
-            .logger(customLogger)
-            .sslSocketFactory(
-                SSLTestUtils.clientCertificates.sslSocketFactory(),
-                SSLTestUtils.clientCertificates.trustManager
-            )
-            .build()
-
-        assertThat(client.okHttpClient.interceptors, hasSize(3))
-        assertThat(client.okHttpClient.interceptors[0] is RetryInterceptor, equalTo(true))
-        assertThat(client.okHttpClient.interceptors[2] is HttpLoggingInterceptor, equalTo(true))
-
-        enqueueMockResponse(STATUS_SUCCESS, JSON_OK)
-        executeRequest(HttpMethod.GET, client)
-        val customIndex = callOrder.indexOf("custom")
-        val loggingIndex = callOrder.indexOf("logging")
-        assertThat(customIndex, not(equalTo(-1)))
-        assertThat(loggingIndex, not(equalTo(-1)))
-        assertThat(customIndex < loggingIndex, equalTo(true))
-    }
-
     @Test
     public fun builderShouldSetDefaultHeaders() {
         enqueueMockResponse(STATUS_SUCCESS, JSON_OK)
@@ -583,12 +486,10 @@ public class DefaultClientTest {
 
     @Test
     public fun builderNonRetryableClientShouldInheritConfiguration() {
-        val customInterceptor = Interceptor { chain -> chain.proceed(chain.request()) }
         val client = DefaultClient.Builder()
             .connectTimeout(25)
             .readTimeout(35)
             .writeTimeout(45)
-            .addInterceptor(customInterceptor)
             .enableLogging(true)
             .build()
 
