From 0579faf68e89bc1fbf47156ba55d0954d42871cd Mon Sep 17 00:00:00 2001
From: joshavant <830519+joshavant@users.noreply.github.com>
Date: Thu, 9 Apr 2026 18:46:01 -0500
Subject: [PATCH] UI: simplify settings URL token/session param handling

---
 ui/src/ui/app-settings.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/ui/src/ui/app-settings.ts b/ui/src/ui/app-settings.ts
index aca261174a9..99b675bc188 100644
--- a/ui/src/ui/app-settings.ts
+++ b/ui/src/ui/app-settings.ts
@@ -126,11 +126,10 @@ export function applySettingsFromUrl(host: SettingsHost) {
   // for compatibility with older deep links.
   const queryToken = params.get("token");
   const hashToken = hashParams.get("token");
-  const tokenRaw = hashToken ?? queryToken;
+  const hasTokenParam = hashToken != null || queryToken != null;
   const passwordRaw = params.get("password") ?? hashParams.get("password");
-  const sessionParam = params.get("session") ?? hashParams.get("session");
-  const token = normalizeOptionalString(tokenRaw);
-  const session = normalizeOptionalString(sessionParam);
+  const token = normalizeOptionalString(hashToken ?? queryToken);
+  const session = normalizeOptionalString(params.get("session") ?? hashParams.get("session"));
   const shouldResetSessionForToken = Boolean(token && !session && !gatewayUrlChanged);
   let shouldCleanUrl = false;
 
@@ -139,7 +138,7 @@ export function applySettingsFromUrl(host: SettingsHost) {
     shouldCleanUrl = true;
   }
 
-  if (tokenRaw != null) {
+  if (hasTokenParam) {
     if (queryToken != null) {
       warnQueryToken = true;
       console.warn(