From 8e22ea66e37e245cbd083e3c96b8f7fd40a09618 Mon Sep 17 00:00:00 2001
From: Tobie Morgan Hitchcock <tobie@surrealdb.com>
Date: Mon, 11 Sep 2023 19:10:46 +0100
Subject: [PATCH] Ensure invalid sessions do not cause live queries to fail
 (#2672)

---
 lib/src/doc/lives.rs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/src/doc/lives.rs b/lib/src/doc/lives.rs
index 673407f7..79bab72c 100644
--- a/lib/src/doc/lives.rs
+++ b/lib/src/doc/lives.rs
@@ -50,9 +50,15 @@ impl<'a> Document<'a> {
 					false => &self.current,
 				};
 				// Ensure that a session exists on the LIVE query
-				let sess = lv.session.as_ref().ok_or(Error::UnknownAuth)?;
+				let sess = match lv.session.as_ref() {
+					Some(v) => v,
+					None => continue,
+				};
 				// Ensure that auth info exists on the LIVE query
-				let auth = lv.auth.clone().ok_or(Error::UnknownAuth)?;
+				let auth = match lv.auth.clone() {
+					Some(v) => v,
+					None => continue,
+				};
 				// We need to create a new context which we will
 				// use for processing this LIVE query statement.
 				// This ensures that we are using the session
@@ -66,9 +72,7 @@ impl<'a> Document<'a> {
 				// use for processing this LIVE query statement.
 				// This ensures that we are using the auth data
 				// of the user who created the LIVE query.
-				let lqopt = Options::new_with_perms(opt, true)
-					.with_auth_enabled(true)
-					.with_auth(Arc::from(auth));
+				let lqopt = opt.new_with_perms(true).with_auth(Arc::from(auth));
 				// Add $before, $after, $value, and $event params
 				// to this LIVE query so that user can use these
 				// within field projections and WHERE clauses.