fix(authenticator): Fix emission of NetworkErrorMessage (#152)

Author: mattcreaser

authenticator/src/main/java/com/amplifyframework/ui/authenticator/AuthenticatorViewModel.kt

@@ -76,8 +76,8 @@ import com.amplifyframework.ui.authenticator.util.PasswordResetMessage
 import com.amplifyframework.ui.authenticator.util.RealAuthProvider
 import com.amplifyframework.ui.authenticator.util.UnableToResetPasswordMessage
 import com.amplifyframework.ui.authenticator.util.UnknownErrorMessage
+import com.amplifyframework.ui.authenticator.util.isConnectivityIssue
 import com.amplifyframework.ui.authenticator.util.toFieldError
-import java.net.UnknownHostException
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -554,7 +554,7 @@ internal class AuthenticatorViewModel(
             is CodeExpiredException -> sendMessage(ExpiredCodeMessage(error))
             is CodeValidationException -> sendMessage(UnknownErrorMessage(error))
             is UnknownException -> {
-                if (error.cause is UnknownHostException) {
+                if (error.isConnectivityIssue()) {
                     sendMessage(NetworkErrorMessage(error))
                 } else {
                     sendMessage(UnknownErrorMessage(error))

authenticator/src/main/java/com/amplifyframework/ui/authenticator/util/Exceptions.kt

@@ -16,6 +16,7 @@
 package com.amplifyframework.ui.authenticator.util
 
 import com.amplifyframework.auth.AuthException
+import java.net.UnknownHostException
 
 /**
  * Exception that is passed to the errorContent if the application does not have the auth plugin
@@ -36,3 +37,13 @@ class InvalidConfigurationException(message: String, cause: Exception?) : AuthEx
     recoverySuggestion = "Check that the configuration passed to Amplify.configure has all required fields",
     cause = cause
 )
+
+internal fun Throwable.isConnectivityIssue(): Boolean {
+    if (this is UnknownHostException) {
+        return true
+    }
+    return when (val cause = this.cause) {
+        null -> false
+        else -> cause.isConnectivityIssue()
+    }
+}

authenticator/src/test/java/com/amplifyframework/ui/authenticator/AuthenticatorMatchers.kt

@@ -15,6 +15,7 @@
 
 package com.amplifyframework.ui.authenticator
 
+import app.cash.turbine.test
 import com.amplifyframework.ui.authenticator.util.AuthenticatorMessage
 import io.kotest.matchers.Matcher
 import io.kotest.matchers.MatcherResult
@@ -45,3 +46,12 @@ fun AuthenticatorMessage?.shouldBeError(
     causeMessage?.let { casted should haveMessage(it) }
     recoverySuggestion?.let { casted should haveRecoverySuggestion(it) }
 }
+
+internal suspend inline fun <reified T : AuthenticatorMessage> AuthenticatorViewModel.shouldEmitMessage(
+    crossinline block: suspend () -> Unit
+) {
+    events.test {
+        block()
+        awaitItem().shouldBeInstanceOf<T>()
+    }
+}

authenticator/src/test/java/com/amplifyframework/ui/authenticator/AuthenticatorViewModelTest.kt

@@ -16,21 +16,27 @@
 package com.amplifyframework.ui.authenticator
 
 import android.app.Application
+import aws.smithy.kotlin.runtime.http.HttpException
 import com.amplifyframework.auth.AuthUserAttributeKey.email
 import com.amplifyframework.auth.AuthUserAttributeKey.emailVerified
 import com.amplifyframework.auth.MFAType
+import com.amplifyframework.auth.exceptions.UnknownException
 import com.amplifyframework.auth.result.step.AuthSignInStep
 import com.amplifyframework.ui.authenticator.auth.VerificationMechanism
 import com.amplifyframework.ui.authenticator.enums.AuthenticatorStep
 import com.amplifyframework.ui.authenticator.util.AmplifyResult
+import com.amplifyframework.ui.authenticator.util.AmplifyResult.Error
 import com.amplifyframework.ui.authenticator.util.AmplifyResult.Success
 import com.amplifyframework.ui.authenticator.util.AuthConfigurationResult
 import com.amplifyframework.ui.authenticator.util.AuthProvider
+import com.amplifyframework.ui.authenticator.util.NetworkErrorMessage
 import com.amplifyframework.ui.testing.CoroutineTestRule
 import io.kotest.matchers.shouldBe
 import io.mockk.coEvery
 import io.mockk.coVerify
+import io.mockk.every
 import io.mockk.mockk
+import java.net.UnknownHostException
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runTest
@@ -323,6 +329,29 @@ class AuthenticatorViewModelTest {
         viewModel.currentStep shouldBe AuthenticatorStep.SignedIn
     }
 
+    @Test
+    fun `signing in with no internet results in network error message`() = runTest {
+        coEvery { authProvider.fetchAuthSession() } returns Success(mockAuthSession(isSignedIn = false))
+        coEvery { authProvider.signIn(any(), any()) } returns
+            Error(
+                mockk<UnknownException> {
+                    every { cause } returns
+                        mockk<HttpException> {
+                            every { cause } returns mockk<UnknownHostException>()
+                        }
+                }
+            )
+
+        viewModel.start(mockAuthenticatorConfiguration())
+
+        viewModel.shouldEmitMessage<NetworkErrorMessage> {
+            viewModel.signIn("username", "password")
+        }
+
+        // Assert step does not change
+        viewModel.currentStep shouldBe AuthenticatorStep.SignIn
+    }
+
 //endregion
 //region helpers
     private val AuthenticatorViewModel.currentStep: AuthenticatorStep