Fixed failing tests

Author: pmathew92

auth0/src/main/java/com/auth0/android/dpop/DPoPKeyStore.kt

@@ -23,10 +23,11 @@ import javax.security.cert.CertificateException
 /**
  * Class to handle all DPoP related keystore operations
  */
-internal class DPoPKeyStore(
-    private val keyStore: KeyStore =
+internal open class DPoPKeyStore {
+
+    protected open val keyStore: KeyStore by lazy {
         KeyStore.getInstance(ANDROID_KEYSTORE).apply { load(null) }
-) {
+    }
 
     fun generateKeyPair(context: Context) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {

auth0/src/main/java/com/auth0/android/provider/OAuthManager.kt

@@ -60,7 +60,6 @@ internal class OAuthManager(
         idTokenVerificationIssuer = if (TextUtils.isEmpty(issuer)) apiClient.baseURL else issuer
     }
 
-    @RequiresApi(Build.VERSION_CODES.M)
     fun startAuthentication(context: Context, redirectUri: String, requestCode: Int) {
         OidcUtils.includeDefaultScope(parameters)
         addPKCEParameters(parameters, redirectUri, headers)

auth0/src/main/java/com/auth0/android/request/ErrorBody.kt

@@ -20,12 +20,12 @@ public data class ErrorBody(
  * Extension method to parse [ErrorBody] from [Response]
  */
 public fun Response.getErrorBody(): ErrorBody {
-    return InputStreamReader(body?.byteStream(), Charsets.UTF_8).use { reader ->
-        try {
-            Gson().fromJson(reader, ErrorBody::class.java)
-        } catch (error: Exception) {
-            Log.e("ErrorBody", "Error parsing the error body ${error.stackTraceToString()}")
-            return ErrorBody("", "")
-        }
+    return try {
+        val peekedBody = peekBody(Long.MAX_VALUE)
+        val bodyString = peekedBody.string()
+        Gson().fromJson(bodyString, ErrorBody::class.java)
+    } catch (error: Exception) {
+        Log.e("ErrorBody", "Error parsing the error body ${error.stackTraceToString()}")
+        ErrorBody("", "")
     }
 }

auth0/src/test/java/com/auth0/android/dpop/DPoPKeyStoreTest.kt

@@ -35,6 +35,13 @@ import java.security.PublicKey
 import java.security.cert.Certificate
 import javax.security.auth.x500.X500Principal
 
+/**
+ * Using a subclass of [DPoPKeyStore] to help with mocking the lazy initialized keyStore property
+ */
+internal class MockableDPoPKeyStore(private val mockKeyStore: KeyStore) : DPoPKeyStore() {
+    override val keyStore: KeyStore by lazy { mockKeyStore }
+}
+
 @RunWith(PowerMockRunner::class)
 @PrepareForTest(
     DPoPKeyStore::class,
@@ -73,7 +80,6 @@ public class DPoPKeyStoreTest {
         PowerMockito.whenNew(KeyGenParameterSpec.Builder::class.java).withAnyArguments()
             .thenReturn(mockSpecBuilder)
 
-        // Configure mocks
         PowerMockito.`when`(KeyStore.getInstance("AndroidKeyStore")).thenReturn(mockKeyStore)
         doNothing().whenever(mockKeyStore).load(anyOrNull())
         PowerMockito.`when`(
@@ -94,7 +100,7 @@ public class DPoPKeyStoreTest {
             true
         )
 
-        dpopKeyStore = DPoPKeyStore(mockKeyStore)
+        dpopKeyStore = MockableDPoPKeyStore(mockKeyStore)
     }
 
     @Test

auth0/src/test/java/com/auth0/android/util/AuthenticationAPIMockServer.kt

@@ -205,7 +205,7 @@ internal class AuthenticationAPIMockServer : APIMockServer() {
         const val ID_TOKEN = "ID_TOKEN"
         const val ACCESS_TOKEN = "ACCESS_TOKEN"
         const val SESSION_ID = "SESSION_ID"
-        private const val BEARER = "BEARER"
+        private const val BEARER = "Bearer"
         private const val CHALLENGE = "CHALLENGE"
     }
 }