-
Notifications
You must be signed in to change notification settings - Fork 278
Feature: identity reset #3298
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Feature: identity reset #3298
Changes from 13 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
4ab0b10
Initial implementation of the reset identity feature
jmartinesp ee7a31c
Extract OIDC to its own module
jmartinesp abb9959
Use extracted OIDC flow to display the reset identity screen
jmartinesp 175bada
Improve existing APIs
jmartinesp 7fd0ad0
Improve APIs, add tests
jmartinesp 5239e5c
Fix lint issues
jmartinesp ae18efd
Fix `OidcView` preview
jmartinesp 300df0c
Update screenshots
c02f013
Fix vertical position for the primary button in `VerifySelfSessionView`
jmartinesp 5e3e127
Fix Konsist failures
jmartinesp d40f5bd
Update screenshots
f41e42d
Remove unused import
jmartinesp d5eb71a
Add an extra test
jmartinesp 8a1e333
Fix most review comments
jmartinesp 99efdb6
Update screenshots
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
74 changes: 74 additions & 0 deletions
74
...in/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowManager.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
/* | ||
* Copyright (c) 2024 New Vector Ltd | ||
* | ||
* 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 | ||
* | ||
* https://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 io.element.android.features.securebackup.impl.reset | ||
|
||
import io.element.android.libraries.architecture.AsyncData | ||
import io.element.android.libraries.di.annotations.SessionCoroutineScope | ||
import io.element.android.libraries.matrix.api.MatrixClient | ||
import io.element.android.libraries.matrix.api.encryption.IdentityResetHandle | ||
import io.element.android.libraries.matrix.api.verification.SessionVerificationService | ||
import io.element.android.libraries.matrix.api.verification.SessionVerifiedStatus | ||
import kotlinx.coroutines.CoroutineScope | ||
import kotlinx.coroutines.flow.MutableStateFlow | ||
import kotlinx.coroutines.flow.StateFlow | ||
import kotlinx.coroutines.flow.filterIsInstance | ||
import kotlinx.coroutines.flow.first | ||
import kotlinx.coroutines.launch | ||
import javax.inject.Inject | ||
|
||
class ResetIdentityFlowManager @Inject constructor( | ||
private val matrixClient: MatrixClient, | ||
@SessionCoroutineScope private val sessionCoroutineScope: CoroutineScope, | ||
private val sessionVerificationService: SessionVerificationService, | ||
) { | ||
private val resetHandleFlow: MutableStateFlow<AsyncData<IdentityResetHandle>> = MutableStateFlow(AsyncData.Uninitialized) | ||
val currentHandleFlow: StateFlow<AsyncData<IdentityResetHandle>> = resetHandleFlow | ||
|
||
fun whenResetIsDone(block: () -> Unit) { | ||
sessionCoroutineScope.launch { | ||
sessionVerificationService.sessionVerifiedStatus.filterIsInstance<SessionVerifiedStatus.Verified>().first() | ||
block() | ||
} | ||
} | ||
|
||
fun getResetHandle(): StateFlow<AsyncData<IdentityResetHandle>> { | ||
return if (resetHandleFlow.value.isLoading() || resetHandleFlow.value.isSuccess()) { | ||
resetHandleFlow | ||
} else { | ||
resetHandleFlow.value = AsyncData.Loading() | ||
|
||
sessionCoroutineScope.launch { | ||
matrixClient.encryptionService().startIdentityReset() | ||
.onSuccess { handle -> | ||
resetHandleFlow.value = if (handle != null) { | ||
AsyncData.Success(handle) | ||
} else { | ||
AsyncData.Failure(IllegalStateException("Could not get a reset identity handle")) | ||
} | ||
} | ||
.onFailure { resetHandleFlow.value = AsyncData.Failure(it) } | ||
} | ||
|
||
resetHandleFlow | ||
} | ||
} | ||
|
||
suspend fun cancel() { | ||
currentHandleFlow.value.dataOrNull()?.cancel() | ||
resetHandleFlow.value = AsyncData.Uninitialized | ||
} | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need to cancel this job if the user click go back instead of going to the end of the flow (or use the presenter / node scope)