Added test cases for the DPoPProvider class

Author: pmathew92

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

@@ -4,12 +4,13 @@ import com.auth0.android.Auth0Exception
 
 public class DPoPException : Auth0Exception {
 
-    public enum class Code {
+    internal enum class Code {
         KEY_GENERATION_ERROR,
         KEY_STORE_ERROR,
+        SIGNING_FAILURE,
         UNKNOWN,
     }
-    
+
     private var code: Code? = null
 
     internal constructor(
@@ -33,14 +34,21 @@ public class DPoPException : Auth0Exception {
     }
 
 
-    private companion object {
+    public companion object {
+
+        public val KEY_GENERATION_ERROR: DPoPException = DPoPException(Code.KEY_GENERATION_ERROR)
+        public val KEY_STORE_ERROR: DPoPException = DPoPException(Code.KEY_STORE_ERROR)
+        public val SIGNING_FAILURE: DPoPException = DPoPException(Code.SIGNING_FAILURE)
+        public val UNKNOWN: DPoPException = DPoPException(Code.UNKNOWN)
+
         private const val DEFAULT_MESSAGE =
             "An unknown error has occurred. Please check the error cause for more details."
 
         private fun getMessage(code: Code): String {
             return when (code) {
                 Code.KEY_GENERATION_ERROR -> "Error generating DPoP key pair."
                 Code.KEY_STORE_ERROR -> "Error while accessing the key pair in the keystore."
+                Code.SIGNING_FAILURE -> "Error while signing the DPoP proof."
                 Code.UNKNOWN -> DEFAULT_MESSAGE
             }
         }

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

@@ -3,6 +3,7 @@ package com.auth0.android.dpop
 import android.content.Context
 import android.util.Base64
 import android.util.Log
+import androidx.annotation.VisibleForTesting
 import com.auth0.android.request.getErrorBody
 import okhttp3.Response
 import org.json.JSONObject
@@ -34,13 +35,16 @@ public object DPoPProvider {
     private const val NONCE_HEADER = "dpop-nonce"
     public const val DPOP_HEADER: String = "DPoP"
 
-    private val keyStore = DPoPKeyStore()
 
     public const val MAX_RETRY_COUNT: Int = 1
 
     public var auth0Nonce: String? = null
         private set
 
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    @Volatile
+    internal var keyStore = DPoPKeyStore()
+
     /**
      * This method constructs a DPoP proof JWT that includes the HTTP method, URL, and an optional access token and nonce.
      *
@@ -153,7 +157,7 @@ public object DPoPProvider {
     @Throws(DPoPException::class)
     public fun getPublicKeyJWK(): String? {
         if (!keyStore.hasKeyPair()) {
-            Log.d(TAG, "getPublicKeyJWK: Key pair is not present to generate JWK")
+            Log.e(TAG, "getPublicKeyJWK: Key pair is not present to generate JWK")
             return null
         }
 
@@ -324,8 +328,8 @@ public object DPoPProvider {
             return encodeBase64Url(convertDerToRawSignature(signatureBytes))
         } catch (e: Exception) {
             Log.e(TAG, "Error signing data: ${e.stackTraceToString()}")
+            throw DPoPException(DPoPException.Code.SIGNING_FAILURE, e)
         }
-        return null
     }
 
     private fun convertDerToRawSignature(derSignature: ByteArray): ByteArray {

auth0/src/main/java/com/auth0/android/request/internal/Jwt.kt

@@ -10,8 +10,8 @@ import java.util.*
  */
 internal class Jwt(rawToken: String) {
 
-    private val decodedHeader: Map<String, Any>
-    private val decodedPayload: Map<String, Any>
+    val decodedHeader: Map<String, Any>
+    val decodedPayload: Map<String, Any>
     val parts: Array<String>
 
     // header

auth0/src/test/java/com/auth0/android/authentication/AuthenticationAPIClientTest.kt

@@ -592,7 +592,7 @@ public class AuthenticationAPIClientTest {
     public fun shouldFetchUserInfo() {
         mockAPI.willReturnUserInfo()
         val callback = MockAuthenticationCallback<UserProfile>()
-        client.userInfo("ACCESS_TOKEN")
+        client.userInfo("ACCESS_TOKEN","Bearer")
             .start(callback)
         ShadowLooper.idleMainLooper()
         assertThat(
@@ -617,7 +617,7 @@ public class AuthenticationAPIClientTest {
     public fun shouldFetchUserInfoSync() {
         mockAPI.willReturnUserInfo()
         val profile = client
-            .userInfo("ACCESS_TOKEN")
+            .userInfo("ACCESS_TOKEN","Bearer")
             .execute()
         assertThat(profile, Matchers.`is`(Matchers.notNullValue()))
         val request = mockAPI.takeRequest()
@@ -638,7 +638,7 @@ public class AuthenticationAPIClientTest {
     public fun shouldAwaitFetchUserInfo(): Unit = runTest {
         mockAPI.willReturnUserInfo()
         val profile = client
-            .userInfo("ACCESS_TOKEN")
+            .userInfo("ACCESS_TOKEN","Bearer")
             .await()
         assertThat(profile, Matchers.`is`(Matchers.notNullValue()))
         val request = mockAPI.takeRequest()

auth0/src/test/java/com/auth0/android/authentication/request/AuthenticationRequestMock.java

@@ -6,6 +6,7 @@
 import com.auth0.android.authentication.AuthenticationException;
 import com.auth0.android.callback.Callback;
 import com.auth0.android.request.AuthenticationRequest;
+import com.auth0.android.request.HttpMethod;
 import com.auth0.android.request.Request;
 import com.auth0.android.result.Credentials;
 
@@ -112,4 +113,16 @@ public AuthenticationRequest withIdTokenVerificationLeeway(int leeway) {
     public AuthenticationRequest withIdTokenVerificationIssuer(@NonNull String issuer) {
         return this;
     }
+
+    @NonNull
+    @Override
+    public String getUrl() {
+        return "";
+    }
+
+    @NonNull
+    @Override
+    public HttpMethod getHttpMethod() {
+        return HttpMethod.GET.INSTANCE;
+    }
 }

auth0/src/test/java/com/auth0/android/authentication/request/RequestMock.java

@@ -4,6 +4,7 @@
 
 import com.auth0.android.Auth0Exception;
 import com.auth0.android.callback.Callback;
+import com.auth0.android.request.HttpMethod;
 import com.auth0.android.request.Request;
 
 import java.util.Map;
@@ -40,6 +41,18 @@ public Request<T, U> addHeader(@NonNull String name, @NonNull String value) {
         return this;
     }
 
+    @NonNull
+    @Override
+    public String getUrl() {
+        return "";
+    }
+
+    @NonNull
+    @Override
+    public HttpMethod getHttpMethod() {
+        return HttpMethod.GET.INSTANCE;
+    }
+
     @Override
     public void start(@NonNull Callback<T, U> callback) {
         started = true;