Fix keep me logged in (#10835)

src/entrypoints/core.ts

@@ -37,21 +37,7 @@ declare global {
   }
 }
 
-const authProm = isExternal
+const clearUrlParams = () => {
-  ? () =>
-      import("../external_app/external_auth").then(({ createExternalAuth }) =>
-        createExternalAuth(hassUrl)
-      )
-  : () =>
-      getAuth({
-        hassUrl,
-        saveTokens,
-        loadTokens: () => Promise.resolve(loadTokens()),
-      });
-
-const connProm = async (auth) => {
-  try {
-    const conn = await createConnection({ auth });
   // Clear auth data from url if we have been able to establish a connection
   if (location.search.includes("auth_callback=1")) {
     const searchParams = new URLSearchParams(location.search);
@@ -68,7 +54,24 @@ const connProm = async (auth) => {
       `${location.pathname}${search ? `?${search}` : ""}`
     );
   }
+};
 
+const authProm = isExternal
+  ? () =>
+      import("../external_app/external_auth").then(({ createExternalAuth }) =>
+        createExternalAuth(hassUrl)
+      )
+  : () =>
+      getAuth({
+        hassUrl,
+        saveTokens,
+        loadTokens: () => Promise.resolve(loadTokens()),
+      });
+
+const connProm = async (auth) => {
+  try {
+    const conn = await createConnection({ auth });
+    clearUrlParams();
     return { auth, conn };
   } catch (err: any) {
     if (err !== ERR_INVALID_AUTH) {
@@ -85,6 +88,7 @@ const connProm = async (auth) => {
     }
     auth = await authProm();
     const conn = await createConnection({ auth });
+    clearUrlParams();
     return { auth, conn };
   }
 };

src/layouts/hass-router-page.ts

@@ -127,7 +127,9 @@ export class HassRouterPage extends ReactiveElement {
 
         // Update the url if we know where we're mounted.
         if (route) {
-          navigate(`${route.prefix}/${result}`, { replace: true });
+          navigate(`${route.prefix}/${result}${location.search}`, {
+            replace: true,
+          });
         }
       }
     }

src/layouts/home-assistant.ts

@@ -51,7 +51,9 @@ export class HomeAssistantAppEl extends QuickBarMixin(HassElement) {
     const path = curPath();
 
     if (["", "/"].includes(path)) {
-      navigate(`/${getStorageDefaultPanelUrlPath()}`, { replace: true });
+      navigate(`/${getStorageDefaultPanelUrlPath()}${location.search}`, {
+        replace: true,
+      });
     }
     this._route = {
       prefix: "",

src/panels/lovelace/hui-root.ts

@@ -698,7 +698,7 @@ class HUIRoot extends LitElement {
 
   private _navigateToView(path: string | number, replace?: boolean) {
     if (!this.lovelace!.editMode) {
-      navigate(`${this.route!.prefix}/${path}`, { replace });
+      navigate(`${this.route!.prefix}/${path}${location.search}`, { replace });
       return;
     }
     navigate(`${this.route!.prefix}/${path}?${addSearchParam({ edit: "1" })}`, {