Skip to content
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

Jump to bottom

Clarify when server name is used and link to definition #1862

Merged
merged 2 commits into from
Jun 14, 2024
Merged

Clarify when server name is used and link to definition #1862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8b39ec
Clarify when server name is used and link to definition
hughns Jun 12, 2024
c6acbea
Changelog
hughns Jun 12, 2024
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
1 change: 1 addition & 0 deletions changelogs/client_server/newsfragments/1862.clarification
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Clarify when server name is used and link to the definition.
4 changes: 2 additions & 2 deletions content/client-server-api/_index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,9 +356,9 @@ as per the [CORS](#web-browser-clients) section in this specification.
The `.well-known` method uses a JSON file at a predetermined location to
specify parameter values. The flow for this method is as follows:

1. Extract the server name from the user's Matrix ID by splitting the
1. Extract the [server name](/appendices/#server-name) from the user's Matrix ID by splitting the
Matrix ID at the first colon.
2. Extract the hostname from the server name.
2. Extract the hostname from the server name as described by the [grammar](/appendices/#server-name).
3. Make a GET request to `https://hostname/.well-known/matrix/client`.
1. If the returned status code is 404, then `IGNORE`.
2. If the returned status code is not 200, or the response body is
Expand Down
4 changes: 2 additions & 2 deletions content/client-server-api/modules/sso_login.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ authentication is successful, the browser will be redirected to that

For example, consider a web-based client at
`https://client.example.com`, which wants to initiate SSO login on
the homeserver at `server.example.org`. It does this by storing the
homeserver name in a query parameter for the `redirectUrl`: it
the homeserver with [server name](/appendices/#server-name) `server.example.org`. It does this by storing the
server name in a query parameter for the `redirectUrl`: it
redirects to
`https://server.example.org/login/sso/redirect?redirectUrl=https://client.example.com?hs=server.example.org`.

Expand Down