From 372fa3a20fa923d3ea3562ba9c58eec327633847 Mon Sep 17 00:00:00 2001 From: Olivier 'reivilibre Date: Wed, 22 Oct 2025 16:19:50 +0100 Subject: [PATCH 1/8] Add `mas-maintainers` github team to CODEOWNERS --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 000000000..222697181 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @element-hq/mas-maintainers From f8a1a362cb84e133147b24706eaec15186df4deb Mon Sep 17 00:00:00 2001 From: Olivier 'reivilibre Date: Fri, 24 Oct 2025 14:27:32 +0100 Subject: [PATCH 2/8] templates: fix reliance on lax undefined behaviour --- templates/base.html | 2 +- templates/components/footer.html | 10 +++++----- templates/pages/register/password.html | 2 +- templates/pages/upstream_oauth2/do_register.html | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/base.html b/templates/base.html index c7fb7e063..d5007ad83 100644 --- a/templates/base.html +++ b/templates/base.html @@ -28,7 +28,7 @@ Please see LICENSE files in the repository root for full details. {{ captcha.head() }} -
+
{% block content %}{% endblock content %} {% include "components/footer.html" %}
diff --git a/templates/components/footer.html b/templates/components/footer.html index 34bb5592f..60a788859 100644 --- a/templates/components/footer.html +++ b/templates/components/footer.html @@ -7,19 +7,19 @@ Please see LICENSE files in the repository root for full details. -#}
- {%- if branding.policy_uri or branding.tos_uri -%} + {%- if branding.policy_uri is defined or branding.tos_uri is defined -%} {%- endif -%} - {%- if branding.imprint -%} + {%- if branding.imprint is defined -%}

{{ branding.imprint }}

