fix jellyfin auth

1 files changed, 19 insertions, 2 deletions

diff --git a/server/src/routes/ui/account/session/guard.rs b/server/src/routes/ui/account/session/guard.rs
index 3a3f6d7..f85dace 100644
--- a/server/src/routes/ui/account/session/guard.rs
+++ b/server/src/routes/ui/account/session/guard.rs
@@ -23,8 +23,14 @@ impl Session {
         {
             let token = req
                 .query_value("session")
-                .or(req.query_value("api_key"))
-                .or(req.headers().get_one("X-MediaBrowser-Token").map(Ok)) // for jellyfin compat
+                .or_else(|| req.query_value("api_key"))
+                .or_else(|| req.headers().get_one("X-MediaBrowser-Token").map(Ok))
+                .or_else(|| {
+                    req.headers()
+                        .get_one("Authorization")
+                        .and_then(parse_jellyfin_auth)
+                        .map(Ok)
+                }) // for jellyfin compat
                 .map(|e| e.expect("str parse should not fail, right?"))
                 .or(req.cookies().get("session").map(|cookie| cookie.value()))
                 .ok_or(anyhow!("not logged in"))?;
@@ -45,6 +51,17 @@ impl Session {
     }
 }
 
+fn parse_jellyfin_auth(h: &str) -> Option<&str> {
+    for tok in h.split(" ") {
+        if let Some(tok) = tok.strip_prefix("Token=\"") {
+            if let Some(tok) = tok.strip_suffix("\"") {
+                return Some(tok);
+            }
+        }
+    }
+    None
+}
+
 #[async_trait]
 impl<'r> FromRequest<'r> for Session {
     type Error = MyError;