github/plane
0
0
Fork 1
mirror of https://github.com/makeplane/plane synced 2025-08-07 19:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: replaced next_path with app_slug

Browse Source
This commit is contained in:
gakshita
2025-05-23 15:08:49 +05:30
parent 57c0435243
commit 71a50d8811
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
web/core/lib/wrappers/authentication-wrapper.tsx
View File

@@ -29,6 +29,7 @@ export const AuthenticationWrapper: FC<TAuthenticationWrapper> = observer((props
const router = useAppRouter();
const searchParams = useSearchParams();
const nextPath = searchParams.get("next_path");
const appSlug = searchParams.get("app_slug");
// props
const { children, pageType = EPageTypes.AUTHENTICATED } = props;
// hooks
@@ -42,6 +43,7 @@ export const AuthenticationWrapper: FC<TAuthenticationWrapper> = observer((props
shouldRetryOnError: false,
});
const pathnameWithAppSlug = appSlug ? `${pathname}?app_slug=${appSlug}` : pathname;
const isUserOnboard =
currentUserProfile?.is_onboarded ||
(currentUserProfile?.onboarding_step?.profile_complete &&
@@ -50,8 +52,6 @@ export const AuthenticationWrapper: FC<TAuthenticationWrapper> = observer((props
currentUserProfile?.onboarding_step?.workspace_join) ||
false;
const pathnameWithNextPath = pathname && nextPath ? `${pathname}?next_path=${nextPath}` : pathname;
const getWorkspaceRedirectionUrl = (): string => {
let redirectionRoute = "/profile";
@@ -92,7 +92,7 @@ export const AuthenticationWrapper: FC<TAuthenticationWrapper> = observer((props
router.push(currentRedirectRoute);
return <></>;
} else {
router.push(pathnameWithNextPath ? `/onboarding?next_path=${pathnameWithNextPath}` : `/onboarding`);
router.push("/onboarding");
return <></>;
}
}
@@ -100,7 +100,7 @@ export const AuthenticationWrapper: FC<TAuthenticationWrapper> = observer((props
if (pageType === EPageTypes.ONBOARDING) {
if (!currentUser?.id) {
router.push(`/${pathnameWithNextPath ? `?next_path=${pathnameWithNextPath}` : ``}`);
router.push(`/${pathnameWithAppSlug ? `?next_path=${pathnameWithAppSlug}` : ``}`);
return <></>;
} else {
if (currentUser && currentUserProfile?.id && isUserOnboard) {
@@ -113,7 +113,7 @@ export const AuthenticationWrapper: FC<TAuthenticationWrapper> = observer((props
if (pageType === EPageTypes.SET_PASSWORD) {
if (!currentUser?.id) {
router.push(`/${pathnameWithNextPath ? `?next_path=${pathnameWithNextPath}` : ``}`);
router.push(`/${pathnameWithAppSlug ? `?next_path=${pathnameWithAppSlug}` : ``}`);
return <></>;
} else {
if (currentUser && !currentUser?.is_password_autoset && currentUserProfile?.id && isUserOnboard) {
@@ -128,11 +128,11 @@ export const AuthenticationWrapper: FC<TAuthenticationWrapper> = observer((props
if (currentUser?.id) {
if (currentUserProfile && currentUserProfile?.id && isUserOnboard) return <>{children}</>;
else {
router.push(pathnameWithNextPath ? `/onboarding?next_path=${pathnameWithNextPath}` : `/onboarding`);
router.push(`/onboarding`);
return <></>;
}
} else {
router.push(`/${pathnameWithNextPath ? `?next_path=${pathnameWithNextPath}` : ``}`);
router.push(`/${pathnameWithAppSlug ? `?next_path=${pathnameWithAppSlug}` : ``}`);
return <></>;
}
}