feat: remember original URL and redirect after login (#18308)
## Summary - Implement a return-to-path mechanism that preserves the user's intended destination across authentication flows (login, magic link, cross-domain redirects) - Uses layered persistence: Jotai atom (in-memory), sessionStorage with TTL (tab-switch resilience), URL query parameter (cross-domain propagation) - Includes path validation to prevent open redirects, automatic cleanup after successful login, and comprehensive test coverage - Replaces the unused `previousUrlState` with a robust `returnToPathState` system ## Test plan - [ ] Visit a deep link (e.g. `/objects/tasks`) while logged out — should redirect to login, then back to `/objects/tasks` after logging in - [ ] Visit an OAuth authorize link while logged out — should redirect to login, then to the authorize page - [ ] Test magic link flow: click sign-in link that opens new tab — should still redirect to original destination - [ ] Test cross-domain: visit `app.twenty.com/objects/tasks` — should preserve path through workspace domain redirect - [ ] Verify auth/onboarding paths are excluded from being saved as return paths - [ ] Verify return-to-path is cleared after successful navigation - [ ] All 215 existing `usePageChangeEffectNavigateLocation` tests pass Made with [Cursor](https://cursor.com)
This commit is contained in:
@@ -131,6 +131,8 @@ export const useAuth = () => {
|
||||
isCaptchaScriptLoadedState.atom,
|
||||
);
|
||||
|
||||
store.set(isAppEffectRedirectEnabledState.atom, false);
|
||||
|
||||
sessionStorage.clear();
|
||||
localStorage.clear();
|
||||
|
||||
@@ -158,6 +160,7 @@ export const useAuth = () => {
|
||||
setLastAuthenticateWorkspaceDomain(null);
|
||||
await resetToMockedMetadata();
|
||||
navigate(AppPath.SignInUp);
|
||||
store.set(isAppEffectRedirectEnabledState.atom, true);
|
||||
}, [
|
||||
client,
|
||||
setLastAuthenticateWorkspaceDomain,
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
import { useCallback } from 'react';
|
||||
|
||||
import { returnToPathState } from '@/auth/states/returnToPathState';
|
||||
import { isValidReturnToPath } from '@/auth/utils/isValidReturnToPath';
|
||||
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
|
||||
import { isNonEmptyString } from '@sniptt/guards';
|
||||
import { useStore } from 'jotai';
|
||||
|
||||
export const useReturnToPath = () => {
|
||||
const store = useStore();
|
||||
const setReturnToPath = useSetAtomState(returnToPathState);
|
||||
|
||||
const saveReturnToPath = useCallback(
|
||||
(path: string) => {
|
||||
if (!isValidReturnToPath(path)) {
|
||||
return;
|
||||
}
|
||||
|
||||
setReturnToPath(path);
|
||||
},
|
||||
[setReturnToPath],
|
||||
);
|
||||
|
||||
const getReturnToPath = useCallback((): string | null => {
|
||||
const currentReturnToPath = store.get(returnToPathState.atom);
|
||||
|
||||
if (
|
||||
isNonEmptyString(currentReturnToPath) &&
|
||||
isValidReturnToPath(currentReturnToPath)
|
||||
) {
|
||||
return currentReturnToPath;
|
||||
}
|
||||
|
||||
return null;
|
||||
}, [store]);
|
||||
|
||||
const clearReturnToPath = useCallback(() => {
|
||||
setReturnToPath('');
|
||||
}, [setReturnToPath]);
|
||||
|
||||
return {
|
||||
saveReturnToPath,
|
||||
getReturnToPath,
|
||||
clearReturnToPath,
|
||||
};
|
||||
};
|
||||
Reference in New Issue
Block a user