Make sure device finalization succeeds before proceeding to postAuth

Author: Grisha Kruglov

components/service/firefox-accounts/src/main/java/mozilla/components/service/fxa/manager/FxaAccountManager.kt

@@ -598,7 +598,7 @@ open class FxaAccountManager(
             }
             AccountState.NotAuthenticated -> {
                 when (via) {
-                    Event.Logout -> {
+                    Event.FailedToAuthenticate, Event.Logout -> {
                         // Clean up internal account state and destroy the current FxA device record.
                         if (account.disconnectAsync().await()) {
                             logger.info("Disconnected FxA account")
@@ -619,7 +619,9 @@ open class FxaAccountManager(
                         // Re-initialize account.
                         account = createAccount(serverConfig)
 
-                        notifyObservers { onLoggedOut() }
+                        if (via is Event.Logout) {
+                            notifyObservers { onLoggedOut() }
+                        }
 
                         null
                     }
@@ -743,13 +745,14 @@ open class FxaAccountManager(
 
                         logger.info("Initializing device")
                         // NB: underlying API is expected to 'ensureCapabilities' as part of device initialization.
-                        account.deviceConstellation().initDeviceAsync(
+                        if (account.deviceConstellation().initDeviceAsync(
                             deviceConfig.name, deviceConfig.type, deviceConfig.capabilities
-                        ).await()
-
-                        postAuthenticated(via.authData.authType, via.authData.declinedEngines)
-
-                        Event.FetchProfile
+                        ).await()) {
+                            postAuthenticated(via.authData.authType, via.authData.declinedEngines)
+                            Event.FetchProfile
+                        } else {
+                            Event.FailedToAuthenticate
+                        }
                     }
                     Event.AccountRestored -> {
                         logger.info("Registering persistence callback")
@@ -778,7 +781,7 @@ open class FxaAccountManager(
                         logger.info("Registering device constellation observer")
                         account.deviceConstellation().register(accountEventsIntegration)
 
-                        if (via.reuseAccount) {
+                        val deviceFinalizeSuccess = if (via.reuseAccount) {
                             logger.info("Configuring migrated account's device")
                             // At the minimum, we need to "ensure capabilities" - that is, register for Send Tab, etc.
                             account.deviceConstellation().ensureCapabilitiesAsync(deviceConfig.capabilities).await()
@@ -792,9 +795,12 @@ open class FxaAccountManager(
                             ).await()
                         }
 
-                        postAuthenticated(AuthType.Shared)
-
-                        Event.FetchProfile
+                        if (deviceFinalizeSuccess) {
+                            postAuthenticated(AuthType.Shared)
+                            Event.FetchProfile
+                        } else {
+                            Event.FailedToAuthenticate
+                        }
                     }
 
                     Event.RecoveredFromAuthenticationProblem -> {

components/service/firefox-accounts/src/main/java/mozilla/components/service/fxa/manager/State.kt

@@ -151,6 +151,7 @@ internal object FxaStateMatrix {
                 Event.FetchProfile -> AccountState.AuthenticatedNoProfile
                 Event.FetchedProfile -> AccountState.AuthenticatedWithProfile
                 Event.FailedToFetchProfile -> AccountState.AuthenticatedNoProfile
+                Event.FailedToAuthenticate -> AccountState.NotAuthenticated
                 Event.Logout -> AccountState.NotAuthenticated
                 else -> null
             }

components/service/firefox-accounts/src/test/java/mozilla/components/service/fxa/FxaAccountManagerTest.kt

@@ -1304,11 +1304,12 @@ class FxaAccountManagerTest {
 
         assertNull(manager.authenticatedAccount())
         assertNull(manager.accountProfile())
+        verify(accountStorage, times(1)).clear()
 
         assertTrue(manager.finishAuthenticationAsync(FxaAuthData(AuthType.Signin, "dummyCode", EXPECTED_AUTH_STATE)).await())
 
         verify(accountStorage, times(1)).read()
-        verify(accountStorage, never()).clear()
+        verify(accountStorage, times(1)).clear()
 
         verify(accountObserver, times(1)).onAuthenticated(mockAccount, AuthType.Signin)
         verify(accountObserver, times(1)).onProfileUpdated(profile)
@@ -1350,11 +1351,12 @@ class FxaAccountManagerTest {
 
         assertNull(manager.authenticatedAccount())
         assertNull(manager.accountProfile())
+        verify(accountStorage, times(1)).clear()
 
         assertTrue(manager.finishAuthenticationAsync(FxaAuthData(AuthType.Signin, "dummyCode", EXPECTED_AUTH_STATE)).await())
 
         verify(accountStorage, times(1)).read()
-        verify(accountStorage, never()).clear()
+        verify(accountStorage, times(1)).clear()
 
         verify(accountObserver, times(1)).onAuthenticated(mockAccount, AuthType.Signin)
         verify(accountObserver, times(1)).onProfileUpdated(profile)
@@ -1930,6 +1932,7 @@ class FxaAccountManagerTest {
     ): FxaAccountManager {
         `when`(mockAccount.getProfileAsync(ignoreCache = false)).thenReturn(CompletableDeferred(profile))
 
+        `when`(mockAccount.disconnectAsync()).thenReturn(CompletableDeferred(true))
         `when`(mockAccount.beginOAuthFlowAsync(any())).thenReturn(CompletableDeferred(value = null))
         `when`(mockAccount.beginPairingFlowAsync(anyString(), any())).thenReturn(CompletableDeferred(value = null))
         `when`(mockAccount.completeOAuthFlowAsync(anyString(), anyString())).thenReturn(CompletableDeferred(true))

components/service/firefox-accounts/src/test/java/mozilla/components/service/fxa/manager/FxaStateMatrixTest.kt

@@ -68,7 +68,7 @@ class FxaStateMatrixTest {
         assertEquals(AccountState.AuthenticatedNoProfile, FxaStateMatrix.nextState(state, Event.FetchProfile))
         assertEquals(AccountState.AuthenticatedWithProfile, FxaStateMatrix.nextState(state, Event.FetchedProfile))
         assertEquals(AccountState.AuthenticatedNoProfile, FxaStateMatrix.nextState(state, Event.FailedToFetchProfile))
-        assertNull(FxaStateMatrix.nextState(state, Event.FailedToAuthenticate))
+        assertEquals(AccountState.NotAuthenticated, FxaStateMatrix.nextState(state, Event.FailedToAuthenticate))
         assertEquals(AccountState.NotAuthenticated, FxaStateMatrix.nextState(state, Event.Logout))
         assertEquals(AccountState.AuthenticationProblem, FxaStateMatrix.nextState(state, Event.AuthenticationError("test")))
         assertNull(FxaStateMatrix.nextState(state, Event.SignInShareableAccount(mock(), false)))