Skip to content

⚡ Consolidate User Profile Fetching #1

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
Adamugy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

⚡ Consolidate User Profile Fetching #1

Show file tree
Hide file tree
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
60 changes: 20 additions & 40 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,54 +52,31 @@ const AppContent: React.FC = () => {
avatarUrl: ''
});

useEffect(() => {
const syncPlan = async () => {
if (!authLoaded || !isLoaded || !user) return;
const token = await getToken();
if (!token) return;

const res = await fetch('/api/auth/me', {
headers: {
Authorization: `Bearer ${token}`,
},
});
if (!res.ok) return;

const data = await res.json();
const plan = data?.user?.plan;
if (plan === 'free' || plan === 'researcher' || plan === 'lab') {
setUserProfile(prev => ({ ...prev, plan: plan as PlanTier }));
}
};

syncPlan();
}, [authLoaded, isLoaded, user, getToken]);



useEffect(() => {
if (!isLoaded || !user) return;

const userName = user.name || '';
const userEmail = user.email || '';
const userEmailVerified = user.emailVerified || false;

// Fetch full profile from our DB to get role and avatar
// Fetch full profile from our DB to get role, avatar, and full details
const fetchFullProfile = async () => {
const token = await getToken();
if (!token) return;
const res = await fetch('/api/auth/me', { headers: { Authorization: `Bearer ${token}` } });

const res = await fetch('/api/auth/me', {
headers: { Authorization: `Bearer ${token}` }
});

if (res.ok) {
const data = await res.json();
const userData = data.user;

setUserProfile(prev => ({
...prev,
name: data.user.name || userName || prev.name,
lastName: data.user.lastName || '',
email: userEmail || prev.email,
role: data.user.role || '',
avatarUrl: data.user.avatarUrl || '',
plan: data.user.plan || prev.plan,
emailVerified: data.user.emailVerified ?? userEmailVerified
name: userData.name || user.name || prev.name,
lastName: userData.lastName || '',
email: user.email || userData.email || prev.email,
role: userData.role || '',
avatarUrl: userData.avatarUrl || '',
plan: (userData.plan as PlanTier) || prev.plan,
emailVerified: userData.emailVerified ?? user.emailVerified
}));
}
};
Expand All @@ -108,10 +85,13 @@ const AppContent: React.FC = () => {
fetchFullProfile();
lastSyncedUserIdRef.current = user.id;
} else {
// Just sync existing data if ID is the same but object changed (e.g. emailVerified)
// Just sync existing data from context if ID is the same but object changed (e.g. emailVerified or plan)
setUserProfile(prev => ({
...prev,
emailVerified: user.emailVerified
name: user.name || prev.name,
email: user.email || prev.email,
emailVerified: user.emailVerified,
plan: (user.plan as PlanTier) || prev.plan
}));
}
}, [isLoaded, user, getToken]);
Expand Down
2 changes: 1 addition & 1 deletion src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export const DL_TAGS = [

// --- New Types for Settings & Management ---

export type PlanTier = 'free';
export type PlanTier = 'free' | 'researcher' | 'lab';

export interface UserProfile {
name: string;
Expand Down