Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d474398 authored by Jonathan Klee's avatar Jonathan Klee
Browse files

refactor: rename CompleteMicrogLoginUseCase to InitialMicrogLoginUseCase 

to be consistent with others inital*UseCases
parent 41ca5908

app/src/main/java/foundation/e/apps/domain/login/CompleteMicrogLoginUseCase.kt→app/src/main/java/foundation/e/apps/domain/login/InitialMicrogLoginUseCase.kt

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ import foundation.e.apps.data.login.repository.AuthenticatorRepository 
import foundation.e.apps.data.login.state.LoginCoordinator

import javax.inject.Inject



class CompleteMicrogLoginUseCase @Inject constructor(

class InitialMicrogLoginUseCase @Inject constructor(

    private val stores: Stores,

    private val loginCoordinator: LoginCoordinator,

    private val authenticatorRepository: AuthenticatorRepository

app/src/main/java/foundation/e/apps/ui/LoginViewModel.kt

+3 −3
Original line number Diff line number Diff line
@@ -28,11 +28,11 @@ import foundation.e.apps.R 
import foundation.e.apps.data.login.core.AuthObject

import foundation.e.apps.data.login.core.StoreType

import foundation.e.apps.data.login.microg.MicrogLoginManager

import foundation.e.apps.domain.login.CompleteMicrogLoginUseCase

import foundation.e.apps.domain.login.FetchMicrogAccountUseCase

import foundation.e.apps.domain.login.HasMicrogAccountUseCase

import foundation.e.apps.domain.login.InitialAnonymousLoginUseCase

import foundation.e.apps.domain.login.InitialGoogleLoginUseCase

import foundation.e.apps.domain.login.InitialMicrogLoginUseCase

import foundation.e.apps.domain.login.InitialNoGoogleLoginUseCase

import foundation.e.apps.domain.login.LogoutUseCase

import foundation.e.apps.domain.login.StartLoginFlowUseCase
@@ -51,7 +51,7 @@ class LoginViewModel @Inject constructor( 
    private val startLoginFlowUseCase: StartLoginFlowUseCase,

    private val hasMicrogAccountUseCase: HasMicrogAccountUseCase,

    private val fetchMicrogAccountUseCase: FetchMicrogAccountUseCase,

    private val completeMicrogLoginUseCase: CompleteMicrogLoginUseCase,

    private val initialMicrogLoginUseCase: InitialMicrogLoginUseCase,

    private val initialAnonymousLoginUseCase: InitialAnonymousLoginUseCase,

    private val initialGoogleLoginUseCase: InitialGoogleLoginUseCase,

    private val initialNoGoogleLoginUseCase: InitialNoGoogleLoginUseCase,
@@ -98,7 +98,7 @@ class LoginViewModel @Inject constructor( 
            }.onSuccess { result ->

                when (result) {

                    is MicrogLoginManager.FetchResult.Success -> {

                        completeMicrogLoginUseCase(result.microgAccount)

                        initialMicrogLoginUseCase(result.microgAccount)

                        onUserSaved()

                        startLoginFlow()

                    }

app/src/test/java/foundation/e/apps/domain/login/CompleteMicrogLoginUseCaseTest.kt→app/src/test/java/foundation/e/apps/domain/login/InitialMicrogLoginUseCaseTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -18,12 +18,12 @@ import org.robolectric.annotation.Config 


@RunWith(RobolectricTestRunner::class)

@Config(sdk = [30])

class CompleteMicrogLoginUseCaseTest {

class InitialMicrogLoginUseCaseTest {



    private val stores: Stores = mockk(relaxed = true)

    private val loginCoordinator: LoginCoordinator = mockk(relaxed = true)

    private val authenticatorRepository: AuthenticatorRepository = mockk(relaxed = true)

    private val useCase = CompleteMicrogLoginUseCase(stores, loginCoordinator, authenticatorRepository)

    private val useCase = InitialMicrogLoginUseCase(stores, loginCoordinator, authenticatorRepository)



    @Test

    fun invoke_updatesStoreAndCredentials() = runTest {

app/src/test/java/foundation/e/apps/login/LoginViewModelTest.kt

+7 −8
Original line number Diff line number Diff line
@@ -29,11 +29,11 @@ import foundation.e.apps.data.enums.User 
import foundation.e.apps.data.login.core.AuthObject

import foundation.e.apps.data.login.microg.MicrogAccount

import foundation.e.apps.data.login.microg.MicrogLoginManager

import foundation.e.apps.domain.login.CompleteMicrogLoginUseCase

import foundation.e.apps.domain.login.FetchMicrogAccountUseCase

import foundation.e.apps.domain.login.HasMicrogAccountUseCase

import foundation.e.apps.domain.login.InitialAnonymousLoginUseCase

import foundation.e.apps.domain.login.InitialGoogleLoginUseCase

import foundation.e.apps.domain.login.InitialMicrogLoginUseCase

import foundation.e.apps.domain.login.InitialNoGoogleLoginUseCase

import foundation.e.apps.domain.login.LogoutUseCase

import foundation.e.apps.domain.login.StartLoginFlowUseCase
@@ -66,7 +66,7 @@ class LoginViewModelTest { 
    @Mock

    private lateinit var fetchMicrogAccountUseCase: FetchMicrogAccountUseCase

    @Mock

    private lateinit var completeMicrogLoginUseCase: CompleteMicrogLoginUseCase

    private lateinit var initialMicrogLoginUseCase: InitialMicrogLoginUseCase

    @Mock

    private lateinit var initialAnonymousLoginUseCase: InitialAnonymousLoginUseCase

    @Mock
@@ -94,7 +94,7 @@ class LoginViewModelTest { 
            startLoginFlowUseCase,

            hasMicrogAccountUseCase,

            fetchMicrogAccountUseCase,

            completeMicrogLoginUseCase,

            initialMicrogLoginUseCase,

            initialAnonymousLoginUseCase,

            initialGoogleLoginUseCase,

            initialNoGoogleLoginUseCase,
@@ -135,8 +135,7 @@ class LoginViewModelTest { 
        val microgAccount = MicrogAccount(account, "token")

        val result = MicrogLoginManager.FetchResult.Success(microgAccount)



        whenever(fetchMicrogAccountUseCase.invoke("user@gmail.com")).thenReturn(result)

        whenever(completeMicrogLoginUseCase.invoke(microgAccount)).thenReturn(Unit)

        whenever(initialMicrogLoginUseCase.invoke(microgAccount)).thenReturn(Unit)

        whenever(startLoginFlowUseCase.invoke(any())).thenReturn(emptyList())



        var onErrorCalls = 0
@@ -149,7 +148,7 @@ class LoginViewModelTest { 
            onIntentRequired = { onIntentCalls += 1 }

        )



        verify(completeMicrogLoginUseCase).invoke(microgAccount)

        verify(initialMicrogLoginUseCase).invoke(microgAccount)

        verify(startLoginFlowUseCase).invoke(any())

        assert(onErrorCalls == 0)

        assert(onIntentCalls == 0)
@@ -177,7 +176,7 @@ class LoginViewModelTest { 


        assert(onIntentCalls == 1)

        assert(receivedIntent === intent)

        verify(completeMicrogLoginUseCase, never()).invoke(any())

        verify(initialMicrogLoginUseCase, never()).invoke(any())

    }



    @Test
@@ -195,6 +194,6 @@ class LoginViewModelTest { 
        )



        assert(errorMessage == "boom")

        verify(completeMicrogLoginUseCase, never()).invoke(any())

        verify(initialMicrogLoginUseCase, never()).invoke(any())

    }

}