Skip to content

fix: Setup redirect #4064

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 15, 2022
Merged

fix: Setup redirect #4064

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
34894c9
fix: Setup redirect
BrunoQuaresma Sep 14, 2022
8b335e6
Add test
BrunoQuaresma Sep 14, 2022
5cbe648
Merge branch 'main' into bq/fix-setup-redirect
kylecarbs Sep 15, 2022
0aed125
Remove redirect action from authXService
BrunoQuaresma Sep 15, 2022
8590da0
Fix test
BrunoQuaresma Sep 15, 2022
fe94988
Merge branch 'main' of github.com:coder/coder into bq/fix-setup-redirect
BrunoQuaresma Sep 15, 2022
51bb409
Fix all tests
BrunoQuaresma Sep 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix test
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Sep 15, 2022
commit 8590da02491e0d60e5393c85734e386eb8004db6
2 changes: 1 addition & 1 deletion site/src/components/RequireAuth/RequireAuth.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export const RequireAuth: React.FC<React.PropsWithChildren<RequireAuthProps>> =
if (authState.matches("signedOut")) {
return <Navigate to={navigateTo} state={{ isRedirect: !isHomePage }} />
} else if (authState.matches("waitingForTheFirstUser")) {
return <Navigate to="setup" />
return <Navigate to="/setup" />
} else if (authState.hasTag("loading")) {
return <FullScreenLoader />
} else {
Expand Down
12 changes: 9 additions & 3 deletions site/src/pages/LoginPage/LoginPage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { fireEvent, screen, waitFor } from "@testing-library/react"
import { fireEvent, screen } from "@testing-library/react"
import userEvent from "@testing-library/user-event"
import { rest } from "msw"
import { Route, Routes } from "react-router-dom"
import { Language } from "../../components/SignInForm/SignInForm"
import { history, render } from "../../testHelpers/renderHelpers"
import { server } from "../../testHelpers/server"
Expand Down Expand Up @@ -99,9 +100,14 @@ describe("LoginPage", () => {
)

// When
render(<LoginPage />)
render(
<Routes>
<Route path="/login" element={<LoginPage />}></Route>
<Route path="/setup" element={<h1>Setup</h1>}></Route>
</Routes>,
)

// Then
await waitFor(() => expect(history.location.pathname).toEqual("/setup"))
await screen.findByText("Setup")
})
})
2 changes: 2 additions & 0 deletions site/src/pages/LoginPage/LoginPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ export const LoginPage: React.FC = () => {

if (authState.matches("signedIn")) {
return <Navigate to={redirectTo} replace />
} else if (authState.matches("waitingForTheFirstUser")) {
return <Navigate to="/setup" />
} else {
return (
<>
Expand Down