Skip to content

Commit

Permalink
Move the remaining mentions of matrix-org to element-hq
Browse files Browse the repository at this point in the history
  • Loading branch information
sandhose committed Sep 10, 2024
1 parent 76367ff commit 847ccf8
Show file tree
Hide file tree
Showing 14 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Thank you for taking the time to contribute to Matrix!

This is the repository for MAS (Matrix Authentication Service), an OAuth 2.0 and OpenID Provider server for Matrix.

Please see the [contributors' guide](https://matrix-org.github.io/matrix-authentication-service/development/contributing.html) in our rendered documentation.
Please see the [contributors' guide](https://element-hq.github.io/matrix-authentication-service/development/contributing.html) in our rendered documentation.

## Sign off

Expand Down Expand Up @@ -58,4 +58,4 @@ If you agree to this for your contribution, then all that's needed is to include
Signed-off-by: Your Name <your@email.example.org>
```

Git allows you to add this signoff automatically when using the `-s` flag to `git commit`, which uses the name and email set in your `user.name` and `user.email` git configs.
Git allows you to add this signoff automatically when using the `-s` flag to `git commit`, which uses the name and email set in your `user.name` and `user.email` git configs.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ package.version = "0.11.0"
package.license = "AGPL-3.0-only"
package.authors = ["Quentin Gliech <quenting@element.io>"]
package.edition = "2021"
package.homepage = "https://matrix-org.github.io/matrix-authentication-service/"
package.repository = "https://github.com/matrix-org/matrix-authentication-service/"
package.homepage = "https://element-hq.github.io/matrix-authentication-service/"
package.repository = "https://github.com/element-hq/matrix-authentication-service/"

[workspace.lints.rust]
unsafe_code = "forbid"
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ MAS (Matrix Authentication Service) is an OAuth 2.0 and OpenID Provider server f

It has been created to support the migration of Matrix to an OpenID Connect (OIDC) based authentication layer as per [MSC3861](https://github.com/matrix-org/matrix-doc/pull/3861).

See the [Documentation](https://matrix-org.github.io/matrix-authentication-service/index.html) for information on installation and use.
See the [Documentation](https://element-hq.github.io/matrix-authentication-service/index.html) for information on installation and use.

You can learn more about Matrix and OIDC at [areweoidcyet.com](https://areweoidcyet.com/).

Expand All @@ -17,7 +17,7 @@ You can learn more about Matrix and OIDC at [areweoidcyet.com](https://areweoidc
- Authentication methods:
- ✅ Upstream OIDC
- 🚧 Local password
- ‼️ [Application Services login](https://matrix-org.github.io/matrix-authentication-service/as-login.html) (**Encrypted bridges**)
- ‼️ [Application Services login](https://element-hq.github.io/matrix-authentication-service/as-login.html) (**Encrypted bridges**)
- Migration support
- ✅ Compatibility layer for legacy Matrix authentication
- ✅ Advisor on migration readiness
Expand Down
4 changes: 2 additions & 2 deletions book.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ build-dir = "target/book"

[output.html]
# The URL visitors will be directed to when they try to edit a page
edit-url-template = "https://github.com/matrix-org/matrix-authentication-service/edit/main/{path}"
edit-url-template = "https://github.com/element-hq/matrix-authentication-service/edit/main/{path}"

# The source code URL of the repository
git-repository-url = "https://github.com/matrix-org/matrix-authentication-service"
git-repository-url = "https://github.com/element-hq/matrix-authentication-service"

# The path that the docs are hosted on
site-url = "/matrix-authentication-service/"
2 changes: 1 addition & 1 deletion crates/cli/src/commands/doctor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use tracing::{error, info, info_span, warn};
use url::{Host, Url};

/// Base URL for the human-readable documentation
const DOCS_BASE: &str = "https://matrix-org.github.io/matrix-authentication-service";
const DOCS_BASE: &str = "https://element-hq.github.io/matrix-authentication-service";

#[derive(Parser, Debug)]
pub(super) struct Options {}
Expand Down
2 changes: 1 addition & 1 deletion crates/oauth2-types/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//!
//! [OAuth 2.0]: https://oauth.net/2/
//! [OpenID Connect]: https://openid.net/connect/
//! [Matrix Authentication Service]: https://github.com/matrix-org/matrix-authentication-service
//! [Matrix Authentication Service]: https://github.com/element-hq/matrix-authentication-service

#![deny(missing_docs)]
#![allow(clippy::module_name_repetitions)]
Expand Down
2 changes: 1 addition & 1 deletion crates/oidc-client/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
//!
//! [OpenID Connect]: https://openid.net/connect/
//! [Matrix]: https://matrix.org/
//! [Matrix Authentication Service]: https://github.com/matrix-org/matrix-authentication-service
//! [Matrix Authentication Service]: https://github.com/element-hq/matrix-authentication-service
//! [MSC3861]: https://github.com/matrix-org/matrix-spec-proposals/pull/3861
//! [OAuth 2.0]: https://oauth.net/2/

Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ MAS is an OAuth 2.0 and OpenID Provider server for Matrix.
It has been created to support the migration of Matrix to an OpenID Connect (OIDC) based authentication layer as per [MSC3861](https://github.com/matrix-org/matrix-doc/pull/3861).

The documentation itself is built using [mdBook](https://rust-lang.github.io/mdBook/).
A hosted version is available at <https://matrix-org.github.io/matrix-authentication-service/>.
A hosted version is available at <https://element-hq.github.io/matrix-authentication-service/>.

## How the documentation is organized

Expand Down
2 changes: 1 addition & 1 deletion docs/development/graphql.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ MAS uses an internal GraphQL API which is used by the self-service user interfac
The endpoint for this API can be discovered through the OpenID Connect discovery document, under the `org.matrix.matrix-authentication-service.graphql_endpoint` key.
Though it is usually hosted at `https://<mas-host>/graphql`.

GraphQL uses [a self-describing schema](https://github.com/matrix-org/matrix-authentication-service/blob/main/frontend/schema.graphql), which means that the API can be explored in tools like the GraphQL Playground.
GraphQL uses [a self-describing schema](https://github.com/element-hq/matrix-authentication-service/blob/main/frontend/schema.graphql), which means that the API can be explored in tools like the GraphQL Playground.
If enabled, MAS hosts an instance of the playground at `https://<mas-host>/graphql/playground`.

## Authorization
Expand Down
2 changes: 1 addition & 1 deletion docs/rustdoc/mas_handlers/README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
This is a placeholder which is replaced by the built crates technical documentation when building the documentation.
If you're seeing this, you're probably looking at the documentation source, and should look at the built documentation instead here: <https://matrix-org.github.io/matrix-authentication-service/rustdoc/mas_handlers/>
If you're seeing this, you're probably looking at the documentation source, and should look at the built documentation instead here: <https://element-hq.github.io/matrix-authentication-service/rustdoc/mas_handlers/>
2 changes: 1 addition & 1 deletion docs/setup/homeserver.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Homeserver configuration

The `matrix-authentication-service` is designed to be run alongside a Matrix homeserver.
It currently only supports [Synapse](https://github.com/matrix-org/synapse) through the experimental OAuth delegation feature.
It currently only supports [Synapse](https://github.com/element-hq/synapse) through the experimental OAuth delegation feature.
The authentication service needs to be able to call the Synapse admin API to provision users through a shared secret, and Synapse needs to be able to call the service to verify access tokens using the OAuth 2.0 token introspection endpoint.

## Provision a client for the Homeserver to use
Expand Down
10 changes: 5 additions & 5 deletions docs/setup/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

Pre-built binaries can be found attached on each release, for Linux on both `x86_64` and `aarch64` architectures.

- [`mas-cli-aarch64-linux.tar.gz`](https://github.com/matrix-org/matrix-authentication-service/releases/latest/download/mas-cli-aarch64-linux.tar.gz)
- [`mas-cli-x86_64-linux.tar.gz`](https://github.com/matrix-org/matrix-authentication-service/releases/latest/download/mas-cli-x86_64-linux.tar.gz)
- [`mas-cli-aarch64-linux.tar.gz`](https://github.com/element-hq/matrix-authentication-service/releases/latest/download/mas-cli-aarch64-linux.tar.gz)
- [`mas-cli-x86_64-linux.tar.gz`](https://github.com/element-hq/matrix-authentication-service/releases/latest/download/mas-cli-x86_64-linux.tar.gz)

Each archive contains:

Expand All @@ -29,7 +29,7 @@ OS=linux
VERSION=latest # or a specific version, like "v0.1.0"

# URL to the right archive
URL="https://github.com/matrix-org/matrix-authentication-service/releases/${VERSION}/download/mas-cli-${ARCH}-${OS}.tar.gz"
URL="https://github.com/element-hq/matrix-authentication-service/releases/${VERSION}/download/mas-cli-${ARCH}-${OS}.tar.gz"

# Create a directory and extract the archive in it
mkdir -p /path/to/mas
Expand All @@ -51,7 +51,7 @@ The image can also be built from the source:

1. Get the source
```sh
git clone https://github.com/matrix-org/matrix-authentication-service.git
git clone https://github.com/element-hq/matrix-authentication-service.git
cd matrix-authentication-service
```
1. Build the image
Expand All @@ -69,7 +69,7 @@ Building from the source requires:

1. Get the source
```sh
git clone https://github.com/matrix-org/matrix-authentication-service.git
git clone https://github.com/element-hq/matrix-authentication-service.git
cd matrix-authentication-service
```
1. Build the frontend
Expand Down
2 changes: 1 addition & 1 deletion docs/setup/reverse-proxy.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ server {
}
# Forward to Synapse
# as per https://matrix-org.github.io/synapse/latest/reverse_proxy.html#nginx
# as per https://element-hq.github.io/synapse/latest/reverse_proxy.html#nginx
location ~ ^(/_matrix|/_synapse/client) {
proxy_pass http://localhost:8008;
proxy_set_header X-Forwarded-For $remote_addr;
Expand Down
2 changes: 1 addition & 1 deletion docs/topics/admin-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ clients:
client_secret: wie9oh2EekeeDeithei9Eipaeh2sohte
redirect_uris:
# The Swagger UI callback in the hosted documentation
- https://matrix-org.github.io/matrix-authentication-service/api/oauth2-redirect.html
- https://element-hq.github.io/matrix-authentication-service/api/oauth2-redirect.html
# The Swagger UI callback hosted by the service
- https://mas.example.com/api/doc/oauth2-redirect
```
Expand Down

0 comments on commit 847ccf8

Please sign in to comment.