From 7d6fdeaf517918ffa916347b3a2ea1d4655f4364 Mon Sep 17 00:00:00 2001
From: Kevin COMBRIAT <kevin.combriat@ifsalpha.com>
Date: Mon, 4 Jul 2022 19:38:23 -0400
Subject: [PATCH] Web clients: Remove auth from clients for the moment

---
 crates/lgn-electron/electron/src/main.ts      |   4 +-
 .../lgn-analytics-gui/src/electron/main.cjs   |   4 +-
 .../src/routes/__layout.svelte                |  20 ++--
 .../src/components/ResourceBrowser.svelte     |  32 ++++--
 .../localChanges/LocalChanges.svelte          |  10 +-
 .../propertyGrid/PropertyGrid.svelte          |   2 +-
 .../resources/CreateResourceModal.svelte      |   7 +-
 npm-pkgs/lgn-editor-gui/src/electron/main.cjs |   4 +-
 .../src/orchestrators/allActiveScenes.ts      |   2 +-
 .../src/orchestrators/allResources.ts         |   8 +-
 .../src/orchestrators/currentResource.ts      |   4 +-
 .../src/orchestrators/selection.ts            |   8 +-
 .../lgn-editor-gui/src/routes/__layout.svelte |  18 +--
 .../lgn-editor-gui/src/routes/index.svelte    |  10 +-
 npm-pkgs/lgn-editor-gui/src/stores/log.ts     |   4 +-
 .../propertyGrid/PropertyGrid.test.ts         |   2 +-
 .../__snapshots__/PropertyGrid.test.ts.snap   |   2 +-
 npm-pkgs/lgn-runtime-gui/src/App.svelte       |   7 +-
 .../lgn-runtime-gui/src/electron/main.cjs     |   4 +-
 npm-pkgs/lgn-web-client/src/lib/auth/index.ts |  34 +++---
 npm-pkgs/lgn-web-client/src/lib/client.ts     | 106 ++++++++++--------
 npm-pkgs/lgn-web-client/src/lib/errors.ts     |   2 +-
 22 files changed, 179 insertions(+), 115 deletions(-)

