Consolidated exceptions using when clause

Author: pmathew92

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

@@ -99,18 +99,16 @@ internal open class DPoPKeyStore {
             if (publicKey != null) {
                 return Pair(privateKey, publicKey)
             }
-        } catch (e: KeyStoreException) {
-            throw DPoPException(DPoPException.Code.KEY_STORE_ERROR, e)
-        } catch (e: NoSuchAlgorithmException) {
-            throw DPoPException(DPoPException.Code.KEY_STORE_ERROR, e)
-        } catch (e: UnrecoverableKeyException) {
-            throw DPoPException(DPoPException.Code.KEY_STORE_ERROR, e)
-        } catch (e: ClassCastException) {
-            throw DPoPException(DPoPException.Code.KEY_STORE_ERROR, e)
-        } catch (e: IOException) {
-            throw DPoPException(DPoPException.Code.KEY_STORE_ERROR, e)
-        } catch (e: CertificateException) {
-            throw DPoPException(DPoPException.Code.KEY_STORE_ERROR, e)
+        } catch (e: Exception) {
+            when (e) {
+                is KeyStoreException,
+                is NoSuchAlgorithmException,
+                is UnrecoverableKeyException,
+                is ClassCastException,
+                is IOException,
+                is CertificateException -> throw DPoPException(DPoPException.Code.KEY_STORE_ERROR, e)
+                else -> throw DPoPException(DPoPException.Code.UNKNOWN_ERROR, e)
+            }
         }
         Log.d(TAG, "Returning null key pair ")
         return null
@@ -119,28 +117,28 @@ internal open class DPoPKeyStore {
     fun hasKeyPair(): Boolean {
         try {
             return keyStore.containsAlias(KEY_ALIAS)
-        } catch (e: KeyStoreException) {
-            throw DPoPException(DPoPException.Code.KEY_STORE_ERROR, e)
-        } catch (e: NoSuchAlgorithmException) {
-            throw DPoPException(DPoPException.Code.KEY_STORE_ERROR, e)
-        } catch (e: IOException) {
-            throw DPoPException(DPoPException.Code.KEY_STORE_ERROR, e)
-        } catch (e: CertificateException) {
-            throw DPoPException(DPoPException.Code.KEY_STORE_ERROR, e)
+        } catch (e: Exception) {
+            when (e) {
+                is KeyStoreException,
+                is NoSuchAlgorithmException,
+                is IOException,
+                is CertificateException -> throw DPoPException(DPoPException.Code.KEY_STORE_ERROR, e)
+                else -> throw DPoPException(DPoPException.Code.UNKNOWN_ERROR, e)
+            }
         }
     }
 
     fun deleteKeyPair() {
         try {
             keyStore.deleteEntry(KEY_ALIAS)
-        } catch (e: KeyStoreException) {
-            throw DPoPException(DPoPException.Code.KEY_STORE_ERROR, e)
-        } catch (e: NoSuchAlgorithmException) {
-            throw DPoPException(DPoPException.Code.KEY_STORE_ERROR, e)
-        } catch (e: IOException) {
-            throw DPoPException(DPoPException.Code.KEY_STORE_ERROR, e)
-        } catch (e: CertificateException) {
-            throw DPoPException(DPoPException.Code.KEY_STORE_ERROR, e)
+        } catch (e: Exception) {
+            when (e) {
+                is KeyStoreException,
+                is NoSuchAlgorithmException,
+                is IOException,
+                is CertificateException -> throw DPoPException(DPoPException.Code.KEY_STORE_ERROR, e)
+                else -> throw DPoPException(DPoPException.Code.UNKNOWN_ERROR, e)
+            }
         }
     }
 

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

@@ -229,6 +229,18 @@ public class DPoPKeyStoreTest {
         assertThat(exception.cause, `is`(cause))
     }
 
+    @Test
+    public fun `getKeyPair should throw UNKNOWN_ERROR on unhandled exception`() {
+        val cause = RuntimeException("Unexpected error")
+        whenever(mockKeyStore.getKey(any(), anyOrNull())).thenThrow(cause)
+
+        val exception = assertThrows(DPoPException::class.java) {
+            dpopKeyStore.getKeyPair()
+        }
+        assertEquals(exception.message, DPoPException.UNKNOWN_ERROR.message)
+        assertThat(exception.cause, `is`(cause))
+    }
+
     @Test
     public fun `hasKeyPair should return true when alias exists`() {
         whenever(mockKeyStore.containsAlias(any())).thenReturn(true)
@@ -255,6 +267,18 @@ public class DPoPKeyStoreTest {
         assertThat(exception.cause, `is`(cause))
     }
 
+    @Test
+    public fun `hasKeyPair should throw UNKNOWN_ERROR on unhandled exception`() {
+        val cause = RuntimeException("Unexpected error")
+        whenever(mockKeyStore.containsAlias(any())).thenThrow(cause)
+
+        val exception = assertThrows(DPoPException::class.java) {
+            dpopKeyStore.hasKeyPair()
+        }
+        assertEquals(exception.message, DPoPException.UNKNOWN_ERROR.message)
+        assertThat(exception.cause, `is`(cause))
+    }
+
     @Test
     public fun `deleteKeyPair should call deleteEntry`() {
         dpopKeyStore.deleteKeyPair()
@@ -274,6 +298,18 @@ public class DPoPKeyStoreTest {
     }
 
 
+    @Test
+    public fun `deleteKeyPair should throw UNKNOWN_ERROR on unhandled exception`() {
+        val cause = RuntimeException("Unexpected error")
+        whenever(mockKeyStore.deleteEntry(any())).thenThrow(cause)
+
+        val exception = assertThrows(DPoPException::class.java) {
+            dpopKeyStore.deleteKeyPair()
+        }
+        assertEquals(exception.message, DPoPException.UNKNOWN_ERROR.message)
+        assertThat(exception.cause, `is`(cause))
+    }
+
     @Test
     public fun `generateKeyPair should retry without StrongBox when ProviderException occurs with StrongBox enabled`() {
         val providerException = ProviderException("StrongBox attestation failed")