fix(request) avoid using request url in the ui. fixes #289

Signed-off-by: David Edler <david.edler@canonical.com>
canonical · Sep 30, 2024 · 03e5b0e · 03e5b0e
1 parent 3883fa3
commit 03e5b0e
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 24 deletions.
diff --git a/ui/pages/reset_email.tsx b/ui/pages/reset_email.tsx
@@ -36,18 +36,7 @@ const ResetEmail: NextPage = () => {
       .createBrowserRecoveryFlow({
         returnTo: returnTo ? String(returnTo) : undefined,
       })
-      .then(async ({ data }) => {
-        if (data.request_url !== undefined) {
-          await router.push(
-            {
-              pathname: "reset_email",
-              query: { flow: data.id },
-            },
-            `${data.return_to}?flow=${data.id}`,
-            { shallow: true },
-          );
-          return;
-        }
+      .then(({ data }) => {
         setFlow(data);
       })
       .catch(handleFlowError("recovery", setFlow));

diff --git a/ui/pages/reset_password.tsx b/ui/pages/reset_password.tsx
@@ -51,10 +51,6 @@ const ResetPassword: NextPage = () => {
         returnTo: returnTo ? String(returnTo) : undefined,
       })
       .then(({ data }) => {
-        if (data.request_url !== undefined) {
-          window.location.href = data.request_url;
-          return;
-        }
         setFlow(data);
       })
       .catch(handleFlowError("settings", setFlow))

diff --git a/ui/pages/setup_backup_codes.tsx b/ui/pages/setup_backup_codes.tsx
@@ -43,10 +43,6 @@ const SetupBackupCodes: NextPage = () => {
         returnTo: returnTo ? String(returnTo) : undefined,
       })
       .then(({ data }) => {
-        if (data.request_url !== undefined) {
-          window.location.href = `./setup_backup_codes?flow=${data.id}`;
-          return;
-        }
         setFlow(data);
       })
       .catch(handleFlowError("settings", setFlow))

diff --git a/ui/pages/setup_passkey.tsx b/ui/pages/setup_passkey.tsx
@@ -43,10 +43,6 @@ const SetupPasskey: NextPage = () => {
         returnTo: returnTo ? String(returnTo) : undefined,
       })
       .then(({ data }) => {
-        if (data.request_url !== undefined) {
-          window.location.href = `./setup_passkey?flow=${data.id}`;
-          return;
-        }
         setFlow(data);
       })
       .catch(handleFlowError("settings", setFlow))