matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-07-29 22:01:14 +03:00
Code Activity

Fix the login template not rendering on policy error

Browse Source
This commit is contained in:
Quentin Gliech
2023-11-03 16:39:00 +01:00
parent a2f8d81107
commit 18259a6412
4 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
crates/templates/src/context.rs
View File

@ -32,7 +32,7 @@ use ulid::Ulid;
use url::Url; use url::Url;
pub use self::branding::SiteBranding; pub use self::branding::SiteBranding;
use crate::{FormField, FormState}; use crate::{FieldError, FormField, FormState};
/// Helper trait to construct context wrappers /// Helper trait to construct context wrappers
pub trait TemplateContext: Serialize { pub trait TemplateContext: Serialize {
@ -408,6 +408,26 @@ impl TemplateContext for LoginContext {
password_disabled: false, password_disabled: false,
providers: Vec::new(), providers: Vec::new(),
}, },
LoginContext {
form: FormState::default()
.with_error_on_field(LoginFormField::Username, FieldError::Required)
.with_error_on_field(
LoginFormField::Password,
FieldError::Policy {
message: "password too short".to_owned(),
},
),
next: None,
password_disabled: false,
providers: Vec::new(),
},
LoginContext {
form: FormState::default()
.with_error_on_field(LoginFormField::Username, FieldError::Exists),
next: None,
password_disabled: false,
providers: Vec::new(),
},
] ]
} }
} }

2
templates/components/field.html
View File

@ -72,7 +72,7 @@ limitations under the License.
{% elif error.kind == "exists" and field.name == "username" %} {% elif error.kind == "exists" and field.name == "username" %}
{{ _("mas.errors.username_taken") }} {{ _("mas.errors.username_taken") }}
{% elif error.kind == "policy" %} {% elif error.kind == "policy" %}
{{ _("mas.errors.denied_policy", message=error.message) }} {{ _("mas.errors.denied_policy", policy=error.message) }}
{% else %} {% else %}
{{ error.kind }} {{ error.kind }}
{% endif %} {% endif %}

6
templates/pages/sso.html
View File

@ -24,8 +24,10 @@ limitations under the License.
{{ icon.web_browser() }} {{ icon.web_browser() }}
</div> </div>
<h1 class="title">Allow access to your account?</h1> <div class="header">
<p class="text"><span class="whitespace-nowrap">{{ client_name }}</span> wants to access your account. This will allow <span class="whitespace-nowrap">{{ client_name }}</span> to:</p> <h1 class="title">Allow access to your account?</h1>
<p class="text"><span class="whitespace-nowrap">{{ client_name }}</span> wants to access your account. This will allow <span class="whitespace-nowrap">{{ client_name }}</span> to:</p>
</div>
</header> </header>
<section class="consent-scope-list"> <section class="consent-scope-list">

8
translations/en.json
View File

@ -6,7 +6,7 @@
}, },
"continue": "Continue", "continue": "Continue",
"@continue": { "@continue": {
"context": "pages/account/emails/add.html:45:26-46, pages/account/emails/verify.html:60:26-46, pages/consent.html:60:28-48, pages/login.html:59:30-50, pages/reauth.html:40:28-48, pages/register.html:59:28-48, pages/sso.html:43:28-48" "context": "pages/account/emails/add.html:45:26-46, pages/account/emails/verify.html:60:26-46, pages/consent.html:60:28-48, pages/login.html:59:30-50, pages/reauth.html:40:28-48, pages/register.html:59:28-48, pages/sso.html:45:28-48"
}, },
"create_account": "Create Account", "create_account": "Create Account",
"@create_account": { "@create_account": {
@ -18,7 +18,7 @@
}, },
"sign_out": "Sign out", "sign_out": "Sign out",
"@sign_out": { "@sign_out": {
"context": "pages/consent.html:68:28-48, pages/index.html:36:28-48, pages/policy_violation.html:46:28-48, pages/sso.html:51:28-48, pages/upstream_oauth2/link_mismatch.html:32:24-44, pages/upstream_oauth2/suggest_link.html:40:26-46" "context": "pages/consent.html:68:28-48, pages/index.html:36:28-48, pages/policy_violation.html:46:28-48, pages/sso.html:53:28-48, pages/upstream_oauth2/link_mismatch.html:32:24-44, pages/upstream_oauth2/suggest_link.html:40:26-46"
} }
}, },
"app": { "app": {
@ -167,7 +167,7 @@
"errors": { "errors": {
"denied_policy": "Denied by policy: %(policy)s", "denied_policy": "Denied by policy: %(policy)s",
"@denied_policy": { "@denied_policy": {
"context": "components/field.html:75:17-69" "context": "components/field.html:75:17-68"
}, },
"field_required": "This field is required", "field_required": "This field is required",
"@field_required": { "@field_required": {
@ -246,7 +246,7 @@
}, },
"not_you": "Not %(username)s?", "not_you": "Not %(username)s?",
"@not_you": { "@not_you": {
"context": "pages/consent.html:65:11-67, pages/sso.html:48:11-67", "context": "pages/consent.html:65:11-67, pages/sso.html:50:11-67",
"description": "Suggestions for the user to log in as a different user" "description": "Suggestions for the user to log in as a different user"
}, },
"or_separator": "Or", "or_separator": "Or",