diff --git a/crates/lgn-electron/electron/src/main.ts b/crates/lgn-electron/electron/src/main.ts
index 7d23b35c2c..377dc85b68 100644
--- a/crates/lgn-electron/electron/src/main.ts
+++ b/crates/lgn-electron/electron/src/main.ts
@@ -51,7 +51,7 @@ function createWindow() {
     mainWindow.loadURL(configuration.source.value).catch((error) => {
       console.error(
         "electron::start",
-        `An error occured while loading the ${configuration.source.value} url: `,
+        `An error occurred while loading the ${configuration.source.value} url: `,
         error
       );
     });
@@ -59,7 +59,7 @@ function createWindow() {
     loadUrl(mainWindow).catch((error) => {
       console.error(
         "electron::start",
-        `An error occured while loading the index.html file located under ${configuration.source.value}: `,
+        `An error occurred while loading the index.html file located under ${configuration.source.value}: `,
         error
       );
     });
diff --git a/npm-pkgs/lgn-analytics-gui/src/electron/main.cjs b/npm-pkgs/lgn-analytics-gui/src/electron/main.cjs
index 09125dc41d..716bb62057 100644
--- a/npm-pkgs/lgn-analytics-gui/src/electron/main.cjs
+++ b/npm-pkgs/lgn-analytics-gui/src/electron/main.cjs
@@ -44,7 +44,7 @@ const createWindow = () => {
     mainWindow.loadURL(devUrl).catch((error) => {
       console.error(
         "electron::start",
-        `An error occured while loading the ${devUrl} url: `,
+        `An error occurred while loading the ${devUrl} url: `,
         error
       );
     });
@@ -52,7 +52,7 @@ const createWindow = () => {
     loadUrl(mainWindow).catch((error) => {
       console.error(
         "electron::start",
-        `An error occured while loading the index.html file located under ${indexHtmlDirPath}: `,
+        `An error occurred while loading the index.html file located under ${indexHtmlDirPath}: `,
         error
       );
     });
diff --git a/npm-pkgs/lgn-analytics-gui/src/routes/__layout.svelte b/npm-pkgs/lgn-analytics-gui/src/routes/__layout.svelte
index 928380fe4d..9964c1042e 100644
--- a/npm-pkgs/lgn-analytics-gui/src/routes/__layout.svelte
+++ b/npm-pkgs/lgn-analytics-gui/src/routes/__layout.svelte
@@ -179,7 +179,11 @@
   // TODO: Here we can control the UI and display a modal or change the page content
   onMount(() => {
     if (initAuthStatus?.type === "error") {
-      window.location.href = initAuthStatus.authorizationUrl;
+      if (initAuthStatus.authorizationUrl) {
+        window.location.href = initAuthStatus.authorizationUrl;
+      } else {
+        log.warn("auth", "User is not authed");
+      }
     }
 
     const unsubscribe = theme.subscribe(({ name }) => {
@@ -194,16 +198,16 @@
   });
 </script>
 
-{#if initAuthStatus?.type !== "error"}
-  <Notifications store={notifications} />
+<!-- {#if initAuthStatus?.type !== "error"} -->
+<Notifications store={notifications} />
 
-  <LoadingBar />
+<LoadingBar />
 
-  <div class="layout">
-    <slot />
-  </div>
-{/if}
+<div class="layout">
+  <slot />
+</div>
 
+<!-- {/if} -->
 <style lang="postcss">
   .layout {
     @apply antialiased w-full flex flex-col;
diff --git a/npm-pkgs/lgn-editor-gui/src/components/ResourceBrowser.svelte b/npm-pkgs/lgn-editor-gui/src/components/ResourceBrowser.svelte
index 4547a3b25a..25af6b0e24 100644
--- a/npm-pkgs/lgn-editor-gui/src/components/ResourceBrowser.svelte
+++ b/npm-pkgs/lgn-editor-gui/src/components/ResourceBrowser.svelte
@@ -120,12 +120,12 @@
         payload: {
           type: "raw",
           title: "Resources",
-          message: "An error occured while renaming the resource",
+          message: "An error occurred while renaming the resource",
         },
       });
 
       log.error(
-        log.json`An error occured while renaming the resource ${entry.item}: ${error}`
+        log.json`An error occurred while renaming the resource ${entry.item}: ${error}`
       );
     }
   }
@@ -218,7 +218,11 @@
       );
 
       if (newResource) {
-        await fetchAllResources();
+        try {
+          await fetchAllResources();
+        } catch (error) {
+          log.error("resources", displayError(error));
+        }
 
         if (newResource.new_id) {
           const entry = $resourceEntries.find(
@@ -341,7 +345,11 @@
           sourceId: $currentResourceDescriptionEntry.item.id,
         });
 
-        await fetchAllResources();
+        try {
+          await fetchAllResources();
+        } catch (error) {
+          log.error("resources", displayError(error));
+        }
 
         if (newResource) {
           const entry = $resourceEntries.find(
@@ -396,7 +404,11 @@
           ids: [$currentResourceDescriptionEntry.item.id],
         });
 
-        await fetchAllResources();
+        try {
+          await fetchAllResources();
+        } catch (error) {
+          log.error("resources", displayError(error));
+        }
 
         break;
       }
@@ -497,7 +509,11 @@
       newPath,
     });
 
-    await fetchAllResources();
+    try {
+      await fetchAllResources();
+    } catch (error) {
+      log.error("resources", displayError(error));
+    }
   }
 
   function openRemoveResourcePrompt(symbolKey: string) {
@@ -544,12 +560,12 @@
         payload: {
           type: "raw",
           title: "Resources",
-          message: "An error occured while removing the resource",
+          message: "An error occurred while removing the resource",
         },
       });
 
       log.error(
-        log.json`An error occured while removing the resource ${$currentResourceDescriptionEntry.item}: ${error}`
+        log.json`An error occurred while removing the resource ${$currentResourceDescriptionEntry.item}: ${error}`
       );
     }
   }
diff --git a/npm-pkgs/lgn-editor-gui/src/components/localChanges/LocalChanges.svelte b/npm-pkgs/lgn-editor-gui/src/components/localChanges/LocalChanges.svelte
index f6269e3f65..01d3481e3a 100644
--- a/npm-pkgs/lgn-editor-gui/src/components/localChanges/LocalChanges.svelte
+++ b/npm-pkgs/lgn-editor-gui/src/components/localChanges/LocalChanges.svelte
@@ -1,5 +1,7 @@
 <script lang="ts">
   import { PanelHeader } from "@lgn/web-client/src/components/panel";
+  import { displayError } from "@lgn/web-client/src/lib/errors";
+  import log from "@lgn/web-client/src/lib/log";
   import { filterContextMenuEvents } from "@lgn/web-client/src/types/contextMenu";
   import type { ContextMenuEvent } from "@lgn/web-client/src/types/contextMenu";
 
@@ -29,7 +31,13 @@
           await revertResources({
             ids: [$selectedLocalChange.info.id],
           });
-          await fetchAllResources();
+
+          try {
+            await fetchAllResources();
+          } catch (error) {
+            log.error("resources", displayError(error));
+          }
+
           break;
         }
       }
diff --git a/npm-pkgs/lgn-editor-gui/src/components/propertyGrid/PropertyGrid.svelte b/npm-pkgs/lgn-editor-gui/src/components/propertyGrid/PropertyGrid.svelte
index fe45044d98..61350f5466 100644
--- a/npm-pkgs/lgn-editor-gui/src/components/propertyGrid/PropertyGrid.svelte
+++ b/npm-pkgs/lgn-editor-gui/src/components/propertyGrid/PropertyGrid.svelte
@@ -138,7 +138,7 @@
     <PropertyGridHeader resources={[$currentResource]} {search} />
   {/if}
   {#if $currentResourceError}
-    <div class="italic">An error occured</div>
+    <div class="italic">An error occurred</div>
   {:else if !$currentResource}
     <div class="italic">No resource selected</div>
   {:else if !$currentResource.properties.length}
diff --git a/npm-pkgs/lgn-editor-gui/src/components/resources/CreateResourceModal.svelte b/npm-pkgs/lgn-editor-gui/src/components/resources/CreateResourceModal.svelte
index aab1a80605..29bfe16381 100644
--- a/npm-pkgs/lgn-editor-gui/src/components/resources/CreateResourceModal.svelte
+++ b/npm-pkgs/lgn-editor-gui/src/components/resources/CreateResourceModal.svelte
@@ -5,6 +5,7 @@
   import type { Common, ResourceBrowser } from "@lgn/api/editor";
   import Button from "@lgn/web-client/src/components/Button.svelte";
   import Modal from "@lgn/web-client/src/components/modal/Modal.svelte";
+  import { displayError } from "@lgn/web-client/src/lib/errors";
   import log from "@lgn/web-client/src/lib/log";
   import { createAsyncStoreOrchestrator } from "@lgn/web-client/src/orchestrators/async";
 
@@ -73,7 +74,11 @@
 
       close();
 
-      await fetchAllResources();
+      try {
+        await fetchAllResources();
+      } catch (error) {
+        log.error("resources", displayError(error));
+      }
     });
   }
 </script>
