diff --git a/crates/templates/src/context.rs b/crates/templates/src/context.rs index 4ed09c3e1..f836d7c4b 100644 --- a/crates/templates/src/context.rs +++ b/crates/templates/src/context.rs @@ -1456,7 +1456,7 @@ impl TemplateContext for RecoveryFinishContext { } } -/// Context used by the `pages/upstream_oauth2/{link_mismatch,login_link}.html` +/// Context used by the `pages/upstream_oauth2/link_mismatch.html` /// templates #[derive(Serialize)] pub struct UpstreamExistingLinkContext { diff --git a/crates/templates/src/lib.rs b/crates/templates/src/lib.rs index 32a41e8b2..1f9aa3337 100644 --- a/crates/templates/src/lib.rs +++ b/crates/templates/src/lib.rs @@ -442,9 +442,6 @@ register_templates! { /// Render the upstream link mismatch message pub fn render_upstream_oauth2_link_mismatch(WithLanguage>>) { "pages/upstream_oauth2/link_mismatch.html" } - /// Render the upstream link match - pub fn render_upstream_oauth2_login_link(WithLanguage>) { "pages/upstream_oauth2/login_link.html" } - /// Render the upstream suggest link message pub fn render_upstream_oauth2_suggest_link(WithLanguage>>) { "pages/upstream_oauth2/suggest_link.html" } diff --git a/templates/pages/upstream_oauth2/login_link.html b/templates/pages/upstream_oauth2/login_link.html deleted file mode 100644 index cdde102b2..000000000 --- a/templates/pages/upstream_oauth2/login_link.html +++ /dev/null @@ -1,31 +0,0 @@ -{# -Copyright 2025 New Vector Ltd. - -SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial -Please see LICENSE in the repository root for full details. --#} - -{% extends "base.html" %} - -{% block content %} -
-
- {{ icon.link() }} -
- -
-

{{ _("mas.upstream_oauth2.login_link.heading") }}

-
-
-
- {{ _("mas.upstream_oauth2.login_link.description", username=linked_user.username) }} - -
- - - - {{ button.button(text=_("mas.upstream_oauth2.login_link.action")) }} -
- -
-{% endblock content %} diff --git a/translations/en.json b/translations/en.json index cdf2df82d..c935542f3 100644 --- a/translations/en.json +++ b/translations/en.json @@ -697,20 +697,6 @@ "description": "Page shown when the user tries to link an upstream account that is already linked to another account" } }, - "login_link": { - "action": "Continue", - "@action": { - "context": "pages/upstream_oauth2/login_link.html:27:28-70" - }, - "description": "An account exists for this username (%(username)s), it will be linked to this upstream account.", - "@description": { - "context": "pages/upstream_oauth2/login_link.html:21:7-85" - }, - "heading": "Link to your existing account", - "@heading": { - "context": "pages/upstream_oauth2/login_link.html:17:27-70" - } - }, "register": { "choose_username": { "description": "This cannot be changed later.",