ProtonMail
/
protoncore_android
mirror of https://github.com/ProtonMail/protoncore_android
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(auth): Fallback to Device ChallengeFrame if no details frames exists.

This commit is contained in:
Neil Marietta 2024-04-19 18:27:40 +02:00 committed by MargeBot
parent e6c8739c8e
commit 6ec99275e5
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auth/data/build.gradle.kts
View File

@ -29,7 +29,7 @@ protonBuild {
}
protonCoverage {
branchCoveragePercentage.set(58)
branchCoveragePercentage.set(56)
lineCoveragePercentage.set(56)
}

7
auth/data/src/main/kotlin/me/proton/core/auth/data/repository/AuthRepositoryImpl.kt
View File

@ -43,7 +43,6 @@ import me.proton.core.challenge.domain.entity.ChallengeFrameDetails
import me.proton.core.challenge.domain.framePrefix
import me.proton.core.crypto.common.srp.SrpProofs
import me.proton.core.domain.entity.Product
import me.proton.core.domain.entity.UserId
import me.proton.core.network.data.ApiProvider
import me.proton.core.network.data.protonApi.isSuccess
import me.proton.core.network.domain.ApiResult
@ -51,7 +50,6 @@ import me.proton.core.network.domain.TimeoutOverride
import me.proton.core.network.domain.session.Session
import me.proton.core.network.domain.session.SessionId
import me.proton.core.util.kotlin.coroutine.result
import java.util.UUID
class AuthRepositoryImpl(
private val provider: ApiProvider,
@ -125,7 +123,10 @@ class AuthRepositoryImpl(
private suspend fun getFrameMap(frames: List<ChallengeFrameDetails>): Map<String, ChallengeFrame?> {
val name = "${product.framePrefix()}-0"
val frame = ChallengeFrame.Username.from(context, frames.getOrNull(0))
val frame = when {
frames.isEmpty() -> ChallengeFrame.Device.build(context)
else -> ChallengeFrame.Username.from(context, frames[0])
}
return mapOf(name to frame)
}

5
auth/data/src/test/kotlin/me/proton/core/auth/data/repository/AuthRepositoryImplTest.kt
View File

@ -22,6 +22,7 @@ import android.content.Context
import io.mockk.coEvery
import io.mockk.every
import io.mockk.mockk
import io.mockk.mockkObject
import io.mockk.slot
import kotlinx.coroutines.test.runTest
import me.proton.core.auth.data.api.AuthenticationApi
@ -32,6 +33,7 @@ import me.proton.core.auth.domain.entity.SecondFactorProof
import me.proton.core.auth.domain.entity.SessionInfo
import me.proton.core.auth.domain.exception.InvalidServerAuthenticationException
import me.proton.core.auth.domain.usecase.ValidateServerProof
import me.proton.core.challenge.data.frame.ChallengeFrame
import me.proton.core.challenge.domain.entity.ChallengeFrameDetails
import me.proton.core.crypto.common.srp.SrpProofs
import me.proton.core.domain.entity.Product
@ -97,6 +99,9 @@ class AuthRepositoryImplTest {
// endregion
@Before
fun beforeEveryTest() {
mockkObject(ChallengeFrame.Device.Companion)
coEvery { ChallengeFrame.Device.build(any()) } returns mockk()
// GIVEN
coEvery { sessionProvider.getSessionId(any()) } returns testSessionId
apiProvider = ApiProvider(apiManagerFactory, sessionProvider, testDispatcherProvider)