From beac162d8b3b458da8eb8a27a49b08d03845321c Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Fri, 17 Apr 2026 15:59:46 -0500 Subject: [PATCH] Run automatic updates and lints From https://github.com/element-hq/matrix-authentication-service/blob/main/docs/development/contributing.md#7-test-test-test --- crates/config/src/sections/experimental.rs | 14 +++++++------ docs/config.schema.json | 2 +- translations/en.json | 23 +++++++++++++++------- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/crates/config/src/sections/experimental.rs b/crates/config/src/sections/experimental.rs index 84f9ae5f9..a8bc35366 100644 --- a/crates/config/src/sections/experimental.rs +++ b/crates/config/src/sections/experimental.rs @@ -142,13 +142,15 @@ impl ConfigurationSection for ExperimentalConfig { /// Configuration options for the session limit feature #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)] pub struct SessionLimitConfig { - /// Upon login in interactive contexts (like OAuth 2.0 sessions, or `m.login.sso` - /// compability login flow), if the soft limit is reached, it will display a policy - /// violation screen (web UI) to remove sessions before creating the new session. + /// Upon login in interactive contexts (like OAuth 2.0 sessions, or + /// `m.login.sso` compability login flow), if the soft limit is reached, + /// it will display a policy violation screen (web UI) to remove + /// sessions before creating the new session. /// - /// This is not enforced in non-interactive contexts (like `m.login.password` login - /// with the compability API) as there is no opportunity for us to show some UI for - /// people remove some sessions. See [`hard_limit`] for enforcement on that side. + /// This is not enforced in non-interactive contexts (like + /// `m.login.password` login with the compability API) as there is no + /// opportunity for us to show some UI for people remove some sessions. + /// See [`hard_limit`] for enforcement on that side. /// /// [`hard_limit`]: Self::hard_limit pub soft_limit: NonZeroU64, diff --git a/docs/config.schema.json b/docs/config.schema.json index 2b6baa7c4..6a50c91ba 100644 --- a/docs/config.schema.json +++ b/docs/config.schema.json @@ -2898,7 +2898,7 @@ "type": "object", "properties": { "soft_limit": { - "description": "Upon login in interactive contexts (like OAuth 2.0 sessions, or `m.login.sso`\n compability login flow), if the soft limit is reached, it will display a policy\n violation screen (web UI) to remove sessions before creating the new session.\n\n This is not enforced in non-interactive contexts (like `m.login.password` login\n with the compability API) as there is no opportunity for us to show some UI for\n people remove some sessions. See [`hard_limit`] for enforcement on that side.\n\n [`hard_limit`]: Self::hard_limit", + "description": "Upon login in interactive contexts (like OAuth 2.0 sessions, or\n `m.login.sso` compability login flow), if the soft limit is reached,\n it will display a policy violation screen (web UI) to remove\n sessions before creating the new session.\n\n This is not enforced in non-interactive contexts (like\n `m.login.password` login with the compability API) as there is no\n opportunity for us to show some UI for people remove some sessions.\n See [`hard_limit`] for enforcement on that side.\n\n [`hard_limit`]: Self::hard_limit", "type": "integer", "format": "uint64", "minimum": 1 diff --git a/translations/en.json b/translations/en.json index b4d4c72df..31641540e 100644 --- a/translations/en.json +++ b/translations/en.json @@ -6,7 +6,7 @@ }, "cancel": "Cancel", "@cancel": { - "context": "pages/consent.html:77:11-29, pages/device_consent.html:146:13-31, pages/policy_violation.html:44:13-31" + "context": "pages/consent.html:77:11-29, pages/device_consent.html:146:13-31, pages/policy_violation.html:59:15-33" }, "continue": "Continue", "@continue": { @@ -22,7 +22,7 @@ }, "sign_out": "Sign out", "@sign_out": { - "context": "pages/account/logged_out.html:22:28-48, pages/compat_login_policy_violation.html:28:28-48, pages/index.html:28:28-48, pages/policy_violation.html:38:28-48, pages/upstream_oauth2/link_mismatch.html:24:24-44, pages/upstream_oauth2/suggest_link.html:32:26-46" + "context": "pages/account/logged_out.html:22:28-48, pages/compat_login_policy_violation.html:38:28-48, pages/index.html:28:28-48, pages/policy_violation.html:48:28-48, pages/upstream_oauth2/link_mismatch.html:24:24-44, pages/upstream_oauth2/suggest_link.html:32:26-46" }, "skip": "Skip", "@skip": { @@ -495,22 +495,31 @@ "policy_violation": { "description": "This might be because of the client which authored the request, the currently logged in user, or the request itself.", "@description": { - "context": "pages/compat_login_policy_violation.html:18:25-62, pages/policy_violation.html:19:25-62", + "context": "pages/compat_login_policy_violation.html:27:27-64, pages/policy_violation.html:28:27-64", "description": "Displayed when an authorization request is denied by the policy" }, "heading": "The authorization request was denied by the policy enforced by this service", "@heading": { - "context": "pages/compat_login_policy_violation.html:17:27-60, pages/policy_violation.html:18:27-60", + "context": "pages/compat_login_policy_violation.html:26:29-62, pages/policy_violation.html:27:29-62", "description": "Displayed when an authorization request is denied by the policy" }, "logged_as": "Logged as %(username)s", "@logged_as": { - "context": "pages/compat_login_policy_violation.html:25:11-86, pages/policy_violation.html:35:11-86" + "context": "pages/compat_login_policy_violation.html:35:11-86, pages/policy_violation.html:45:11-86" }, "too_many_sessions": { "description": "Your account is already signed in on the maximum number of devices. To continue, remove %(num_devices_to_remove)s of your existing devices and sign in again.", + "@description": { + "context": "pages/compat_login_policy_violation.html:22:27-133, pages/policy_violation.html:23:27-133" + }, "heading": "Device limit reached", - "manage_devices": "Manage devices" + "@heading": { + "context": "pages/compat_login_policy_violation.html:21:29-80, pages/policy_violation.html:22:29-80" + }, + "manage_devices": "Manage devices", + "@manage_devices": { + "context": "pages/compat_login_policy_violation.html:42:26-84, pages/policy_violation.html:53:28-86" + } } }, "recovery": { @@ -804,4 +813,4 @@ } } } -} +} \ No newline at end of file