feat: sync profile data with session and implement visibility-based refetching in ProfileSettingsForm

This commit is contained in:
pradeepkumar
2026-04-24 12:56:20 +05:30
parent cecbba7f3e
commit 1dba4e70d5

View File

@@ -87,8 +87,6 @@ export function ProfileSettingsForm({
// Track if initial profile fetch is done to avoid re-showing loading spinner // Track if initial profile fetch is done to avoid re-showing loading spinner
const hasFetchedRef = useRef(false); const hasFetchedRef = useRef(false);
// Fetch profile data on mount based on user role
useEffect(() => {
const fetchProfile = async () => { const fetchProfile = async () => {
try { try {
// Only show loading spinner on initial fetch, not on session-triggered re-fetches // Only show loading spinner on initial fetch, not on session-triggered re-fetches
@@ -107,7 +105,17 @@ export function ProfileSettingsForm({
phone: profile.phone || '', phone: profile.phone || '',
}; };
setFormData(profileData); setFormData(profileData);
setOriginalData(profileData); // Store original for cancel setOriginalData(profileData);
// If backend email diverges from session (email change verified in another tab),
// refresh the next-auth JWT so header/other places also pick up the new address.
if (profile.email && session?.user?.email && profile.email !== session.user.email) {
try {
await updateSession({ user: { email: profile.email } });
} catch {
// updateSession is best-effort
}
}
if (profile.avatar) { if (profile.avatar) {
try { try {
@@ -122,12 +130,20 @@ export function ProfileSettingsForm({
const profileData = { const profileData = {
firstName: profile.firstName || '', firstName: profile.firstName || '',
lastName: profile.lastName || '', lastName: profile.lastName || '',
career: '', // Users don't have career/agent type career: '',
email: profile.email || session?.user?.email || '', email: profile.email || session?.user?.email || '',
phone: profile.phone || '', phone: profile.phone || '',
}; };
setFormData(profileData); setFormData(profileData);
setOriginalData(profileData); // Store original for cancel setOriginalData(profileData);
if (profile.email && session?.user?.email && profile.email !== session.user.email) {
try {
await updateSession({ user: { email: profile.email } });
} catch {
// best-effort
}
}
if (profile.avatar) { if (profile.avatar) {
try { try {
@@ -140,7 +156,6 @@ export function ProfileSettingsForm({
} }
} catch (err) { } catch (err) {
console.error('Failed to fetch profile:', err); console.error('Failed to fetch profile:', err);
// Use session data as fallback
if (session?.user) { if (session?.user) {
const nameParts = (session.user?.name || '').split(' '); const nameParts = (session.user?.name || '').split(' ');
setFormData(prev => ({ setFormData(prev => ({
@@ -159,11 +174,27 @@ export function ProfileSettingsForm({
} }
}; };
// Initial fetch on mount
useEffect(() => {
if (session) { if (session) {
// Skip re-fetching on session changes after initial load (e.g. after updateSession in handleSave)
if (hasFetchedRef.current) return; if (hasFetchedRef.current) return;
fetchProfile(); fetchProfile();
} }
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [session]);
// Re-fetch when the tab becomes visible again (e.g. user verified email
// change in another tab and returned). Ensures email/phone/avatar stay in
// sync with the source of truth.
useEffect(() => {
const onVisible = () => {
if (document.visibilityState === 'visible' && session && hasFetchedRef.current) {
fetchProfile();
}
};
document.addEventListener('visibilitychange', onVisible);
return () => document.removeEventListener('visibilitychange', onVisible);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [session]); }, [session]);
const handleChange = (field: string, value: string) => { const handleChange = (field: string, value: string) => {