Add support for different login methods (#762)

This commit is contained in:
Shannon Draeker
2024-06-20 17:08:07 +01:00
committed by Álison Fernandes
parent c977f7617a
commit 410e3072fa
8 changed files with 167 additions and 21 deletions
@@ -2,6 +2,7 @@ package com.x8bit.bitwarden.data.auth.datasource.network.service
import com.x8bit.bitwarden.data.auth.datasource.network.api.IdentityApi
import com.x8bit.bitwarden.data.auth.datasource.network.model.GetTokenResponseJson
import com.x8bit.bitwarden.data.auth.datasource.network.model.IdentityTokenAuthModel
import com.x8bit.bitwarden.data.auth.datasource.network.model.KdfTypeJson
import com.x8bit.bitwarden.data.auth.datasource.network.model.KeyConnectorUserDecryptionOptionsJson
import com.x8bit.bitwarden.data.auth.datasource.network.model.MasterPasswordPolicyOptionsJson
@@ -40,7 +41,10 @@ class IdentityServiceTest : BaseServiceTest() {
server.enqueue(MockResponse().setBody(LOGIN_SUCCESS_JSON))
val result = identityService.getToken(
email = EMAIL,
passwordHash = PASSWORD_HASH,
authModel = IdentityTokenAuthModel.MasterPassword(
username = EMAIL,
password = PASSWORD_HASH,
),
captchaToken = null,
uniqueAppId = UNIQUE_APP_ID,
)
@@ -52,7 +56,10 @@ class IdentityServiceTest : BaseServiceTest() {
server.enqueue(MockResponse().setResponseCode(500))
val result = identityService.getToken(
email = EMAIL,
passwordHash = PASSWORD_HASH,
authModel = IdentityTokenAuthModel.MasterPassword(
username = EMAIL,
password = PASSWORD_HASH,
),
captchaToken = null,
uniqueAppId = UNIQUE_APP_ID,
)
@@ -64,7 +71,10 @@ class IdentityServiceTest : BaseServiceTest() {
server.enqueue(MockResponse().setResponseCode(400).setBody(CAPTCHA_BODY_JSON))
val result = identityService.getToken(
email = EMAIL,
passwordHash = PASSWORD_HASH,
authModel = IdentityTokenAuthModel.MasterPassword(
username = EMAIL,
password = PASSWORD_HASH,
),
captchaToken = null,
uniqueAppId = UNIQUE_APP_ID,
)
@@ -76,7 +86,10 @@ class IdentityServiceTest : BaseServiceTest() {
server.enqueue(MockResponse().setResponseCode(400).setBody(INVALID_LOGIN_JSON))
val result = identityService.getToken(
email = EMAIL,
passwordHash = PASSWORD_HASH,
authModel = IdentityTokenAuthModel.MasterPassword(
username = EMAIL,
password = PASSWORD_HASH,
),
captchaToken = null,
uniqueAppId = UNIQUE_APP_ID,
)
@@ -11,6 +11,7 @@ import com.x8bit.bitwarden.data.auth.datasource.disk.model.UserStateJson
import com.x8bit.bitwarden.data.auth.datasource.disk.util.FakeAuthDiskSource
import com.x8bit.bitwarden.data.auth.datasource.network.model.AuthRequestsResponseJson
import com.x8bit.bitwarden.data.auth.datasource.network.model.GetTokenResponseJson
import com.x8bit.bitwarden.data.auth.datasource.network.model.IdentityTokenAuthModel
import com.x8bit.bitwarden.data.auth.datasource.network.model.KdfTypeJson
import com.x8bit.bitwarden.data.auth.datasource.network.model.PasswordHintResponseJson
import com.x8bit.bitwarden.data.auth.datasource.network.model.PreLoginResponseJson
@@ -444,7 +445,10 @@ class AuthRepositoryTest {
coEvery {
identityService.getToken(
email = EMAIL,
passwordHash = PASSWORD_HASH,
authModel = IdentityTokenAuthModel.MasterPassword(
username = EMAIL,
password = PASSWORD_HASH,
),
captchaToken = null,
uniqueAppId = UNIQUE_APP_ID,
)
@@ -457,7 +461,10 @@ class AuthRepositoryTest {
coVerify {
identityService.getToken(
email = EMAIL,
passwordHash = PASSWORD_HASH,
authModel = IdentityTokenAuthModel.MasterPassword(
username = EMAIL,
password = PASSWORD_HASH,
),
captchaToken = null,
uniqueAppId = UNIQUE_APP_ID,
)
@@ -472,7 +479,10 @@ class AuthRepositoryTest {
coEvery {
identityService.getToken(
email = EMAIL,
passwordHash = PASSWORD_HASH,
authModel = IdentityTokenAuthModel.MasterPassword(
username = EMAIL,
password = PASSWORD_HASH,
),
captchaToken = null,
uniqueAppId = UNIQUE_APP_ID,
)
@@ -491,7 +501,10 @@ class AuthRepositoryTest {
coVerify {
identityService.getToken(
email = EMAIL,
passwordHash = PASSWORD_HASH,
authModel = IdentityTokenAuthModel.MasterPassword(
username = EMAIL,
password = PASSWORD_HASH,
),
captchaToken = null,
uniqueAppId = UNIQUE_APP_ID,
)
@@ -509,7 +522,10 @@ class AuthRepositoryTest {
coEvery {
identityService.getToken(
email = EMAIL,
passwordHash = PASSWORD_HASH,
authModel = IdentityTokenAuthModel.MasterPassword(
username = EMAIL,
password = PASSWORD_HASH,
),
captchaToken = null,
uniqueAppId = UNIQUE_APP_ID,
)
@@ -548,7 +564,10 @@ class AuthRepositoryTest {
coVerify {
identityService.getToken(
email = EMAIL,
passwordHash = PASSWORD_HASH,
authModel = IdentityTokenAuthModel.MasterPassword(
username = EMAIL,
password = PASSWORD_HASH,
),
captchaToken = null,
uniqueAppId = UNIQUE_APP_ID,
)
@@ -587,7 +606,10 @@ class AuthRepositoryTest {
coEvery {
identityService.getToken(
email = EMAIL,
passwordHash = PASSWORD_HASH,
authModel = IdentityTokenAuthModel.MasterPassword(
username = EMAIL,
password = PASSWORD_HASH,
),
captchaToken = null,
uniqueAppId = UNIQUE_APP_ID,
)
@@ -628,7 +650,10 @@ class AuthRepositoryTest {
coVerify {
identityService.getToken(
email = EMAIL,
passwordHash = PASSWORD_HASH,
authModel = IdentityTokenAuthModel.MasterPassword(
username = EMAIL,
password = PASSWORD_HASH,
),
captchaToken = null,
uniqueAppId = UNIQUE_APP_ID,
)
@@ -658,7 +683,10 @@ class AuthRepositoryTest {
coEvery {
identityService.getToken(
email = EMAIL,
passwordHash = PASSWORD_HASH,
authModel = IdentityTokenAuthModel.MasterPassword(
username = EMAIL,
password = PASSWORD_HASH,
),
captchaToken = null,
uniqueAppId = UNIQUE_APP_ID,
)
@@ -671,7 +699,10 @@ class AuthRepositoryTest {
coVerify {
identityService.getToken(
email = EMAIL,
passwordHash = PASSWORD_HASH,
authModel = IdentityTokenAuthModel.MasterPassword(
username = EMAIL,
password = PASSWORD_HASH,
),
captchaToken = null,
uniqueAppId = UNIQUE_APP_ID,
)