Skip to content
Snippets Groups Projects
Commit d2dc5398 authored by Taras's avatar Taras
Browse files

Add change password api

parent 8cc48497
No related branches found
No related tags found
No related merge requests found
......@@ -58,4 +58,7 @@ interface AccountService {
//Added for forgot password UIA stages
suspend fun resetPasswordStages(userInteractiveAuthInterceptor: UserInteractiveAuthInterceptor, logoutAllDevices: Boolean = true)
//Added for change email UIA stages
suspend fun changeEmailStages(userInteractiveAuthInterceptor: UserInteractiveAuthInterceptor)
}
......@@ -38,10 +38,14 @@ internal interface AccountAPI {
suspend fun deactivate(@Body params: DeactivateAccountParams)
//Added to handle change password uia stages
@POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/auth/password")
@POST(NetworkConstants.URI_API_PREFIX_PATH_V3 + "account/auth/password")
suspend fun changePasswordUIA(@Body params: AuthUIAParams)
//Added to handle forgot password uia stages
@POST(NetworkConstants.URI_API_PREFIX_PATH_R0 + "account/auth/recovery")
@POST(NetworkConstants.URI_API_PREFIX_PATH_V3 + "account/auth/recovery")
suspend fun resetPasswordUIA(@Body params: AuthUIAParams)
//Added to handle change email uia stages
@POST(NetworkConstants.URI_API_PREFIX_PATH_V3 + "account/auth/email")
suspend fun changeEmailUIA(@Body params: AuthUIAParams)
}
......@@ -50,4 +50,7 @@ internal abstract class AccountModule {
@Binds
abstract fun bindResetPasswordUIATask(task: DefaultResetPasswordUIATask): ResetPasswordUIATask
@Binds
abstract fun bindChangeEmailUIATask(task: DefaultChangeEmailUIATask): ChangeEmailUIATask
}
/*
* Copyright 2020 The Matrix.org Foundation C.I.C.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.matrix.android.sdk.internal.session.account
import org.matrix.android.sdk.api.auth.UIABaseAuth
import org.matrix.android.sdk.api.auth.UserInteractiveAuthInterceptor
import org.matrix.android.sdk.api.failure.Failure
import org.matrix.android.sdk.api.failure.toRegistrationFlowResponse
import org.matrix.android.sdk.api.session.uia.UiaResult
import org.matrix.android.sdk.internal.auth.registration.handleUIA
import org.matrix.android.sdk.internal.network.GlobalErrorReceiver
import org.matrix.android.sdk.internal.network.executeRequest
import org.matrix.android.sdk.internal.task.Task
import timber.log.Timber
import javax.inject.Inject
//Created for Circles
internal interface ChangeEmailUIATask : Task<ChangeEmailUIATask.Params, Unit> {
data class Params(
val userInteractiveAuthInterceptor: UserInteractiveAuthInterceptor,
val userAuthParam: UIABaseAuth? = null
)
}
//Created for Circles
internal class DefaultChangeEmailUIATask @Inject constructor(
private val accountAPI: AccountAPI,
private val globalErrorReceiver: GlobalErrorReceiver
) : ChangeEmailUIATask {
override suspend fun execute(params: ChangeEmailUIATask.Params) {
val changeEmailParams = AuthUIAParams.create(params.userAuthParam, false)
try {
executeRequest(globalErrorReceiver) {
accountAPI.changeEmailUIA(changeEmailParams)
}
} catch (throwable: Throwable) {
if (handleUIA(
failure = throwable,
interceptor = params.userInteractiveAuthInterceptor,
retryBlock = { authUpdate ->
execute(params.copy(userAuthParam = authUpdate))
}
) != UiaResult.SUCCESS
) {
Timber.d("## UIA: propagate failure")
throw throwable.toRegistrationFlowResponse()
?.let { Failure.RegistrationFlowError(it) }
?: throwable
}
}
}
}
......@@ -24,7 +24,8 @@ internal class DefaultAccountService @Inject constructor(
private val changePasswordTask: ChangePasswordTask,
private val deactivateAccountTask: DeactivateAccountTask,
private val changePasswordUIATask: ChangePasswordUIATask,
private val resetPasswordUIATask: DefaultResetPasswordUIATask
private val resetPasswordUIATask: DefaultResetPasswordUIATask,
private val changeEmailUIATask: DefaultChangeEmailUIATask
) : AccountService {
override suspend fun changePassword(password: String, newPassword: String, logoutAllDevices: Boolean) {
......@@ -44,4 +45,9 @@ internal class DefaultAccountService @Inject constructor(
override suspend fun resetPasswordStages(userInteractiveAuthInterceptor: UserInteractiveAuthInterceptor, logoutAllDevices: Boolean) {
resetPasswordUIATask.execute(ResetPasswordUIATask.Params(logoutAllDevices, userInteractiveAuthInterceptor))
}
//Added for password UIA stages
override suspend fun changeEmailStages(userInteractiveAuthInterceptor: UserInteractiveAuthInterceptor) {
changeEmailUIATask.execute(ChangeEmailUIATask.Params(userInteractiveAuthInterceptor))
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment