Skip to content

OIDC configuration #4623

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.

Sign up for GitHub

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 9 commits into from
Apr 23, 2025
Merged

OIDC configuration #4623

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d28d80b
Login: more logs.
bmarty Apr 22, 2025
912d6f2
Login: map Oidc error to provide more information in the error dialog.
bmarty Apr 22, 2025
0bea29a
Oidc: use the application name.
bmarty Apr 22, 2025
8d7a57b
Oidc: move configuration from OidcConfigurationProvider to OidcConfig…
bmarty Apr 22, 2025
ae56172
Oidc: limit to only 1 contact in the configuration.
bmarty Apr 22, 2025
3cdc38d
Oidc: Move configuration to BuildConfig file.
bmarty Apr 22, 2025
9cc1cc5
Remove unused const.
bmarty Apr 22, 2025
c750287
Add missing test on Exception mapping
bmarty Apr 23, 2025
4960065
Remove contacts from OidcConfiguration.
bmarty Apr 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions ...in/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerError.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,24 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
import io.element.android.features.login.impl.R
import io.element.android.libraries.matrix.api.auth.AuthenticationException
import io.element.android.libraries.ui.strings.CommonStrings

sealed class ChangeServerError : Throwable() {
data class Error(@StringRes val messageId: Int) : ChangeServerError() {
data class Error(
@StringRes val messageId: Int? = null,
val messageStr: String? = null,
) : ChangeServerError() {
@Composable
fun message(): String = stringResource(messageId)
fun message(): String = messageStr ?: stringResource(messageId ?: CommonStrings.error_unknown)
}

data object SlidingSyncAlert : ChangeServerError()

companion object {
fun from(error: Throwable): ChangeServerError = when (error) {
is AuthenticationException.SlidingSyncVersion -> SlidingSyncAlert
else -> Error(R.string.screen_change_server_error_invalid_homeserver)
is AuthenticationException.Oidc -> Error(messageStr = error.message)
else -> Error(messageId = R.string.screen_change_server_error_invalid_homeserver)
}
}
}
1 change: 1 addition & 0 deletions ...i/src/main/kotlin/io/element/android/libraries/matrix/api/auth/AuthenticationException.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ package io.element.android.libraries.matrix.api.auth
sealed class AuthenticationException(message: String) : Exception(message) {
class InvalidServerName(message: String) : AuthenticationException(message)
class SlidingSyncVersion(message: String) : AuthenticationException(message)
class Oidc(message: String) : AuthenticationException(message)
class Generic(message: String) : AuthenticationException(message)
}
8 changes: 8 additions & 0 deletions .../src/main/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationException.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ package io.element.android.libraries.matrix.impl.auth

import io.element.android.libraries.matrix.api.auth.AuthenticationException
import org.matrix.rustcomponents.sdk.ClientBuildException
import org.matrix.rustcomponents.sdk.OidcException

fun Throwable.mapAuthenticationException(): AuthenticationException {
val message = this.message ?: "Unknown error"
Expand All @@ -24,6 +25,13 @@ fun Throwable.mapAuthenticationException(): AuthenticationException {
is ClientBuildException.WellKnownLookupFailed -> AuthenticationException.Generic(message)
is ClientBuildException.EventCache -> AuthenticationException.Generic(message)
}
is OidcException -> when (this) {
is OidcException.Generic -> AuthenticationException.Oidc(message)
is OidcException.CallbackUrlInvalid -> AuthenticationException.Oidc(message)
is OidcException.Cancelled -> AuthenticationException.Oidc(message)
is OidcException.MetadataInvalid -> AuthenticationException.Oidc(message)
is OidcException.NotSupported -> AuthenticationException.Oidc(message)
}
Comment on lines +28 to +34
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we're mapping them to the same type, are we sure the messages are clear enough to track the root cause of the issue?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, for what I have seen, it seems to be clear enough. We may want to improve the mapping if it's not the case.

Previously the homeserver reachability was designed as the cause of the failure, so I guess this is already much better.

else -> AuthenticationException.Generic(message)
}
}