Restores support for default_server_name which discovers URLs via .well-known
#2669
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
Modular now sets `disable_custom_urls`, so the server type selector is not shown for Modular-hosted Riot.
`ServerTypeSelector` would call its `onChange` prop both at construction (because it computed the default selected type and consumers might want to know) as well as on actual user change. This ended up complicating consumer code, as they want to differentiate between initial state and changes made by the user. To simplify things, `ServerTypeSelector` now exports a function to compute the server type from HS URL, which can be useful for setting its initially selected type. The consumer now provides that type via a prop, and `onChange` is now only called for actual user changes, simplifying the logic in `Registration` which uses `ServerTypeSelector`. In addition, some usages of `customHsUrl` vs. `defaultHsUrl` in `Registration` are simplified to be `customHsUrl` only (since it already includes a fallback to the default URL in `MatrixChat`).
If a default server name is set and the current HS URL is the default HS URL, we'll display that name in the "your account" text on the registration form. This can be a bit more user friendly, especially when the HS is delegated to somewhere such as Modular, since you'll then see "example.com" instead of "example.modular.im", which you have no direct relationship with as a user. This is the key bit of element-hq/element-web#8763 for registration.
If a default server name is set and the current HS URL is the default HS URL, we'll display that name in the "sign in to" text on the login form. This can be a bit more user friendly, especially when the HS is delegated to somewhere such as Modular, since you'll then see "example.com" instead of "example.modular.im", which you have no direct relationship with as a user. This is the key bit of element-hq/element-web#8763 for login.
If a default server name is set and the current HS URL is the default HS URL, we'll display that name in the "your account" text on the forgot password form. This can be a bit more user friendly, especially when the HS is delegated to somewhere such as Modular, since you'll then see "example.com" instead of "example.modular.im", which you have no direct relationship with as a user. This is the key bit of element-hq/element-web#8763 for forgot password.
Now that auth flows can show a server name like `example.com` which might delegate the HS to some other server, it could be confusing to see text like "Sign in to example.com", especially if `example.com` runs an identity service, uses SSO, has its own account system, or other things like this. To clarify that we mean Matrix accounts, all auth flows are updated to talk in terms of "<verb> your Matrix account on <server>". Fixes part of element-hq/element-web#8763 (comment).
The forgot password link should prevent default to avoid changing the URL's hash state.
turt2live
approved these changes
Feb 20, 2019
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.
#2327 previously added support for a
default_server_nameconfig property which when set, will trigger a.well-knowndiscovery to find the default HS and IS URLs.Some of this got lost in the recent auth churn, so this restores that functionality, and also adds further tweaks from element-hq/element-web#8763 to the text around accounts.
In these screenshots,
onett.localis my local machine where I set up a dummy.well-knownpointed elsewhere. My local Riot is then set to use"default_server_name": "onett.local".Each commit in this PR has additional context in the commit message, so you may want to review commit by commit.
Fixes element-hq/element-web#8763.