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

Make the upstream provider URL better display & fix test

Browse Source
This commit is contained in:
Quentin Gliech
2023-10-30 14:05:18 +01:00
parent f734d9c21f
commit 6d65bcae13
4 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/handlers/src/views/login.rs
View File

@ -388,15 +388,11 @@ mod test {
let response = state.request(Request::get("/login").empty()).await;
response.assert_status(StatusCode::OK);
response.assert_header_value(CONTENT_TYPE, "text/html; charset=utf-8");
assert!(response
.body()
.contains(&escape_html(&first_provider.issuer)));
assert!(response.body().contains(&escape_html("first.com/")));
assert!(response
.body()
.contains(&escape_html(&first_provider_login.path_and_query())));
assert!(response
.body()
.contains(&escape_html(&second_provider.issuer)));
assert!(response.body().contains(&escape_html("second.com/")));
assert!(response
.body()
.contains(&escape_html(&second_provider_login.path_and_query())));

21
crates/templates/src/functions.rs
View File

@ -118,10 +118,10 @@ fn filter_to_params(params: &Value, kwargs: Kwargs) -> Result<String, Error> {
}
/// Filter which simplifies a URL to its domain name for HTTP(S) URLs
fn filter_simplify_url(url: &str) -> String {
fn filter_simplify_url(url: &str, kwargs: Kwargs) -> Result<String, minijinja::Error> {
// Do nothing if the URL is not valid
let Ok(mut url) = Url::from_str(url) else {
return url.to_owned();
return Ok(url.to_owned());
};
// Always at least remove the query parameters and fragment
@ -130,15 +130,26 @@ fn filter_simplify_url(url: &str) -> String {
// Do nothing else for non-HTTPS URLs
if url.scheme() != "https" {
return url.to_string();
return Ok(url.to_string());
}
let keep_path = kwargs.get::<Option<bool>>("keep_path")?.unwrap_or_default();
kwargs.assert_all_used()?;
// Only return the domain name
let Some(domain) = url.domain() else {
return url.to_string();
return Ok(url.to_string());
};
domain.to_owned()
if keep_path {
Ok(format!(
"{domain}{path}",
domain = domain,
path = url.path(),
))
} else {
Ok(domain.to_owned())
}
}
enum ParamsWhere {