From 9e1cd0cdec9a64bd7ab55dd7c083b6511283f345 Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Thu, 5 Sep 2024 15:59:02 +0200 Subject: [PATCH] Move the remaining mentions of matrix-org to element-hq --- CONTRIBUTING.md | 4 ++-- Cargo.toml | 4 ++-- README.md | 4 ++-- book.toml | 4 ++-- crates/cli/src/commands/doctor.rs | 2 +- crates/oauth2-types/src/lib.rs | 2 +- crates/oidc-client/src/lib.rs | 2 +- docs/README.md | 2 +- docs/development/graphql.md | 2 +- docs/rustdoc/mas_handlers/README.md | 2 +- docs/setup/homeserver.md | 2 +- docs/setup/installation.md | 10 +++++----- docs/setup/reverse-proxy.md | 2 +- docs/topics/admin-api.md | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b4db71f6a..34370fae2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 @@ -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 ``` -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. \ No newline at end of file +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. diff --git a/Cargo.toml b/Cargo.toml index 0a2271bce..61b825ed0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,8 +9,8 @@ package.version = "0.11.0" package.license = "AGPL-3.0-only" package.authors = ["Quentin Gliech "] 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" diff --git a/README.md b/README.md index b7be51d8b..ddb3a4dbc 100644 --- a/README.md +++ b/README.md @@ -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/). @@ -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 diff --git a/book.toml b/book.toml index d63fec020..e21f37eca 100644 --- a/book.toml +++ b/book.toml @@ -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/" diff --git a/crates/cli/src/commands/doctor.rs b/crates/cli/src/commands/doctor.rs index c63da9aea..0155a8033 100644 --- a/crates/cli/src/commands/doctor.rs +++ b/crates/cli/src/commands/doctor.rs @@ -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 {} diff --git a/crates/oauth2-types/src/lib.rs b/crates/oauth2-types/src/lib.rs index 2c69ef200..0f1729ec8 100644 --- a/crates/oauth2-types/src/lib.rs +++ b/crates/oauth2-types/src/lib.rs @@ -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)] diff --git a/crates/oidc-client/src/lib.rs b/crates/oidc-client/src/lib.rs index 28d86e770..f038ff012 100644 --- a/crates/oidc-client/src/lib.rs +++ b/crates/oidc-client/src/lib.rs @@ -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/ diff --git a/docs/README.md b/docs/README.md index 5cd4553e2..ce098c571 100644 --- a/docs/README.md +++ b/docs/README.md @@ -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 . +A hosted version is available at . ## How the documentation is organized diff --git a/docs/development/graphql.md b/docs/development/graphql.md index 1b703ef1b..ce946f8f9 100644 --- a/docs/development/graphql.md +++ b/docs/development/graphql.md @@ -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:///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:///graphql/playground`. ## Authorization diff --git a/docs/rustdoc/mas_handlers/README.md b/docs/rustdoc/mas_handlers/README.md index 3acc0ede9..e65f319e2 100644 --- a/docs/rustdoc/mas_handlers/README.md +++ b/docs/rustdoc/mas_handlers/README.md @@ -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: +If you're seeing this, you're probably looking at the documentation source, and should look at the built documentation instead here: diff --git a/docs/setup/homeserver.md b/docs/setup/homeserver.md index a53863d3a..8870d9de6 100644 --- a/docs/setup/homeserver.md +++ b/docs/setup/homeserver.md @@ -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 diff --git a/docs/setup/installation.md b/docs/setup/installation.md index 19bf26225..acc455191 100644 --- a/docs/setup/installation.md +++ b/docs/setup/installation.md @@ -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: @@ -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 @@ -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 @@ -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 diff --git a/docs/setup/reverse-proxy.md b/docs/setup/reverse-proxy.md index fa4d40fbc..0a24e0a58 100644 --- a/docs/setup/reverse-proxy.md +++ b/docs/setup/reverse-proxy.md @@ -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; diff --git a/docs/topics/admin-api.md b/docs/topics/admin-api.md index 7e6b703a8..47e9975a6 100644 --- a/docs/topics/admin-api.md +++ b/docs/topics/admin-api.md @@ -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 ```