diff --git a/npm-pkgs/lgn-editor-gui/src/electron/main.cjs b/npm-pkgs/lgn-editor-gui/src/electron/main.cjs
index 602aed6fda..f7f0e7340e 100644
--- a/npm-pkgs/lgn-editor-gui/src/electron/main.cjs
+++ b/npm-pkgs/lgn-editor-gui/src/electron/main.cjs
@@ -42,7 +42,7 @@ const createWindow = () => {
     mainWindow.loadURL(devUrl).catch((error) => {
       console.error(
         "electron::start",
-        `An error occured while loading the ${devUrl} url: `,
+        `An error occurred while loading the ${devUrl} url: `,
         error
       );
     });
@@ -50,7 +50,7 @@ const createWindow = () => {
     loadUrl(mainWindow).catch((error) => {
       console.error(
         "electron::start",
-        `An error occured while loading the index.html file located under ${indexHtmlDirPath}: `,
+        `An error occurred while loading the index.html file located under ${indexHtmlDirPath}: `,
         error
       );
     });
diff --git a/npm-pkgs/lgn-editor-gui/src/orchestrators/allActiveScenes.ts b/npm-pkgs/lgn-editor-gui/src/orchestrators/allActiveScenes.ts
index 24073bf75c..5b903bdb9c 100644
--- a/npm-pkgs/lgn-editor-gui/src/orchestrators/allActiveScenes.ts
+++ b/npm-pkgs/lgn-editor-gui/src/orchestrators/allActiveScenes.ts
@@ -96,7 +96,7 @@ export const { error: allActiveScenesError } = allActiveSceneIdsOrchestrator;
 
 export async function fetchAllActiveScenes() {
   try {
-    return allActiveSceneIdsOrchestrator.run(getActiveSceneIds);
+    return await allActiveSceneIdsOrchestrator.run(getActiveSceneIds);
   } catch (error) {
     allActiveScenesOrchestrator.error.set(error);
   }
diff --git a/npm-pkgs/lgn-editor-gui/src/orchestrators/allResources.ts b/npm-pkgs/lgn-editor-gui/src/orchestrators/allResources.ts
index e3ee1f74b2..3e3907912e 100644
--- a/npm-pkgs/lgn-editor-gui/src/orchestrators/allResources.ts
+++ b/npm-pkgs/lgn-editor-gui/src/orchestrators/allResources.ts
@@ -1,4 +1,6 @@
 import type { Common } from "@lgn/api/editor";
+import { displayError } from "@lgn/web-client/src/lib/errors";
+import log from "@lgn/web-client/src/lib/log";
 import type { AsyncOrchestrator } from "@lgn/web-client/src/orchestrators/async";
 import { createAsyncStoreListOrchestrator } from "@lgn/web-client/src/orchestrators/async";
 
@@ -23,7 +25,11 @@ export async function fetchAllResources(name?: string) {
     getAllResources(name)
   );
 
-  await fetchStagedResources();
+  try {
+    await fetchStagedResources();
+  } catch (error) {
+    log.error("staged-resources", displayError(error));
+  }
 
   return allResources;
 }
diff --git a/npm-pkgs/lgn-editor-gui/src/orchestrators/currentResource.ts b/npm-pkgs/lgn-editor-gui/src/orchestrators/currentResource.ts
index 469a63440c..548b08cb1c 100644
--- a/npm-pkgs/lgn-editor-gui/src/orchestrators/currentResource.ts
+++ b/npm-pkgs/lgn-editor-gui/src/orchestrators/currentResource.ts
@@ -45,12 +45,12 @@ export async function fetchCurrentResourceDescription(
       payload: {
         type: "raw",
         title: "Resources",
-        message: "An error occured while loading the resource",
+        message: "An error occurred while loading the resource",
       },
     });
 
     log.error(
-      log.json`An error occured while loading the resource ${id}: ${error}`
+      log.json`An error occurred while loading the resource ${id}: ${error}`
     );
   }
 }
