From 97c83833135cdd6703653c49c6cf069cfc68d04f Mon Sep 17 00:00:00 2001
From: eraden <adrian.wozniak@ita-prog.pl>
Date: Tue, 15 Aug 2023 17:57:00 +0200
Subject: [PATCH] Fix bearer prefix

---
 crates/actix-jwt-session/src/lib.rs                |  5 ++++-
 crates/oswilno-parking-space/src/lib.rs            | 12 +++++++++++-
 crates/oswilno-view/templates/nav/links-large.html | 12 +++++++++++-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/crates/actix-jwt-session/src/lib.rs b/crates/actix-jwt-session/src/lib.rs
index ae0d521..705193a 100644
--- a/crates/actix-jwt-session/src/lib.rs
+++ b/crates/actix-jwt-session/src/lib.rs
@@ -202,7 +202,10 @@ impl Extractor {
             .to_str()
             .map_err(|_| Error::NoAuthHeader)?;
 
-        let as_str = as_str.strip_prefix("Bearer ").or_else(|| as_str.strip_prefix("bearer ")).unwrap_or(as_str);
+        let as_str = as_str
+            .strip_prefix("Bearer ")
+            .or_else(|| as_str.strip_prefix("bearer "))
+            .unwrap_or(as_str);
 
         let decoded_claims =
             decode::<ClaimsType>(as_str, &*jwt_decoding_key, &Validation::new(algorithm)).map_err(
diff --git a/crates/oswilno-parking-space/src/lib.rs b/crates/oswilno-parking-space/src/lib.rs
index b736f8a..ac8176d 100644
--- a/crates/oswilno-parking-space/src/lib.rs
+++ b/crates/oswilno-parking-space/src/lib.rs
@@ -50,7 +50,17 @@ async fn all_parking_spaces(
 
     HttpResponse::Ok().body(
         if is_partial(&req) {
-            parking_spaces.render()
+            Main {
+                body: parking_spaces,
+                opts: MainOpts {
+                    session: session.into_option().map(|s| SessionOpts {
+                        login: s.subject.to_owned(),
+                        profile_image_url: None,
+                    }),
+                    ..Default::default()
+                },
+            }
+            .render()
         } else {
             Layout {
                 main: Main {
diff --git a/crates/oswilno-view/templates/nav/links-large.html b/crates/oswilno-view/templates/nav/links-large.html
index a15d097..ccb9ff4 100644
--- a/crates/oswilno-view/templates/nav/links-large.html
+++ b/crates/oswilno-view/templates/nav/links-large.html
@@ -5,6 +5,8 @@
 				href="/"
 				hx-get="/"
 				hx-replace-url="true"
+				hx-headers='{"Accept":"text/html-partial"}'
+				hx-target="main"
 				class="block py-2 pl-3 pr-4 text-white bg-blue-700 rounded md:bg-transparent md:text-blue-700 md:p-0 md:dark:text-blue-500"
 				aria-current="page"
 			>
@@ -12,7 +14,15 @@
 			</a>
 		</li>
 		<li>
-			<a href="#" class="block py-2 pl-3 pr-4 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-blue-700 md:p-0 dark:text-white md:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700">About</a>
+			<a 
+				href="#" 
+				hx-replace-url="true"
+				hx-headers='{"Accept":"text/html-partial"}'
+				hx-target="main"
+				class="block py-2 pl-3 pr-4 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-blue-700 md:p-0 dark:text-white md:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700"
+				>
+				About
+			</a>
 		</li>
 		<li>
 			<a href="#" class="block py-2 pl-3 pr-4 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-blue-700 md:p-0 dark:text-white md:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700">Services</a>