fix(site): fix redirection to login after logout/change password

rodrimaia · rodrimaia · commit 06bf723a7255 · 2023-03-29T18:15:05.000Z
diff --git a/site/e2e/tests/logout.spec.ts b/site/e2e/tests/logout.spec.ts
@@ -0,0 +1,13 @@
+import { test, expect } from "@playwright/test"
+import { getStatePath } from "../helpers"
+
+test.use({ storageState: getStatePath("authState") })
+
+test("signing out redirects to login page", async ({ page, baseURL }) => {
+  await page.goto(`${baseURL}/`, { waitUntil: "networkidle" })
+
+  await page.getByTestId("user-dropdown-trigger").click()
+  await page.getByRole("menuitem", { name: "Sign Out" }).click()
+
+  await expect(page.getByRole("heading", { name: "Sign in to Coder" })).toBeVisible()
+})
diff --git a/site/src/pages/UserSettingsPage/SecurityPage/SecurityPage.test.tsx b/site/src/pages/UserSettingsPage/SecurityPage/SecurityPage.test.tsx
@@ -47,6 +47,8 @@ describe("SecurityPage", () => {
       expect(successMessage).toBeDefined()
       expect(API.updateUserPassword).toBeCalledTimes(1)
       expect(API.updateUserPassword).toBeCalledWith(user.id, newData)
+
+      await waitFor(() => expect(window.location).toBeAt("/"))
     })
   })
 
diff --git a/site/src/xServices/auth/authXService.ts b/site/src/xServices/auth/authXService.ts
@@ -389,12 +389,10 @@ export const authMachine =
         }),
         redirect: (_, { data }) => {
           if (!("redirectUrl" in data)) {
-            throw new Error(
-              "Redirect only should be called with data.redirectUrl",
-            )
+            window.location.href = location.origin
+          } else {
+            window.location.replace(data.redirectUrl)
           }
-
-          window.location.replace(data.redirectUrl)
         },
       },
       guards: {
diff --git a/site/src/xServices/userSecuritySettings/userSecuritySettingsXService.ts b/site/src/xServices/userSecuritySettings/userSecuritySettingsXService.ts
@@ -35,7 +35,7 @@ export const userSecuritySettingsMachine = createMachine(
           src: "updateSecurity",
           onDone: [
             {
-              actions: "notifyUpdate",
+              actions: ["notifyUpdate", "redirectToHome"],
               target: "idle",
             },
           ],
@@ -66,6 +66,9 @@ export const userSecuritySettingsMachine = createMachine(
       assignError: assign({
         error: (_, event) => event.data,
       }),
+      redirectToHome: () => {
+        window.location.href = location.origin
+      }
     },
   },
 )
