Improve wellknown usage #3585
Merged
Improve wellknown usage #3585
Conversation
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
…rameter to be able to use something else than the userId's domain
…rver API Also handle the migration for the specific matrix-client.matrix.org URL
… homeserver base url
Actually import what has been done in Login V2...
BillCarsonFr
approved these changes
Jul 5, 2021
ganfra
approved these changes
Jul 5, 2021
| if (it is Failure.OtherServerError | ||
| && it.httpCode == HttpsURLConnection.HTTP_NOT_FOUND /* 404 */) { | ||
| // It's maybe a Riot url? | ||
| getRiotDomainLoginFlowInternal(homeServerConnectionConfig) |
| return tryOrNull { getWellknown(userId) } | ||
| suspend fun RawService.getElementWellknown(sessionParams: SessionParams): ElementWellKnown? { | ||
| // By default we use the domain of the userId to retrieve the .well-known data | ||
| val domain = sessionParams.userId.substringAfter(":") |
There was a problem hiding this comment.
Should we have an extension method for this substringAfter(":") as we use it at several places
There was a problem hiding this comment.
Done: added fun String.getDomain(): String in MatrixPattern
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR fixes several issues:
Fixes #2843 : we now first perform a .well-known request, even if the entered URL is a valid Matrix API
Fixes #3572: we now store the url entered at session creation (Auth database migration required to add the new field), for further reference. Settings screen is updated:
and
API URL is only displayed in developer mode (see the diff with https://user-images.githubusercontent.com/3940906/123458079-e79cba00-d5e4-11eb-825e-4d481662b418.png).
Some change in the SDK API, wellknown now takes a domain instead of a matrixId.
Tested OK
Limitation
If the user enter the matrix API url, for instance "matrix-client.matrix.org", there is no way to deduce the domain matrix.org. So every further wellknow request will fail.