Skip to content

Commit

Permalink
Merge pull request #6094 from vector-im/feature/adm/ftue-avoid-resett…
Browse files Browse the repository at this point in the history
…ing-login-state

SDK - Avoid resetting login state when calling `AuthenticationService.getLoginFlow`
  • Loading branch information
bmarty authored Jun 2, 2022
2 parents e53c090 + 8e8d38c commit b6b487d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
1 change: 1 addition & 0 deletions changelog.d/6093.sdk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Allowing AuthenticationService.getLoginFlow to fail without resetting state from previously successful calls
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@ import org.matrix.android.sdk.api.session.Session
* This interface defines methods to authenticate or to create an account to a matrix server.
*/
interface AuthenticationService {

/**
* Request the supported login flows for this homeserver.
* This is the first method to call to be able to get a wizard to login or to create an account
* This is the first method to call to be able to get a wizard to login or to create an account.
* @param homeServerConnectionConfig contains the homeserver URL to login to, a wellKnown lookup will be attempted.
*/
suspend fun getLoginFlow(homeServerConnectionConfig: HomeServerConnectionConfig): LoginFlowResult

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,16 +130,7 @@ internal class DefaultAuthenticationService @Inject constructor(
?.trim { it == '/' }
}

/**
* This is the entry point of the authentication service.
* homeServerConnectionConfig contains a homeserver URL probably entered by the user, which can be a
* valid homeserver API url, the url of Element Web, or anything else.
*/
override suspend fun getLoginFlow(homeServerConnectionConfig: HomeServerConnectionConfig): LoginFlowResult {
pendingSessionData = null

pendingSessionStore.delete()

val result = runCatching {
getLoginFlowInternal(homeServerConnectionConfig)
}
Expand Down

0 comments on commit b6b487d

Please sign in to comment.