diff --git a/npm-pkgs/lgn-editor-gui/src/orchestrators/selection.ts b/npm-pkgs/lgn-editor-gui/src/orchestrators/selection.ts
index ca0f94f955..d3d8dc7a98 100644
--- a/npm-pkgs/lgn-editor-gui/src/orchestrators/selection.ts
+++ b/npm-pkgs/lgn-editor-gui/src/orchestrators/selection.ts
@@ -20,12 +20,12 @@ import {
 export function initMessageStream() {
   async function rec(): Promise<void> {
     const message = await getLastMessage().catch((error) => {
-      log.error("messages", `An error occured: ${displayError(error)}`);
+      log.error("messages", `An error occurred: ${displayError(error)}`);
     });
 
     if (!message) {
       return rec().catch((error) => {
-        log.error("messages", `An error occured: ${displayError(error)}`);
+        log.error("messages", `An error occurred: ${displayError(error)}`);
       });
     }
 
@@ -76,12 +76,12 @@ export function initMessageStream() {
     }
 
     await rec().catch((error) => {
-      log.error("messages", `An error occured: ${displayError(error)}`);
+      log.error("messages", `An error occurred: ${displayError(error)}`);
     });
   }
 
   rec().catch((error) =>
-    log.error("messages", `An error occured: ${displayError(error)}`)
+    log.error("messages", `An error occurred: ${displayError(error)}`)
   );
 
   return () => {
diff --git a/npm-pkgs/lgn-editor-gui/src/routes/__layout.svelte b/npm-pkgs/lgn-editor-gui/src/routes/__layout.svelte
index 6f513d9755..8f11faa397 100644
--- a/npm-pkgs/lgn-editor-gui/src/routes/__layout.svelte
+++ b/npm-pkgs/lgn-editor-gui/src/routes/__layout.svelte
@@ -203,7 +203,11 @@
 
   onMount(async () => {
     if ($authStatus?.type === "error") {
-      window.location.href = $authStatus.authorizationUrl;
+      if ($authStatus.authorizationUrl) {
+        window.location.href = $authStatus.authorizationUrl;
+      } else {
+        log.warn("auth", "User is not authed");
+      }
     }
 
     const initLogStreamSubscriptions = initLogStreams();
@@ -271,12 +275,12 @@
   });
 </script>
 
-{#if $authStatus?.type !== "error"}
-  <ModalContainer store={modal} />
+<!-- {#if $authStatus?.type !== "error"} -->
+<ModalContainer store={modal} />
 
-  <ContextMenu store={contextMenu} />
+<ContextMenu store={contextMenu} />
 
-  <Notifications store={notifications} />
+<Notifications store={notifications} />
 
-  <slot />
-{/if}
+<slot />
+<!-- {/if} -->
diff --git a/npm-pkgs/lgn-editor-gui/src/routes/index.svelte b/npm-pkgs/lgn-editor-gui/src/routes/index.svelte
index 567d48b33d..dbf9ed282f 100644
--- a/npm-pkgs/lgn-editor-gui/src/routes/index.svelte
+++ b/npm-pkgs/lgn-editor-gui/src/routes/index.svelte
@@ -14,6 +14,8 @@
   import Layout from "@lgn/web-client/src/components/layout/Layout.svelte";
   import type { MenuItemDescription } from "@lgn/web-client/src/components/menu/lib/MenuItemDescription";
   import { EmptyPanel, Panel } from "@lgn/web-client/src/components/panel";
+  import { displayError } from "@lgn/web-client/src/lib/errors";
+  import log from "@lgn/web-client/src/lib/log";
 
   import { closeScene } from "@/api";
   import DynamicPanel from "@/components/DynamicPanel.svelte";
@@ -49,14 +51,14 @@
   });
 
   $: if ($allResourcesError) {
-    refetchResources().catch(() => {
-      // TODO: Handle errors
+    refetchResources().catch((error) => {
+      log.error("resources", displayError(error));
     });
   }
 
   onMount(async () => {
-    refetchResources().catch(() => {
-      // TODO: Handle errors
+    refetchResources().catch((error) => {
+      log.error("resources", displayError(error));
     });
 
     await fetchAllActiveScenes();
diff --git a/npm-pkgs/lgn-editor-gui/src/stores/log.ts b/npm-pkgs/lgn-editor-gui/src/stores/log.ts
index 8eef7ef517..38f45883d6 100644
--- a/npm-pkgs/lgn-editor-gui/src/stores/log.ts
+++ b/npm-pkgs/lgn-editor-gui/src/stores/log.ts
@@ -58,7 +58,7 @@ export function initLogStreams() {
         processLogStreamResponse(traceEventsResponse.value, "editor");
       })
       .catch((error) => {
-        log.error("log::editor", `an error occured: ${displayError(error)}`);
+        log.error("log::editor", `an error ocurred: ${displayError(error)}`);
       });
   }, 2_000);
 
@@ -68,7 +68,7 @@ export function initLogStreams() {
         processLogStreamResponse(traceEventsResponse.value, "runtime");
       })
       .catch((error) => {
-        log.error("log::runtime", `an error occured: ${displayError(error)}`);
+        log.error("log::runtime", `an error ocurred: ${displayError(error)}`);
       });
   }, 2_000);
 
diff --git a/npm-pkgs/lgn-editor-gui/tests/components/propertyGrid/PropertyGrid.test.ts b/npm-pkgs/lgn-editor-gui/tests/components/propertyGrid/PropertyGrid.test.ts
index 5a06ab4ac3..14d769f01d 100644
--- a/npm-pkgs/lgn-editor-gui/tests/components/propertyGrid/PropertyGrid.test.ts
+++ b/npm-pkgs/lgn-editor-gui/tests/components/propertyGrid/PropertyGrid.test.ts
@@ -18,7 +18,7 @@ describe("PropertyGrid", () => {
   });
 
   test("renders properly with an error", () => {
-    currentResource.error.set("Ooops, an error occured");
+    currentResource.error.set("Ooops, an error occurred");
 
     const { container } = render(PropertyGrid);
 
diff --git a/npm-pkgs/lgn-editor-gui/tests/components/propertyGrid/__snapshots__/PropertyGrid.test.ts.snap b/npm-pkgs/lgn-editor-gui/tests/components/propertyGrid/__snapshots__/PropertyGrid.test.ts.snap
index 21230b11b9..91086ec0fe 100644
--- a/npm-pkgs/lgn-editor-gui/tests/components/propertyGrid/__snapshots__/PropertyGrid.test.ts.snap
+++ b/npm-pkgs/lgn-editor-gui/tests/components/propertyGrid/__snapshots__/PropertyGrid.test.ts.snap
@@ -10,7 +10,7 @@ exports[`PropertyGrid > renders properly with an error 1`] = `
       <div
         class="italic"
       >
-        An error occured
+        An error occurred
       </div>
     </div>
   </div>
diff --git a/npm-pkgs/lgn-runtime-gui/src/App.svelte b/npm-pkgs/lgn-runtime-gui/src/App.svelte
index cb096d9ad3..4bdbc79997 100644
--- a/npm-pkgs/lgn-runtime-gui/src/App.svelte
+++ b/npm-pkgs/lgn-runtime-gui/src/App.svelte
@@ -2,6 +2,7 @@
   import { onMount } from "svelte";
 
   import type { InitAuthStatus } from "@lgn/web-client/src/lib/auth";
+  import log from "@lgn/web-client/src/lib/log";
 
   import Home from "@/pages/Home.svelte";
 
@@ -14,7 +15,11 @@
     if (initAuthStatus) {
       switch (initAuthStatus.type) {
         case "error": {
-          window.location.href = initAuthStatus.authorizationUrl;
+          if (initAuthStatus.authorizationUrl !== null) {
+            window.location.href = initAuthStatus.authorizationUrl;
+          } else {
+            log.warn("auth", "User is not authed");
+          }
         }
       }
     }
diff --git a/npm-pkgs/lgn-runtime-gui/src/electron/main.cjs b/npm-pkgs/lgn-runtime-gui/src/electron/main.cjs
index d8273311e2..9303bdb243 100644
--- a/npm-pkgs/lgn-runtime-gui/src/electron/main.cjs
+++ b/npm-pkgs/lgn-runtime-gui/src/electron/main.cjs
@@ -42,7 +42,7 @@ const createWindow = () => {
     mainWindow.loadURL(devUrl).catch((error) => {
       console.error(
         "electron::start",
-        `An error occured while loading the ${devUrl} url: `,
+        `An error occurred while loading the ${devUrl} url: `,
         error
       );
     });
@@ -50,7 +50,7 @@ const createWindow = () => {
     loadUrl(mainWindow).catch((error) => {
       console.error(
         "electron::start",
-        `An error occured while loading the index.html file located under ${indexHtmlDirPath}: `,
+        `An error occurred while loading the index.html file located under ${indexHtmlDirPath}: `,
         error
       );
     });
diff --git a/npm-pkgs/lgn-web-client/src/lib/auth/index.ts b/npm-pkgs/lgn-web-client/src/lib/auth/index.ts
index 3037cc0b42..cf199c7c9a 100644
--- a/npm-pkgs/lgn-web-client/src/lib/auth/index.ts
+++ b/npm-pkgs/lgn-web-client/src/lib/auth/index.ts
@@ -429,20 +429,24 @@ export class LegionClient extends Client<UserInfo> {
   async getAuthorizationUrl() {
     const { challenge, verifier } = await PkceChallenge.newRandomSha256();
 
-    const authorizeUrl = authClient.authorizeUrl({
-      responseType: "code",
-      scopes: this.loginConfig.scopes,
-      extraParams: this.loginConfig.extraParams,
-      pkceChallenge: challenge,
-    });
+    try {
+      const authorizeUrl = authClient.authorizeUrl({
+        responseType: "code",
+        scopes: this.loginConfig.scopes,
+        extraParams: this.loginConfig.extraParams,
+        pkceChallenge: challenge,
+      });
 
-    localStorage.setItem(this.#authorizeVerifierStorageKey, verifier);
+      localStorage.setItem(this.#authorizeVerifierStorageKey, verifier);
 
-    if (location.origin === authClient.redirectUri?.origin) {
-      localStorage.setItem(this.#targetUrlStorageKey, location.href);
-    }
+      if (location.origin === authClient.redirectUri?.origin) {
+        localStorage.setItem(this.#targetUrlStorageKey, location.href);
+      }
 
-    return authorizeUrl;
+      return authorizeUrl;
+    } catch {
+      return null;
+    }
   }
 
   getTargetUrl(): URL | null {
@@ -525,7 +529,7 @@ export type InitAuthStatus =
   // User is authed or could be authed
   | { type: "success" }
   // User is
-  | { type: "error"; authorizationUrl: string };
+  | { type: "error"; authorizationUrl: string | null };
 
 export let authClient: LegionClient;
 
@@ -646,7 +650,7 @@ export async function initAuth({
     }
   } catch (error) {
     log.warn(
-      `An error occured while trying to get the client token set ${displayError(
+      `An error occurred while trying to get the client token set ${displayError(
         error
       )}`
     );
@@ -672,7 +676,7 @@ export async function initAuth({
       authClient.storeClientTokenSet(await authClient.refreshClientTokenSet());
     } catch (error) {
       log.warn(
-        log.json`An error occured while trying to refresh the client token set ${error}`
+        log.json`An error occurred while trying to refresh the client token set ${error}`
       );
 
       return {
@@ -688,7 +692,7 @@ export async function initAuth({
     await userInfo.run(() => authClient.userInfo());
   } catch (error) {
     log.warn(
-      log.json`An error occured while trying to get the user info ${error}`
+      log.json`An error occurred while trying to get the user info ${error}`
     );
 
     return {
diff --git a/npm-pkgs/lgn-web-client/src/lib/client.ts b/npm-pkgs/lgn-web-client/src/lib/client.ts
index ec28670692..b8aea146a1 100644
--- a/npm-pkgs/lgn-web-client/src/lib/client.ts
+++ b/npm-pkgs/lgn-web-client/src/lib/client.ts
@@ -72,7 +72,11 @@ export function enhanceGrpcClient<Client extends object>(
 
             state.clientIsRefreshingToken = false;
 
-            window.location.href = await authClient.getAuthorizationUrl();
+            const authorizationUrl = await authClient.getAuthorizationUrl();
+
+            if (authorizationUrl !== null) {
+              window.location.href = authorizationUrl;
+            }
 
             return;
           }
@@ -101,67 +105,73 @@ export function enhanceGrpcClient<Client extends object>(
  */
 export function addAuthToClient<Client extends ApiClient>(
   client: Client,
-  accessTokenCookieName: string,
-  { minLatency = 5 }: { minLatency?: number } = {}
+  _accessTokenCookieName: string,
+  _: { minLatency?: number } = {}
 ): Client {
-  const state = {
-    clientIsRefreshingToken: false,
-  };
+  return client;
+  // const state = {
+  //   clientIsRefreshingToken: false,
+  // };
 
-  client.addRequestStartInterceptor(async (input, init) => {
-    if (state.clientIsRefreshingToken) {
-      await new Promise<void>((resolve) => {
-        const id = setInterval(() => {
-          if (!state.clientIsRefreshingToken) {
-            clearInterval(id);
-            resolve();
-          }
-        }, minLatency);
-      });
-    }
+  // client.addRequestStartInterceptor(async (input, init) => {
+  //   if (state.clientIsRefreshingToken) {
+  //     await new Promise<void>((resolve) => {
+  //       const id = setInterval(() => {
+  //         if (!state.clientIsRefreshingToken) {
+  //           clearInterval(id);
+  //           resolve();
+  //         }
+  //       }, minLatency);
+  //     });
+  //   }
 
-    let accessToken = getCookie(accessTokenCookieName);
+  //   let accessToken = getCookie(accessTokenCookieName);
 
-    if (accessToken === null) {
-      state.clientIsRefreshingToken = true;
+  //   if (accessToken === null) {
+  //     state.clientIsRefreshingToken = true;
 
-      log.debug(
-        "http-client",
-        "Access token not found, trying to refresh the client token set"
-      );
+  //     log.debug(
+  //       "http-client",
+  //       "Access token not found, trying to refresh the client token set"
+  //     );
 
-      try {
-        const clientTokenSet = await authClient.refreshClientTokenSet();
+  //     try {
+  //       const clientTokenSet = await authClient.refreshClientTokenSet();
 
-        authClient.storeClientTokenSet(clientTokenSet);
+  //       authClient.storeClientTokenSet(clientTokenSet);
 
-        accessToken = clientTokenSet.access_token;
+  //       accessToken = clientTokenSet.access_token;
 
-        state.clientIsRefreshingToken = false;
-      } catch {
-        log.debug(
-          "http-client",
-          "Couldn't refresh the client token set, redirecting to the idp"
-        );
+  //       state.clientIsRefreshingToken = false;
+  //     } catch {
+  //       log.debug(
+  //         "http-client",
+  //         "Couldn't refresh the client token set, redirecting to the idp"
+  //       );
 
-        state.clientIsRefreshingToken = false;
+  //       state.clientIsRefreshingToken = false;
 
-        window.location.href = await authClient.getAuthorizationUrl();
+  //       const authorizationUrl = await authClient.getAuthorizationUrl();
 
-        return [input, init] as [RequestInfo | URL, RequestInit | undefined];
-      }
-    }
+  //       if (authorizationUrl !== null) {
 
-    if (input instanceof Request) {
-      input.headers.set("Authorization", `Bearer ${accessToken}`);
-    }
+  //         window.location.href = authorizationUrl;
+  //       }
 
-    if (init?.headers instanceof Headers) {
-      init.headers.set("Authorization", `Bearer ${accessToken}`);
-    }
+  //       return [input, init] as [RequestInfo | URL, RequestInit | undefined];
+  //     }
+  //   }
 
-    return [input, init] as [RequestInfo | URL, RequestInit | undefined];
-  });
+  //   if (input instanceof Request) {
+  //     input.headers.set("Authorization", `Bearer ${accessToken}`);
+  //   }
 
-  return client;
+  //   if (init?.headers instanceof Headers) {
+  //     init.headers.set("Authorization", `Bearer ${accessToken}`);
+  //   }
+
+  //   return [input, init] as [RequestInfo | URL, RequestInit | undefined];
+  // });
+
+  // return client;
 }
diff --git a/npm-pkgs/lgn-web-client/src/lib/errors.ts b/npm-pkgs/lgn-web-client/src/lib/errors.ts
index 3dd9a2c636..119b93c22c 100644
--- a/npm-pkgs/lgn-web-client/src/lib/errors.ts
+++ b/npm-pkgs/lgn-web-client/src/lib/errors.ts
@@ -9,7 +9,7 @@
  */
 export function displayError(
   error: unknown,
-  defaultMessage = "An unknown error occured"
+  defaultMessage = "An unknown error occurred"
 ) {
   return error instanceof Error
     ? error.message