Fix loop when entering incorrect url (#1515)

timmo001 · Mar 20, 2021 · 7ac8a4e · 7ac8a4e
1 parent 2557a8b
commit 7ac8a4e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/frontend/src/Components/HomeAssistant/HomeAssistant.tsx b/frontend/src/Components/HomeAssistant/HomeAssistant.tsx
@@ -84,7 +84,9 @@ export async function loadTokens(): Promise<AuthData | null | undefined> {
 }
 
 export function saveTokens(tokens?: AuthData | null): void {
- localStorage.setItem("hass_tokens", JSON.stringify(tokens));
+ if (tokens) {
+ localStorage.setItem("hass_tokens", JSON.stringify(tokens));
+ }
 }
 
 export function handleChange(
@@ -161,7 +163,6 @@ function HomeAssistant(props: HomeAssistantProps): null {
  const connectToHASS = useCallback(() => {
  if (!connection)
  (async (): Promise<void> => {
- localStorage.setItem("hass_url", props.url);
  auth = await getAuth({
  hassUrl: props.url,
  saveTokens: saveTokens,

diff --git a/frontend/src/Components/HomeAssistant/Utils/Auth.tsx b/frontend/src/Components/HomeAssistant/Utils/Auth.tsx
@@ -92,7 +92,8 @@ export async function parseTokens(): Promise<void> {
  const state = decodeOAuthState(query.state);
  data = await fetchToken(state.hassUrl, state.clientId, query.code);
  if (data) {
- await saveTokens(data);
+ localStorage.setItem("hass_url", state.hassUrl);
+ saveTokens(data);
  window.location.replace(
  window.location.href.replace(window.location.search, "")
  );

diff --git a/frontend/src/Components/Main.tsx b/frontend/src/Components/Main.tsx
@@ -78,13 +78,13 @@ function Main(props: MainProps): ReactElement {
  }, []);
 
  useEffect(() => {
- // if (hassConnection === -2) {
- //  const haUrl = localStorage.getItem("hass_url");
- //  if (haUrl) {
- //  setHassUrl(haUrl);
- //  setHassConnection(-1);
- //  }
- // }
+ if (hassConnection === -2) {
+ const haUrl = localStorage.getItem("hass_url");
+ if (haUrl) {
+ setHassUrl(haUrl);
+ setHassConnection(-1);
+ }
+ }
  }, [hassConnection]);
 
  function handleUpdateConfig(path: (string | number)[], data?: unknown): void {