From 6654fa5e5c3658ae3f8203dcc5ac2f080a089643 Mon Sep 17 00:00:00 2001
From: Luke Frisken <l.frisken@gmail.com>
Date: Mon, 4 Dec 2023 05:45:45 +0400
Subject: [PATCH] Set Max-Age on cookies to persist across sessions

---
 src/disclaimer.rs | 6 ++++--
 src/i18n.rs       | 8 ++++++--
 src/main.rs       | 2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/disclaimer.rs b/src/disclaimer.rs
index e3f8bbb..368fb0c 100644
--- a/src/disclaimer.rs
+++ b/src/disclaimer.rs
@@ -6,7 +6,6 @@ use crate::{
     templates::{render, TemplatesWithContext},
 };
 use axum::{
-    body::Body,
     middleware::Next,
     response::{IntoResponse, Redirect, Response},
 };
@@ -21,6 +20,9 @@ const DISCLAIMER_COOKIE_NAME: &str = "disclaimer";
 /// accepted the pevious version.
 const DISCLAIMER_VERSION: u32 = 1;
 
+/// The Max-Age property for the cookie (in seconds).
+const DISCLAIMER_COOKIE_MAX_AGE_SECONDS: u64 = 365 * 24 * 60 * 60;
+
 /// Handler to accept the disclaimer by setting a cookie [`DISCLAIMER_COOKIE_NAME`].
 pub async fn handler(headers: HeaderMap) -> axum::response::Result<impl IntoResponse> {
     let referer_str = headers
@@ -32,7 +34,7 @@ pub async fn handler(headers: HeaderMap) -> axum::response::Result<impl IntoResp
         .map_err(map_eyre_error)?;
 
     let mut response = Redirect::to(referer_str).into_response();
-    let value = HeaderValue::from_str(&format!("{DISCLAIMER_COOKIE_NAME}=v{DISCLAIMER_VERSION}"))
+    let value = HeaderValue::from_str(&format!("{DISCLAIMER_COOKIE_NAME}=v{DISCLAIMER_VERSION}; Max-Age={DISCLAIMER_COOKIE_MAX_AGE_SECONDS}"))
         .map_err(map_std_error)?;
     response.headers_mut().insert(SET_COOKIE, value);
     Ok(response)
diff --git a/src/i18n.rs b/src/i18n.rs
index 565f69c..e0c7e0c 100644
--- a/src/i18n.rs
+++ b/src/i18n.rs
@@ -82,6 +82,8 @@ pub struct Query {
 
 /// The name of the cookie used to store the user selected language.
 const LANG_COOKIE_NAME: &str = "lang";
+/// The Max-Age property for the cookie (in seconds).
+const LANG_COOKIE_MAX_AGE_SECONDS: u64 = 365 * 24 * 60 * 60;
 
 /// Handler to select a language by setting the [`LANG_COOKIE_NAME`] cookie.
 pub async fn handler(
@@ -97,8 +99,10 @@ pub async fn handler(
         .map_err(map_eyre_error)?;
     let mut response = Redirect::to(referer_str).into_response();
     let lang = query.lang;
-    let value =
-        HeaderValue::from_str(&format!("{LANG_COOKIE_NAME}={lang}")).map_err(map_std_error)?;
+    let value = HeaderValue::from_str(&format!(
+        "{LANG_COOKIE_NAME}={lang}; Max-Age={LANG_COOKIE_MAX_AGE_SECONDS}"
+    ))
+    .map_err(map_std_error)?;
     response.headers_mut().insert(SET_COOKIE, value);
     Ok(response)
 }
diff --git a/src/main.rs b/src/main.rs
index 58a6e10..72b649a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -118,7 +118,7 @@ async fn main() -> eyre::Result<()> {
                 .route("/", get(index::handler))
                 .route("/forecasts/:file_name", get(forecasts::handler))
                 .nest("/observations", observations::router())
-                .layer(middleware::from_fn(disclaimer::middleware))
+                .layer(middleware::from_fn(disclaimer::middleware)),
         )
         .nest("/diagrams", diagrams::router())
         .nest("/forecast-areas", forecast_areas::router())