Skip to content
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

TOOLBAR LOGOUT LOOP: init commit and test #1828

Merged
merged 10 commits into from
Mar 12, 2024
Merged

TOOLBAR LOGOUT LOOP: init commit and test #1828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
61061b6
init commit and test
matthewguywright Mar 1, 2024
665b377
Update useLogout.tsx
matthewguywright Mar 1, 2024
261d953
Update useLogout.tsx
matthewguywright Mar 4, 2024
1240bbe
Merge branch 'canary' into fix/mw-toolbar-logout-loop
matthewguywright Mar 8, 2024
0f8b692
updated per PR
matthewguywright Mar 8, 2024
0a5ad20
added test to cover use case
matthewguywright Mar 8, 2024
d5d0138
Update useLogout.test.ts
matthewguywright Mar 8, 2024
7997402
Merge branch 'canary' into fix/mw-toolbar-logout-loop
matthewguywright Mar 11, 2024
b87d9f2
changeset
matthewguywright Mar 11, 2024
5e60f7a
updated per PR
matthewguywright Mar 12, 2024
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
5 changes: 5 additions & 0 deletions .changeset/lucky-sheep-promise.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@faustwp/core': patch
---

Fixed issue where on a preview page the user could be stuck in a logout/login loop.
4 changes: 4 additions & 0 deletions packages/faustwp-core/src/hooks/useLogout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,12 @@ export function useLogout() {
return;
}

const isPreview = window?.location?.search?.includes('preview=true');

if (redirectUrl) {
window.location.assign(redirectUrl);
} else if (isPreview) {
window.location.assign('/');
} else {
window.location.reload();
}
Expand Down
16 changes: 16 additions & 0 deletions packages/faustwp-core/tests/hooks/useLogout.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,22 @@ describe('useLogout hook', () => {
fetchMock.restore();
});

it('calls window.location.assign to / if there is a preview url and no redirectUrl', async () => {
fetchMock.post(`/api/faust/auth/logout`, {
status: 205,
});

global.window.location.search = 'preview=true';

const { result } = renderHook(() => useLogout());

await act(() => result.current.logout());

expect(window.location.assign).toBeCalledWith('/');

fetchMock.restore();
});

it('calls window.location.assign if there is a redirect url', async () => {
fetchMock.post(`/api/faust/auth/logout`, {
status: 205,
Expand Down
Loading