Revert "catch nullpointerexception when getting credentials during deserialization of json"

This reverts commit 9b213f3.

Author: bennycao

auth0/src/main/java/com/auth0/android/authentication/storage/SecureCredentialsManager.kt

@@ -16,6 +16,8 @@ import androidx.annotation.VisibleForTesting
 import androidx.lifecycle.Lifecycle
 import com.auth0.android.Auth0Exception
 import com.auth0.android.authentication.AuthenticationAPIClient
+import com.auth0.android.authentication.AuthenticationException
+import com.auth0.android.callback.AuthenticationCallback
 import com.auth0.android.callback.Callback
 import com.auth0.android.request.internal.GsonProvider
 import com.auth0.android.result.Credentials
@@ -144,14 +146,7 @@ public class SecureCredentialsManager @VisibleForTesting(otherwise = VisibleForT
             return false
         }
         if (resultCode == Activity.RESULT_OK) {
-            continueGetCredentials(
-                scope,
-                minTtl,
-                emptyMap(),
-                emptyMap(),
-                forceRefresh,
-                decryptCallback!!
-            )
+            continueGetCredentials(scope, minTtl, emptyMap(), emptyMap(), forceRefresh, decryptCallback!!)
         } else {
             decryptCallback!!.onFailure(CredentialsManagerException("The user didn't pass the authentication challenge."))
             decryptCallback = null
@@ -552,16 +547,7 @@ public class SecureCredentialsManager @VisibleForTesting(otherwise = VisibleForT
                 decryptCallback = null
                 return@execute
             }
-
-            val bridgeCredentials: OptionalCredentials
-            try {
-                bridgeCredentials = gson.fromJson(json, OptionalCredentials::class.java)
-            } catch (ex: NullPointerException) {
-                callback.onFailure(CredentialsManagerException("Credentials could not be retrieved."))
-                decryptCallback = null
-                return@execute
-            }
-
+            val bridgeCredentials = gson.fromJson(json, OptionalCredentials::class.java)
             /* OPTIONAL CREDENTIALS
              * This bridge is required to prevent users from being logged out when
              * migrating from Credentials with optional Access Token and ID token
@@ -655,9 +641,8 @@ public class SecureCredentialsManager @VisibleForTesting(otherwise = VisibleForT
                 callback.onSuccess(freshCredentials)
             } catch (error: CredentialsManagerException) {
                 val exception = CredentialsManagerException(
-                    "An error occurred while saving the refreshed Credentials.", error
-                )
-                if (error.cause is IncompatibleDeviceException || error.cause is CryptoException) {
+                    "An error occurred while saving the refreshed Credentials.", error)
+                if(error.cause is IncompatibleDeviceException || error.cause is CryptoException) {
                     exception.refreshedCredentials = freshCredentials
                 }
                 callback.onFailure(exception)
@@ -670,7 +655,6 @@ public class SecureCredentialsManager @VisibleForTesting(otherwise = VisibleForT
         private val TAG = SecureCredentialsManager::class.java.simpleName
         private const val KEY_CREDENTIALS = "com.auth0.credentials"
         private const val KEY_EXPIRES_AT = "com.auth0.credentials_access_token_expires_at"
-
         // This is no longer used as we get the credentials expiry from the access token only,
         // but we still store it so users can rollback to versions where it is required.
         private const val LEGACY_KEY_CACHE_EXPIRES_AT = "com.auth0.credentials_expires_at"

auth0/src/test/java/com/auth0/android/authentication/storage/SecureCredentialsManagerTest.kt

@@ -460,41 +460,6 @@ public class SecureCredentialsManagerTest {
         MatcherAssert.assertThat(retrievedCredentials.scope, Is.`is`("different scope"))
     }
 
-    @Test
-    public fun shouldFailOnGetCredentialsWhenNullPointerExceptionIsThrown() {
-        verifyNoMoreInteractions(client)
-        val expiresAt = Date(CredentialsMock.ONE_HOUR_AHEAD_MS)
-        val storedJson = insertTestCredentials(
-            hasIdToken = true,
-            hasAccessToken = true,
-            hasRefreshToken = true,
-            willExpireAt = expiresAt,
-            scope = "scope"
-        )
-
-        Mockito.`when`(crypto.decrypt(storedJson.toByteArray()))
-            .thenReturn("".toByteArray())
-
-        manager.getCredentials(callback)
-        verify(callback).onFailure(
-            exceptionCaptor.capture()
-        )
-        val exception = exceptionCaptor.firstValue
-        MatcherAssert.assertThat(exception, Is.`is`(Matchers.notNullValue()))
-        MatcherAssert.assertThat(
-            exception, IsInstanceOf.instanceOf(
-                CredentialsManagerException::class.java
-            )
-        )
-        MatcherAssert.assertThat(
-            exception.message,
-            Is.`is`("Credentials could not be retrieved.")
-        )
-        verify(storage, never()).remove("com.auth0.credentials")
-        verify(storage, never()).remove("com.auth0.credentials_expires_at")
-        verify(storage, never()).remove("com.auth0.credentials_can_refresh")
-    }
-
     @Test
     public fun shouldFailOnSavingRefreshedCredentialsInGetCredentialsWhenIncompatibleDeviceExceptionIsThrown() {
         val expiresAt = Date(CredentialsMock.ONE_HOUR_AHEAD_MS) // non expired credentials