mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-03-15 18:58:59 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add the setPassword API (#1110)

Browse source
This commit is contained in:
David Perez 2024-03-07 14:58:09 -06:00 • committed by Álison Fernandes
parent f0a988c010
commit 932bc3957f
5 changed files with 91 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/api/AuthenticatedAccountsApi.kt
View file

@ -2,8 +2,10 @@ package com.x8bit.bitwarden.data.auth.datasource.network.api
import com.x8bit.bitwarden.data.auth.datasource.network.model.DeleteAccountRequestJson
import com.x8bit.bitwarden.data.auth.datasource.network.model.ResetPasswordRequestJson
import com.x8bit.bitwarden.data.auth.datasource.network.model.SetPasswordRequestJson
import retrofit2.http.Body
import retrofit2.http.HTTP
import retrofit2.http.POST
/**
* Defines raw calls under the /accounts API with authentication applied.
@ -26,4 +28,10 @@ interface AuthenticatedAccountsApi {
*/
@HTTP(method = "POST", path = "/accounts/password", hasBody = true)
suspend fun resetPassword(@Body body: ResetPasswordRequestJson): Result<Unit>
/**
* Sets the password.
*/
@POST("/accounts/set-password")
suspend fun setPassword(@Body body: SetPasswordRequestJson): Result<Unit>
}

48
app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/model/SetPasswordRequestJson.kt Normal file
View file

@ -0,0 +1,48 @@
package com.x8bit.bitwarden.data.auth.datasource.network.model
import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterRequestJson.Keys
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
/**
* Request body for resetting the password.
*
* @property kdfType The KDF type.
* @property kdfIterations The number of iterations when calculating a user's password.
* @property kdfMemory The amount of memory to use when calculating a password hash (MB).
* @property kdfParallelism The number of threads to use when calculating a password hash.
* @param key The user key for the request (encrypted).
* @param keys A [Keys] object containing public and private keys.
* @param organizationIdentifier The SSO organization identifier.
* @param passwordHash The hash of the user's new password.
* @param passwordHint The hint for the master password (nullable).
*/
@Serializable
data class SetPasswordRequestJson(
@SerialName("kdf")
val kdfType: KdfTypeJson? = null,
@SerialName("kdfIterations")
val kdfIterations: Int? = null,
@SerialName("kdfMemory")
val kdfMemory: Int? = null,
@SerialName("kdfParallelism")
val kdfParallelism: Int? = null,
@SerialName("key")
val key: String,
@SerialName("keys")
val keys: Keys,
@SerialName("orgIdentifier")
val organizationIdentifier: String,
@SerialName("masterPasswordHash")
val passwordHash: String?,
@SerialName("masterPasswordHint")
val passwordHint: String?,
)

6
app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AccountsService.kt
View file

@ -6,6 +6,7 @@ import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterRequestJso
import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterResponseJson
import com.x8bit.bitwarden.data.auth.datasource.network.model.ResendEmailRequestJson
import com.x8bit.bitwarden.data.auth.datasource.network.model.ResetPasswordRequestJson
import com.x8bit.bitwarden.data.auth.datasource.network.model.SetPasswordRequestJson
/**
* Provides an API for querying accounts endpoints.
@ -41,4 +42,9 @@ interface AccountsService {
* Reset the password.
*/
suspend fun resetPassword(body: ResetPasswordRequestJson): Result<Unit>
/**
* Set the password.
*/
suspend fun setPassword(body: SetPasswordRequestJson): Result<Unit>
}

5
app/src/main/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AccountsServiceImpl.kt
View file

@ -11,6 +11,7 @@ import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterRequestJso
import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterResponseJson
import com.x8bit.bitwarden.data.auth.datasource.network.model.ResendEmailRequestJson
import com.x8bit.bitwarden.data.auth.datasource.network.model.ResetPasswordRequestJson
import com.x8bit.bitwarden.data.auth.datasource.network.model.SetPasswordRequestJson
import com.x8bit.bitwarden.data.platform.datasource.network.model.toBitwardenError
import com.x8bit.bitwarden.data.platform.datasource.network.util.parseErrorBodyOrNull
import kotlinx.serialization.json.Json
@ -71,4 +72,8 @@ class AccountsServiceImpl(
authenticatedAccountsApi.resetPassword(body = body)
}
}
override suspend fun setPassword(
body: SetPasswordRequestJson,
): Result<Unit> = authenticatedAccountsApi.setPassword(body)
}

24
app/src/test/java/com/x8bit/bitwarden/data/auth/datasource/network/service/AccountsServiceTest.kt
View file

@ -9,6 +9,7 @@ import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterRequestJso
import com.x8bit.bitwarden.data.auth.datasource.network.model.RegisterResponseJson
import com.x8bit.bitwarden.data.auth.datasource.network.model.ResendEmailRequestJson
import com.x8bit.bitwarden.data.auth.datasource.network.model.ResetPasswordRequestJson
import com.x8bit.bitwarden.data.auth.datasource.network.model.SetPasswordRequestJson
import com.x8bit.bitwarden.data.platform.base.BaseServiceTest
import kotlinx.coroutines.test.runTest
import kotlinx.serialization.json.Json
@ -258,6 +259,29 @@ class AccountsServiceTest : BaseServiceTest() {
assertTrue(result.isSuccess)
}
@Test
fun `setPassword with empty response is success`() = runTest {
val response = MockResponse().setBody("")
server.enqueue(response)
val result = service.setPassword(
body = SetPasswordRequestJson(
passwordHash = "passwordHash",
passwordHint = "passwordHint",
organizationIdentifier = "organizationId",
kdfIterations = 7,
kdfMemory = 1,
kdfParallelism = 2,
kdfType = null,
key = "encryptedUserKey",
keys = RegisterRequestJson.Keys(
publicKey = "public",
encryptedPrivateKey = "private",
),
),
)
assertTrue(result.isSuccess)
}
companion object {
private const val EMAIL = "email"
private val registerRequestBody = RegisterRequestJson(