Skip to content

Fixed browser history backlink for Following Navlink #5177

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

Open
ronodhirSoumik wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixed browser history backlink for Following Navlink #5177

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion packages/webapp/components/ProtectedPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type { ReactElement, ReactNode } from 'react';
import React, { useContext, useEffect } from 'react';
import { useRouter } from 'next/router';
import AuthContext from '@dailydotdev/shared/src/contexts/AuthContext';
import { AFTER_AUTH_PARAM } from '@dailydotdev/shared/src/components/auth/common';

export interface ProtectedPageProps {
children: ReactNode;
Expand All @@ -19,7 +20,12 @@ function ProtectedPage({

useEffect(() => {
if (tokenRefreshed && !user) {
router.replace('/');
const params = new URLSearchParams(window.location.search);
if (!params.get(AFTER_AUTH_PARAM)) {
params.set(AFTER_AUTH_PARAM, window.location.pathname);
}
const redirectUrl = params.toString() ? `/?${params.toString()}` : '/';
router.replace(redirectUrl);
}
// @NOTE see https://dailydotdev.atlassian.net/l/cp/dK9h1zoM
// eslint-disable-next-line react-hooks/exhaustive-deps
Expand Down