From a47f44105fb86e07d83f2361d213de5c74505dcd Mon Sep 17 00:00:00 2001 From: notplants Date: Mon, 27 Jun 2022 14:53:44 -0400 Subject: [PATCH 1/2] Add back_url_cookie for all private routes --- peach-web/src/public_router.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/peach-web/src/public_router.rs b/peach-web/src/public_router.rs index fd433f3..2afd287 100644 --- a/peach-web/src/public_router.rs +++ b/peach-web/src/public_router.rs @@ -3,6 +3,7 @@ use rouille::{router, Request, Response}; use crate::{ private_router, routes, + utils::cookie::CookieResponse, utils::{flash::FlashResponse, sbot}, SessionData, }; @@ -92,7 +93,9 @@ pub fn handle_route(request: &Request, session_data: &mut Option) - if let Some(_session) = session_data.as_ref() { // logged in: // mount the routes which require authentication to view - private_router::mount_peachpub_routes(request, session_data) + let response = private_router::mount_peachpub_routes(request, session_data); + let back_url_cookie = format!("back_url={}", request.raw_url()); + response.add_cookie(&back_url_cookie) } else { // not logged in: Response::redirect_303("/auth/login") -- 2.49.0 From 8750d97093e9a2267774eb30e8b5d62a74705182 Mon Sep 17 00:00:00 2001 From: notplants Date: Mon, 27 Jun 2022 14:57:44 -0400 Subject: [PATCH 2/2] Run cargo clippy --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 21807a0..ef02c17 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1079,7 +1079,7 @@ dependencies = [ [[package]] name = "golgi" version = "0.1.4" -source = "git+https://git.coopcloud.tech/golgi-ssb/golgi#ca4c1114ddf328b818144c5a1af0187b1357e9be" +source = "git+https://git.coopcloud.tech/golgi-ssb/golgi.git#ca4c1114ddf328b818144c5a1af0187b1357e9be" dependencies = [ "async-std", "async-stream 0.3.3", -- 2.49.0