demostf/frontend
1
0
Fork 0
mirror of https://codeberg.org/demostf/frontend.git synced 2026-08-02 12:24:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

clippy fixes

Browse source
This commit is contained in:
Robin Appelman 2026-08-02 00:30:16 +02:00
commit f3e7c73bf5
1 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/main.rs
View file

@ -368,8 +368,7 @@ async fn login_callback(
let referrer_openid = return_to let referrer_openid = return_to
.as_ref() .as_ref()
.map(|return_to| format!("/login/callback/{}", Encoded(return_to.as_str()))) .map(|return_to| format!("/login/callback/{}", Encoded(return_to.as_str())))
.map(|callback| SteamOpenId::new(&app.url, &callback).ok()) .and_then(|callback| SteamOpenId::new(&app.url, &callback).ok());
.flatten();
let openid = referrer_openid.as_ref().unwrap_or(&app.openid); let openid = referrer_openid.as_ref().unwrap_or(&app.openid);
let query = query.as_deref().unwrap_or_default(); let query = query.as_deref().unwrap_or_default();
@ -393,8 +392,7 @@ async fn login_callback(
let return_to = return_to let return_to = return_to
.as_ref() .as_ref()
.map(|Path(return_to)| return_to) .map(|Path(return_to)| return_to)
.map(|return_to| HeaderValue::from_str(&return_to).ok()) .and_then(|return_to| HeaderValue::from_str(return_to).ok())
.flatten()
.unwrap_or(HeaderValue::from_static("/")); .unwrap_or(HeaderValue::from_static("/"));
Ok(( Ok((
@ -421,14 +419,12 @@ async fn login(
) -> impl IntoResponse { ) -> impl IntoResponse {
let referrer = referrer let referrer = referrer
.map(|TypedHeader(referrer)| referrer.to_string()) .map(|TypedHeader(referrer)| referrer.to_string())
.map(|referrer| Url::parse(&referrer).ok()) .and_then(|referrer| Url::parse(&referrer).ok());
.flatten();
let referrer_openid = referrer let referrer_openid = referrer
.as_ref() .as_ref()
.map(|referrer| format!("/login/callback/{}", Encoded(referrer.path()))) .map(|referrer| format!("/login/callback/{}", Encoded(referrer.path())))
.map(|callback| SteamOpenId::new(&app.url, &callback).ok()) .and_then(|callback| SteamOpenId::new(&app.url, &callback).ok());
.flatten();
let openid = referrer_openid.as_ref().unwrap_or(&app.openid); let openid = referrer_openid.as_ref().unwrap_or(&app.openid);
( (
StatusCode::FOUND, StatusCode::FOUND,
@ -449,8 +445,7 @@ async fn logout(
) -> impl IntoResponse { ) -> impl IntoResponse {
let referrer = referrer let referrer = referrer
.map(|TypedHeader(referrer)| referrer.to_string()) .map(|TypedHeader(referrer)| referrer.to_string())
.map(|referrer| Url::parse(&referrer).ok()) .and_then(|referrer| Url::parse(&referrer).ok());
.flatten();
let return_to = referrer.as_ref().map(|url| url.path()).unwrap_or("/"); let return_to = referrer.as_ref().map(|url| url.path()).unwrap_or("/");
if let Some(session_cookie) = cookie.as_deref().and_then(|cookie| cookie.get(COOKIE_NAME)) { if let Some(session_cookie) = cookie.as_deref().and_then(|cookie| cookie.get(COOKIE_NAME)) {