This commit is contained in:
Benoit Marty 2023-08-21 18:00:41 +02:00
parent 9aeb3b7074
commit 8f6edba403
2 changed files with 2 additions and 2 deletions

View File

@ -298,7 +298,7 @@ internal class DefaultAuthenticationService @Inject constructor(
} }
// If an m.login.sso flow is present that is flagged as being for MSC3824 OIDC compatibility then we only return that flow // If an m.login.sso flow is present that is flagged as being for MSC3824 OIDC compatibility then we only return that flow
val oidcCompatibilityFlow = loginFlowResponse.flows.orEmpty().firstOrNull { it.type == "m.login.sso" && it.delegatedOidcCompatibilty == true } val oidcCompatibilityFlow = loginFlowResponse.flows.orEmpty().firstOrNull { it.type == "m.login.sso" && it.delegatedOidcCompatibility == true }
val flows = if (oidcCompatibilityFlow != null) listOf(oidcCompatibilityFlow) else loginFlowResponse.flows val flows = if (oidcCompatibilityFlow != null) listOf(oidcCompatibilityFlow) else loginFlowResponse.flows
val supportsGetLoginTokenFlow = loginFlowResponse.flows.orEmpty().firstOrNull { it.type == "m.login.token" && it.getLoginToken == true } != null val supportsGetLoginTokenFlow = loginFlowResponse.flows.orEmpty().firstOrNull { it.type == "m.login.token" && it.getLoginToken == true } != null

View File

@ -51,7 +51,7 @@ internal data class LoginFlow(
* See [MSC3824](https://github.com/matrix-org/matrix-spec-proposals/pull/3824) * See [MSC3824](https://github.com/matrix-org/matrix-spec-proposals/pull/3824)
*/ */
@Json(name = "org.matrix.msc3824.delegated_oidc_compatibility") @Json(name = "org.matrix.msc3824.delegated_oidc_compatibility")
val delegatedOidcCompatibilty: Boolean? = null, val delegatedOidcCompatibility: Boolean? = null,
/** /**
* Whether a login flow of type m.login.token could accept a token issued using /login/get_token. * Whether a login flow of type m.login.token could accept a token issued using /login/get_token.