-
Notifications
You must be signed in to change notification settings - Fork 731
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5398 from vector-im/bugfix/eric/softlogout-ux-broken
Fixes broken SoftLogout UX for homeservers that support both Password and SSO
- Loading branch information
Showing
37 changed files
with
1,058 additions
and
150 deletions.
There are no files selected for viewing
This file contains 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 @@ | ||
| Adds LoginType to SessionParams to fix soft logout form not showing for SSO and Password type |
38 changes: 38 additions & 0 deletions
38
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/LoginType.kt
This file contains 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,38 @@ | ||
| /* | ||
| * Copyright (c) 2022 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.api.auth | ||
|
|
||
| enum class LoginType { | ||
| PASSWORD, | ||
| SSO, | ||
| UNSUPPORTED, | ||
| CUSTOM, | ||
| DIRECT, | ||
| UNKNOWN; | ||
|
|
||
| companion object { | ||
|
|
||
| fun fromName(name: String) = when (name) { | ||
| PASSWORD.name -> PASSWORD | ||
| SSO.name -> SSO | ||
| UNSUPPORTED.name -> UNSUPPORTED | ||
| CUSTOM.name -> CUSTOM | ||
| DIRECT.name -> DIRECT | ||
| else -> UNKNOWN | ||
| } | ||
| } | ||
| } |
This file contains 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 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 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 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
83 changes: 83 additions & 0 deletions
83
...ix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/SessionParamsCreator.kt
This file contains 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,83 @@ | ||
| /* | ||
| * Copyright (c) 2022 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.auth | ||
|
|
||
| import android.net.Uri | ||
| import org.matrix.android.sdk.api.auth.LoginType | ||
| import org.matrix.android.sdk.api.auth.data.Credentials | ||
| import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig | ||
| import org.matrix.android.sdk.api.auth.data.SessionParams | ||
| import org.matrix.android.sdk.api.extensions.tryOrNull | ||
| import timber.log.Timber | ||
| import javax.inject.Inject | ||
|
|
||
| internal interface SessionParamsCreator { | ||
|
|
||
| suspend fun create( | ||
| credentials: Credentials, | ||
| homeServerConnectionConfig: HomeServerConnectionConfig, | ||
| loginType: LoginType, | ||
| ): SessionParams | ||
| } | ||
|
|
||
| internal class DefaultSessionParamsCreator @Inject constructor( | ||
| private val isValidClientServerApiTask: IsValidClientServerApiTask | ||
| ) : SessionParamsCreator { | ||
|
|
||
| override suspend fun create( | ||
| credentials: Credentials, | ||
| homeServerConnectionConfig: HomeServerConnectionConfig, | ||
| loginType: LoginType, | ||
| ) = SessionParams( | ||
| credentials = credentials, | ||
| homeServerConnectionConfig = homeServerConnectionConfig.overrideWithCredentials(credentials), | ||
| isTokenValid = true, | ||
| loginType = loginType, | ||
| ) | ||
|
|
||
| private suspend fun HomeServerConnectionConfig.overrideWithCredentials(credentials: Credentials) = copy( | ||
| homeServerUriBase = credentials.getHomeServerUri(this) ?: homeServerUriBase, | ||
| identityServerUri = credentials.getIdentityServerUri() ?: identityServerUri | ||
| ) | ||
|
|
||
| private suspend fun Credentials.getHomeServerUri(homeServerConnectionConfig: HomeServerConnectionConfig) = | ||
| discoveryInformation?.homeServer?.baseURL | ||
| ?.trim { it == '/' } | ||
| ?.takeIf { it.isNotBlank() } | ||
| // It can be the same value, so in this case, do not check again the validity | ||
| ?.takeIf { it != homeServerConnectionConfig.homeServerUriBase.toString() } | ||
| ?.also { Timber.d("Overriding homeserver url to $it (will check if valid)") } | ||
| ?.let { Uri.parse(it) } | ||
| ?.takeIf { validateUri(it, homeServerConnectionConfig) } | ||
|
|
||
| private suspend fun validateUri(uri: Uri, homeServerConnectionConfig: HomeServerConnectionConfig) = | ||
| // Validate the URL, if the configuration is wrong server side, do not override | ||
| tryOrNull { | ||
| performClientServerApiValidation(uri, homeServerConnectionConfig) | ||
| } ?: true // In case of other error (no network, etc.), consider it is valid... | ||
|
|
||
| private suspend fun performClientServerApiValidation(uri: Uri, homeServerConnectionConfig: HomeServerConnectionConfig) = | ||
| isValidClientServerApiTask.execute( | ||
| IsValidClientServerApiTask.Params(homeServerConnectionConfig.copy(homeServerUriBase = uri)) | ||
| ).also { Timber.d("Overriding homeserver url: $it") } | ||
|
|
||
| private fun Credentials.getIdentityServerUri() = discoveryInformation?.identityServer?.baseURL | ||
| ?.trim { it == '/' } | ||
| ?.takeIf { it.isNotBlank() } | ||
| ?.also { Timber.d("Overriding identity server url to $it") } | ||
| ?.let { Uri.parse(it) } | ||
| } |
This file contains 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 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 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
35 changes: 35 additions & 0 deletions
35
...droid/src/main/java/org/matrix/android/sdk/internal/auth/db/migration/MigrateAuthTo005.kt
This file contains 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,35 @@ | ||
| /* | ||
| * Copyright (c) 2022 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.auth.db.migration | ||
|
|
||
| import io.realm.DynamicRealm | ||
| import org.matrix.android.sdk.api.auth.LoginType | ||
| import org.matrix.android.sdk.internal.auth.db.SessionParamsEntityFields | ||
| import org.matrix.android.sdk.internal.util.database.RealmMigrator | ||
| import timber.log.Timber | ||
|
|
||
| internal class MigrateAuthTo005(realm: DynamicRealm) : RealmMigrator(realm, 5) { | ||
|
|
||
| override fun doMigrate(realm: DynamicRealm) { | ||
| Timber.d("Update SessionParamsEntity to add LoginType") | ||
|
|
||
| realm.schema.get("SessionParamsEntity") | ||
| ?.addField(SessionParamsEntityFields.LOGIN_TYPE, String::class.java) | ||
| ?.setRequired(SessionParamsEntityFields.LOGIN_TYPE, true) | ||
| ?.transform { it.set(SessionParamsEntityFields.LOGIN_TYPE, LoginType.UNKNOWN.name) } | ||
| } | ||
| } |
This file contains 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
Oops, something went wrong.