matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-11-21 23:00:50 +03:00
Code Activity

Upgrade axum to 0.5

Browse Source
This commit is contained in:
Quentin Gliech
2022-04-06 16:32:28 +02:00
parent 4e31fc6c84
commit 31bc8504c9
17 changed files with 65 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
crates/handlers/src/views/reauth.rs
View File

@@ -63,13 +63,11 @@ impl ReauthRequest {
}
fn redirect(self) -> Result<impl IntoResponse, anyhow::Error> {
let uri = if let Some(action) = self.post_auth_action {
action.build_uri()?
if let Some(action) = self.post_auth_action {
Ok(Redirect::to(&action.build_uri()?.to_string()))
} else {
Uri::from_static("/")
};
Ok(Redirect::to(uri))
Ok(Redirect::to("/"))
}
}
}
@@ -104,7 +102,7 @@ pub(crate) async fn get(
// PostAuthAction
let login: LoginRequest = query.post_auth_action.into();
let login = login.build_uri().map_err(fancy_error(templates.clone()))?;
return Ok((cookie_jar.headers(), Redirect::to(login)).into_response());
return Ok((cookie_jar, Redirect::to(&login.to_string())).into_response());
};
let ctx = ReauthContext::default();
@@ -125,7 +123,7 @@ pub(crate) async fn get(
.await
.map_err(fancy_error(templates.clone()))?;
Ok((cookie_jar.headers(), Html(content)).into_response())
Ok((cookie_jar, Html(content)).into_response())
}
pub(crate) async fn post(
@@ -155,7 +153,7 @@ pub(crate) async fn post(
// PostAuthAction
let login: LoginRequest = query.post_auth_action.into();
let login = login.build_uri().map_err(fancy_error(templates.clone()))?;
return Ok((cookie_jar.headers(), Redirect::to(login)).into_response());
return Ok((cookie_jar, Redirect::to(&login.to_string())).into_response());
};
// TODO: recover from errors here
@@ -166,5 +164,5 @@ pub(crate) async fn post(
txn.commit().await.map_err(fancy_error(templates.clone()))?;
let redirection = query.redirect().map_err(fancy_error(templates.clone()))?;
Ok((cookie_jar.headers(), redirection).into_response())
Ok((cookie_jar, redirection).into_response())
}