{%- endif -%}
diff --git a/templates/pages/register/password.html b/templates/pages/register/password.html index f6f7a924f..a4c585409 100644 --- a/templates/pages/register/password.html +++ b/templates/pages/register/password.html @@ -49,7 +49,7 @@ Please see LICENSE files in the repository root for full details. {% endcall %} - {% if branding.tos_uri %} + {% if branding.tos_uri is defined %} {% call(f) field.field(label=_("mas.register.terms_of_service", tos_uri=branding.tos_uri), name="accept_terms", form_state=form, inline=true, class="my-4") %}
diff --git a/templates/pages/upstream_oauth2/do_register.html b/templates/pages/upstream_oauth2/do_register.html index b3d8bdee8..6d5db9808 100644 --- a/templates/pages/upstream_oauth2/do_register.html +++ b/templates/pages/upstream_oauth2/do_register.html @@ -175,7 +175,7 @@ Please see LICENSE files in the repository root for full details.
{% endif %} - {% if branding.tos_uri %} + {% if branding.tos_uri is defined %} {% call(f) field.field(label=_("mas.register.terms_of_service", tos_uri=branding.tos_uri), name="accept_terms", form_state=form_state, inline=true, class="my-4") %}
From 7356047f278594d027e07f0f6cc8c5e744b16ac8 Mon Sep 17 00:00:00 2001 From: Olivier 'reivilibre Date: Fri, 24 Oct 2025 14:19:13 +0100 Subject: [PATCH 3/8] templates: Be strict about undefined variables We shouldn't have any reason to use undefined variables in MAS, so silently printing as empty strings (etc) seems undesirable. This will also be helpful for operators with custom templates, since then they will notice their templates being broken. --- crates/templates/src/lib.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/templates/src/lib.rs b/crates/templates/src/lib.rs index bb208eb44..daa34c0c5 100644 --- a/crates/templates/src/lib.rs +++ b/crates/templates/src/lib.rs @@ -17,7 +17,7 @@ use camino::{Utf8Path, Utf8PathBuf}; use mas_i18n::Translator; use mas_router::UrlBuilder; use mas_spa::ViteManifest; -use minijinja::Value; +use minijinja::{UndefinedBehavior, Value}; use rand::Rng; use serde::Serialize; use thiserror::Error; @@ -205,6 +205,8 @@ impl Templates { span.in_scope(move || { let mut loaded: HashSet<_> = HashSet::new(); let mut env = minijinja::Environment::new(); + // Don't allow use of undefined variables + env.set_undefined_behavior(UndefinedBehavior::Strict); let root = path.canonicalize_utf8()?; info!(%root, "Loading templates from filesystem"); for entry in walkdir::WalkDir::new(&root) From 25e6a6bfc447245bdceb4b8ce4debed6c5594325 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 28 Oct 2025 12:42:38 +0000 Subject: [PATCH 4/8] Translations updates --- frontend/.storybook/locales.ts | 62 +++++++++++++++++----------------- frontend/locales/ru.json | 8 ++--- translations/ru.json | 9 +++++ translations/zh-Hans.json | 2 +- 4 files changed, 45 insertions(+), 36 deletions(-) diff --git a/frontend/.storybook/locales.ts b/frontend/.storybook/locales.ts index 090812bf0..753759d06 100644 --- a/frontend/.storybook/locales.ts +++ b/frontend/.storybook/locales.ts @@ -27,7 +27,7 @@ export type LocalazyMetadata = { }; const localazyMetadata: LocalazyMetadata = { - projectUrl: "https://localazy.com/p/matrix-authentication-service", + projectUrl: "https://localazy.com/p/matrix-authentication-service!v1.5", baseLocale: "en", languages: [ { @@ -172,21 +172,21 @@ const localazyMetadata: LocalazyMetadata = { file: "frontend.json", path: "", cdnFiles: { - "cs": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/cs/frontend.json", - "da": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/da/frontend.json", - "de": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/de/frontend.json", - "en": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/en/frontend.json", - "et": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/et/frontend.json", - "fi": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/fi/frontend.json", - "fr": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/fr/frontend.json", - "hu": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/hu/frontend.json", - "nb_NO": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/nb-NO/frontend.json", - "nl": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/nl/frontend.json", - "pt": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/pt/frontend.json", - "ru": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/ru/frontend.json", - "sv": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/sv/frontend.json", - "uk": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/uk/frontend.json", - "zh#Hans": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/zh-Hans/frontend.json" + "cs": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/cs/frontend.json", + "da": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/da/frontend.json", + "de": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/de/frontend.json", + "en": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/en/frontend.json", + "et": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/et/frontend.json", + "fi": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/fi/frontend.json", + "fr": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/fr/frontend.json", + "hu": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/hu/frontend.json", + "nb_NO": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/nb-NO/frontend.json", + "nl": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/nl/frontend.json", + "pt": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/pt/frontend.json", + "ru": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/ru/frontend.json", + "sv": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/sv/frontend.json", + "uk": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/uk/frontend.json", + "zh#Hans": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/7c203a8ac8bd48c3c4609a8effcd0fbac430f9b2/zh-Hans/frontend.json" } }, { @@ -194,21 +194,21 @@ const localazyMetadata: LocalazyMetadata = { file: "file.json", path: "", cdnFiles: { - "cs": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/cs/file.json", - "da": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/da/file.json", - "de": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/de/file.json", - "en": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/en/file.json", - "et": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/et/file.json", - "fi": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/fi/file.json", - "fr": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/fr/file.json", - "hu": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/hu/file.json", - "nb_NO": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/nb-NO/file.json", - "nl": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/nl/file.json", - "pt": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/pt/file.json", - "ru": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/ru/file.json", - "sv": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/sv/file.json", - "uk": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/uk/file.json", - "zh#Hans": "https://delivery.localazy.com/_a7686032324574572744739e0707/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/zh-Hans/file.json" + "cs": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/cs/file.json", + "da": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/da/file.json", + "de": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/de/file.json", + "en": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/en/file.json", + "et": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/et/file.json", + "fi": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/fi/file.json", + "fr": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/fr/file.json", + "hu": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/hu/file.json", + "nb_NO": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/nb-NO/file.json", + "nl": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/nl/file.json", + "pt": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/pt/file.json", + "ru": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/ru/file.json", + "sv": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/sv/file.json", + "uk": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/uk/file.json", + "zh#Hans": "https://delivery.localazy.com/_a6763074727302097331c51429bd/_e0/5b69b0350dccfd47c245a5d41c1b9fdf6912cc6e/zh-Hans/file.json" } } ] diff --git a/frontend/locales/ru.json b/frontend/locales/ru.json index 85ddf2008..743597672 100644 --- a/frontend/locales/ru.json +++ b/frontend/locales/ru.json @@ -147,7 +147,7 @@ }, "nav": { "devices": "Устройства", - "plan": "Plan", + "plan": "Тарифный план", "profile": "Профиль", "sessions": "Сессии", "settings": "Настройки" @@ -302,9 +302,9 @@ "name_for_platform": "{{name}} для {{platform}}", "scopes_label": "Области", "set_device_name": { - "help": "Set a name that will help you identify this device.", - "label": "Device name", - "title": "Edit device name" + "help": "Установите имя, которое поможет вам идентифицировать это устройство.", + "label": "Имя устройства", + "title": "Переименовать устройство" }, "signed_in_date": "Вошёл ", "signed_in_label": "Вошёл в систему", diff --git a/translations/ru.json b/translations/ru.json index a2de2497a..cfc23d67e 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -101,6 +101,8 @@ } }, "device_display_name": { + "client_on_device": "%(client_name)s на %(device_name)s", + "name_for_platform": "%(name)s для %(platform)s", "unknown_device": "Неизвестное устройство" }, "email_in_use": { @@ -208,6 +210,7 @@ "register": { "call_to_login": "Уже есть аккаунт?", "continue_with_email": "Продолжить с адресом электронной почты", + "continue_with_password": "Продолжить с паролем", "create_account": { "description": "Выберите имя пользователя, чтобы продолжить.", "heading": "Создать учётную запись" @@ -215,6 +218,11 @@ "sign_in_instead": "Вместо этого войдите", "terms_of_service": "Я соглашаюсь с Правилами и положениями" }, + "registration_token": { + "description": "Введите токен регистрации, предоставленный администратором сервера.", + "field": "Токен регистрации", + "headline": "Токен регистрации" + }, "scope": { "edit_profile": "Редактировать профиль и контактную информацию", "manage_sessions": "Управлять устройствами и сеансами", @@ -230,6 +238,7 @@ }, "login_link": { "action": "Продолжить", + "description": "Для этого имени пользователя (%(username)s) существует учетная запись, она будет связана с этой учетной записью.", "heading": "Связать с существующим аккаунтом" }, "register": { diff --git a/translations/zh-Hans.json b/translations/zh-Hans.json index 505884b12..9aec3c264 100644 --- a/translations/zh-Hans.json +++ b/translations/zh-Hans.json @@ -212,7 +212,7 @@ "continue_with_email": "使用邮件地址继续", "continue_with_password": "使用密码继续", "create_account": { - "description": "请创建一个账户以开始使用：", + "description": "选择一个用户名以继续。", "heading": "创建账户" }, "sign_in_instead": "去登录", From f6d537f35dae1855b3f95ba427cc50f204db16fc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 28 Oct 2025 12:50:11 +0000 Subject: [PATCH 5/8] 1.5.0 --- Cargo.lock | 56 +++++++++++++++++++++++++------------------------- Cargo.toml | 60 +++++++++++++++++++++++++++--------------------------- 2 files changed, 58 insertions(+), 58 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f870c8601..2f9bcd749 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3096,7 +3096,7 @@ dependencies = [ [[package]] name = "mas-axum-utils" -version = "1.5.0-rc.1" +version = "1.5.0" dependencies = [ "anyhow", "axum", @@ -3130,7 +3130,7 @@ dependencies = [ [[package]] name = "mas-cli" -version = "1.5.0-rc.1" +version = "1.5.0" dependencies = [ "anyhow", "axum", @@ -3203,7 +3203,7 @@ dependencies = [ [[package]] name = "mas-config" -version = "1.5.0-rc.1" +version = "1.5.0" dependencies = [ "anyhow", "camino", @@ -3235,7 +3235,7 @@ dependencies = [ [[package]] name = "mas-context" -version = "1.5.0-rc.1" +version = "1.5.0" dependencies = [ "console", "opentelemetry", @@ -3251,7 +3251,7 @@ dependencies = [ [[package]] name = "mas-data-model" -version = "1.5.0-rc.1" +version = "1.5.0" dependencies = [ "base64ct", "chrono", @@ -3274,7 +3274,7 @@ dependencies = [ [[package]] name = "mas-email" -version = "1.5.0-rc.1" +version = "1.5.0" dependencies = [ "async-trait", "lettre", @@ -3285,7 +3285,7 @@ dependencies = [ [[package]] name = "mas-handlers" -version = "1.5.0-rc.1" +version = "1.5.0" dependencies = [ "aide", "anyhow", @@ -3365,7 +3365,7 @@ dependencies = [ [[package]] name = "mas-http" -version = "1.5.0-rc.1" +version = "1.5.0" dependencies = [ "futures-util", "headers", @@ -3386,7 +3386,7 @@ dependencies = [ [[package]] name = "mas-i18n" -version = "1.5.0-rc.1" +version = "1.5.0" dependencies = [ "camino", "icu_calendar", @@ -3408,7 +3408,7 @@ dependencies = [ [[package]] name = "mas-i18n-scan" -version = "1.5.0-rc.1" +version = "1.5.0" dependencies = [ "camino", "clap", @@ -3422,7 +3422,7 @@ dependencies = [ [[package]] name = "mas-iana" -version = "1.5.0-rc.1" +version = "1.5.0" dependencies = [ "schemars 0.8.22", "serde", @@ -3430,7 +3430,7 @@ dependencies = [ [[package]] name = "mas-iana-codegen" -version = "1.5.0-rc.1" +version = "1.5.0" dependencies = [ "anyhow", "async-trait", @@ -3446,7 +3446,7 @@ dependencies = [ [[package]] name = "mas-jose" -version = "1.5.0-rc.1" +version = "1.5.0" dependencies = [ "base64ct", "chrono", @@ -3476,7 +3476,7 @@ dependencies = [ [[package]] name = "mas-keystore" -version = "1.5.0-rc.1" +version = "1.5.0" dependencies = [ "aead", "base64ct", @@ -3504,7 +3504,7 @@ dependencies = [ [[package]] name = "mas-listener" -version = "1.5.0-rc.1" +version = "1.5.0" dependencies = [ "anyhow", "bytes", @@ -3529,7 +3529,7 @@ dependencies = [ [[package]] name = "mas-matrix" -version = "1.5.0-rc.1" +version = "1.5.0" dependencies = [ "anyhow", "async-trait", @@ -3539,7 +3539,7 @@ dependencies = [ [[package]] name = "mas-matrix-synapse" -version = "1.5.0-rc.1" +version = "1.5.0" dependencies = [ "anyhow", "async-trait", @@ -3556,7 +3556,7 @@ dependencies = [ [[package]] name = "mas-oidc-client" -version = "1.5.0-rc.1" +version = "1.5.0" dependencies = [ "assert_matches", "async-trait", @@ -3592,7 +3592,7 @@ dependencies = [ [[package]] name = "mas-policy" -version = "1.5.0-rc.1" +version = "1.5.0" dependencies = [ "anyhow", "arc-swap", @@ -3609,7 +3609,7 @@ dependencies = [ [[package]] name = "mas-router" -version = "1.5.0-rc.1" +version = "1.5.0" dependencies = [ "axum", "serde", @@ -3620,7 +3620,7 @@ dependencies = [ [[package]] name = "mas-spa" -version = "1.5.0-rc.1" +version = "1.5.0" dependencies = [ "camino", "serde", @@ -3629,7 +3629,7 @@ dependencies = [ [[package]] name = "mas-storage" -version = "1.5.0-rc.1" +version = "1.5.0" dependencies = [ "async-trait", "chrono", @@ -3651,7 +3651,7 @@ dependencies = [ [[package]] name = "mas-storage-pg" -version = "1.5.0-rc.1" +version = "1.5.0" dependencies = [ "async-trait", "chrono", @@ -3679,7 +3679,7 @@ dependencies = [ [[package]] name = "mas-tasks" -version = "1.5.0-rc.1" +version = "1.5.0" dependencies = [ "anyhow", "async-trait", @@ -3711,7 +3711,7 @@ dependencies = [ [[package]] name = "mas-templates" -version = "1.5.0-rc.1" +version = "1.5.0" dependencies = [ "anyhow", "arc-swap", @@ -3741,7 +3741,7 @@ dependencies = [ [[package]] name = "mas-tower" -version = "1.5.0-rc.1" +version = "1.5.0" dependencies = [ "http", "opentelemetry", @@ -4011,7 +4011,7 @@ dependencies = [ [[package]] name = "oauth2-types" -version = "1.5.0-rc.1" +version = "1.5.0" dependencies = [ "assert_matches", "base64ct", @@ -6094,7 +6094,7 @@ dependencies = [ [[package]] name = "syn2mas" -version = "1.5.0-rc.1" +version = "1.5.0" dependencies = [ "anyhow", "arc-swap", diff --git a/Cargo.toml b/Cargo.toml index a94e2d8fb..d64932b64 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ members = ["crates/*"] resolver = "2" # Updated in the CI with a `sed` command -package.version = "1.5.0-rc.1" +package.version = "1.5.0" package.license = "AGPL-3.0-only OR LicenseRef-Element-Commercial" package.authors = ["Element Backend Team"] package.edition = "2024" @@ -34,35 +34,35 @@ broken_intra_doc_links = "deny" [workspace.dependencies] # Workspace crates -mas-axum-utils = { path = "./crates/axum-utils/", version = "=1.5.0-rc.1" } -mas-cli = { path = "./crates/cli/", version = "=1.5.0-rc.1" } -mas-config = { path = "./crates/config/", version = "=1.5.0-rc.1" } -mas-context = { path = "./crates/context/", version = "=1.5.0-rc.1" } -mas-data-model = { path = "./crates/data-model/", version = "=1.5.0-rc.1" } -mas-email = { path = "./crates/email/", version = "=1.5.0-rc.1" } -mas-graphql = { path = "./crates/graphql/", version = "=1.5.0-rc.1" } -mas-handlers = { path = "./crates/handlers/", version = "=1.5.0-rc.1" } -mas-http = { path = "./crates/http/", version = "=1.5.0-rc.1" } -mas-i18n = { path = "./crates/i18n/", version = "=1.5.0-rc.1" } -mas-i18n-scan = { path = "./crates/i18n-scan/", version = "=1.5.0-rc.1" } -mas-iana = { path = "./crates/iana/", version = "=1.5.0-rc.1" } -mas-iana-codegen = { path = "./crates/iana-codegen/", version = "=1.5.0-rc.1" } -mas-jose = { path = "./crates/jose/", version = "=1.5.0-rc.1" } -mas-keystore = { path = "./crates/keystore/", version = "=1.5.0-rc.1" } -mas-listener = { path = "./crates/listener/", version = "=1.5.0-rc.1" } -mas-matrix = { path = "./crates/matrix/", version = "=1.5.0-rc.1" } -mas-matrix-synapse = { path = "./crates/matrix-synapse/", version = "=1.5.0-rc.1" } -mas-oidc-client = { path = "./crates/oidc-client/", version = "=1.5.0-rc.1" } -mas-policy = { path = "./crates/policy/", version = "=1.5.0-rc.1" } -mas-router = { path = "./crates/router/", version = "=1.5.0-rc.1" } -mas-spa = { path = "./crates/spa/", version = "=1.5.0-rc.1" } -mas-storage = { path = "./crates/storage/", version = "=1.5.0-rc.1" } -mas-storage-pg = { path = "./crates/storage-pg/", version = "=1.5.0-rc.1" } -mas-tasks = { path = "./crates/tasks/", version = "=1.5.0-rc.1" } -mas-templates = { path = "./crates/templates/", version = "=1.5.0-rc.1" } -mas-tower = { path = "./crates/tower/", version = "=1.5.0-rc.1" } -oauth2-types = { path = "./crates/oauth2-types/", version = "=1.5.0-rc.1" } -syn2mas = { path = "./crates/syn2mas", version = "=1.5.0-rc.1" } +mas-axum-utils = { path = "./crates/axum-utils/", version = "=1.5.0" } +mas-cli = { path = "./crates/cli/", version = "=1.5.0" } +mas-config = { path = "./crates/config/", version = "=1.5.0" } +mas-context = { path = "./crates/context/", version = "=1.5.0" } +mas-data-model = { path = "./crates/data-model/", version = "=1.5.0" } +mas-email = { path = "./crates/email/", version = "=1.5.0" } +mas-graphql = { path = "./crates/graphql/", version = "=1.5.0" } +mas-handlers = { path = "./crates/handlers/", version = "=1.5.0" } +mas-http = { path = "./crates/http/", version = "=1.5.0" } +mas-i18n = { path = "./crates/i18n/", version = "=1.5.0" } +mas-i18n-scan = { path = "./crates/i18n-scan/", version = "=1.5.0" } +mas-iana = { path = "./crates/iana/", version = "=1.5.0" } +mas-iana-codegen = { path = "./crates/iana-codegen/", version = "=1.5.0" } +mas-jose = { path = "./crates/jose/", version = "=1.5.0" } +mas-keystore = { path = "./crates/keystore/", version = "=1.5.0" } +mas-listener = { path = "./crates/listener/", version = "=1.5.0" } +mas-matrix = { path = "./crates/matrix/", version = "=1.5.0" } +mas-matrix-synapse = { path = "./crates/matrix-synapse/", version = "=1.5.0" } +mas-oidc-client = { path = "./crates/oidc-client/", version = "=1.5.0" } +mas-policy = { path = "./crates/policy/", version = "=1.5.0" } +mas-router = { path = "./crates/router/", version = "=1.5.0" } +mas-spa = { path = "./crates/spa/", version = "=1.5.0" } +mas-storage = { path = "./crates/storage/", version = "=1.5.0" } +mas-storage-pg = { path = "./crates/storage-pg/", version = "=1.5.0" } +mas-tasks = { path = "./crates/tasks/", version = "=1.5.0" } +mas-templates = { path = "./crates/templates/", version = "=1.5.0" } +mas-tower = { path = "./crates/tower/", version = "=1.5.0" } +oauth2-types = { path = "./crates/oauth2-types/", version = "=1.5.0" } +syn2mas = { path = "./crates/syn2mas", version = "=1.5.0" } # OpenAPI schema generation and validation [workspace.dependencies.aide] From 1803f2b0acf0a30d81c59eb1e45bc674f04a1410 Mon Sep 17 00:00:00 2001 From: Olivier 'reivilibre Date: Tue, 28 Oct 2025 15:51:34 +0000 Subject: [PATCH 6/8] For branding: use none instead of undefined --- crates/templates/src/context/branding.rs | 6 +++--- templates/components/footer.html | 10 +++++----- templates/pages/register/password.html | 2 +- templates/pages/upstream_oauth2/do_register.html | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/crates/templates/src/context/branding.rs b/crates/templates/src/context/branding.rs index eb7e3546a..15932567f 100644 --- a/crates/templates/src/context/branding.rs +++ b/crates/templates/src/context/branding.rs @@ -58,9 +58,9 @@ impl Object for SiteBranding { fn get_value(self: &Arc, name: &Value) -> Option { match name.as_str()? { "server_name" => Some(self.server_name.clone().into()), - "policy_uri" => self.policy_uri.clone().map(Value::from), - "tos_uri" => self.tos_uri.clone().map(Value::from), - "imprint" => self.imprint.clone().map(Value::from), + "policy_uri" => Some(Value::from(self.policy_uri.clone())), + "tos_uri" => Some(Value::from(self.tos_uri.clone())), + "imprint" => Some(Value::from(self.imprint.clone())), _ => None, } } diff --git a/templates/components/footer.html b/templates/components/footer.html index 60a788859..28f1a7ec9 100644 --- a/templates/components/footer.html +++ b/templates/components/footer.html @@ -7,19 +7,19 @@ Please see LICENSE files in the repository root for full details. -#}
- {%- if branding.policy_uri is defined or branding.tos_uri is defined -%} + {%- if branding.policy_uri is not none or branding.tos_uri is not none -%} {%- endif -%} - {%- if branding.imprint is defined -%} + {%- if branding.imprint is not none -%}

{{ branding.imprint }}

{%- endif -%}
diff --git a/templates/pages/register/password.html b/templates/pages/register/password.html index a4c585409..82aa763fd 100644 --- a/templates/pages/register/password.html +++ b/templates/pages/register/password.html @@ -49,7 +49,7 @@ Please see LICENSE files in the repository root for full details. {% endcall %} - {% if branding.tos_uri is defined %} + {% if branding.tos_uri is not none %} {% call(f) field.field(label=_("mas.register.terms_of_service", tos_uri=branding.tos_uri), name="accept_terms", form_state=form, inline=true, class="my-4") %}
diff --git a/templates/pages/upstream_oauth2/do_register.html b/templates/pages/upstream_oauth2/do_register.html index 6d5db9808..2a57a6aca 100644 --- a/templates/pages/upstream_oauth2/do_register.html +++ b/templates/pages/upstream_oauth2/do_register.html @@ -175,7 +175,7 @@ Please see LICENSE files in the repository root for full details.
{% endif %} - {% if branding.tos_uri is defined %} + {% if branding.tos_uri is not none %} {% call(f) field.field(label=_("mas.register.terms_of_service", tos_uri=branding.tos_uri), name="accept_terms", form_state=form_state, inline=true, class="my-4") %}
From 81e2f9a628c62408af174900318d2736ae21e496 Mon Sep 17 00:00:00 2001 From: Olivier 'reivilibre Date: Tue, 28 Oct 2025 16:46:19 +0000 Subject: [PATCH 7/8] Clarify some more conditions in the templates --- templates/form_post.html | 2 +- templates/pages/index.html | 2 +- templates/pages/upstream_oauth2/do_register.html | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/form_post.html b/templates/form_post.html index 1d0267e9f..71882c8ab 100644 --- a/templates/form_post.html +++ b/templates/form_post.html @@ -15,7 +15,7 @@ Please see LICENSE files in the repository root for full details.
-
+ {% for key, value in params|items %} {% endfor %} diff --git a/templates/pages/index.html b/templates/pages/index.html index b8a0d7547..3ef8ea51b 100644 --- a/templates/pages/index.html +++ b/templates/pages/index.html @@ -19,7 +19,7 @@ Please see LICENSE files in the repository root for full details.
- {% if current_session %} + {% if current_session is not none %}

{{ _("mas.navbar.signed_in_as", username=current_session.user.username) }}

diff --git a/templates/pages/upstream_oauth2/do_register.html b/templates/pages/upstream_oauth2/do_register.html index 2a57a6aca..f57564c43 100644 --- a/templates/pages/upstream_oauth2/do_register.html +++ b/templates/pages/upstream_oauth2/do_register.html @@ -26,7 +26,7 @@ Please see LICENSE files in the repository root for full details.

- {% elif upstream_oauth_provider.human_name %} + {% elif upstream_oauth_provider.human_name is not none %}
{{ icon.user_profile_solid() }} @@ -55,9 +55,9 @@ Please see LICENSE files in the repository root for full details.
{% endif %} - {% if upstream_oauth_provider.human_name %} + {% if upstream_oauth_provider.human_name is not none %}