BACKEND: - Fix JWT authentication in FamiliesGateway * Configure JwtModule with ConfigService in FamiliesModule * Load JWT_SECRET from environment variables * Enable proper token verification for WebSocket connections - Fix circular dependency in TrackingModule * Use forwardRef pattern for FamiliesGateway injection * Make FamiliesGateway optional in TrackingService * Emit WebSocket events when activities are created/updated/deleted FRONTEND: - Create WebSocket service (336 lines) * Socket.IO client with auto-reconnection (exponential backoff 1s → 30s) * Family room join/leave management * Presence tracking (online users per family) * Event handlers for activities, children, members * Connection recovery with auto-rejoin - Create useWebSocket hook (187 lines) * Auto-connect on user authentication * Auto-join user's family room * Connection status tracking * Presence indicators * Hooks: useRealTimeActivities, useRealTimeChildren, useRealTimeFamilyMembers - Expose access token in AuthContext * Add token property to AuthContextType interface * Load token from tokenStorage on initialization * Update token state on login/register/logout * Enable WebSocket authentication - Integrate real-time sync across app * AppShell: Connection status indicator + online count badge * Activities page: Auto-refresh on family activity events * Home page: Auto-refresh daily summary on activity changes * Family page: Real-time member updates - Fix accessibility issues * Remove deprecated legacyBehavior from Link components (Next.js 15) * Fix color contrast in EmailVerificationBanner (WCAG AA) * Add missing aria-labels to IconButtons * Fix React key warnings in family member list DOCUMENTATION: - Update implementation-gaps.md * Mark Real-Time Sync as COMPLETED ✅ * Document WebSocket room management implementation * Document connection recovery and presence indicators * Update summary statistics (49 features completed) FILES CREATED: - maternal-web/hooks/useWebSocket.ts (187 lines) - maternal-web/lib/websocket.ts (336 lines) FILES MODIFIED (14): Backend (4): - families.gateway.ts (JWT verification fix) - families.module.ts (JWT config with ConfigService) - tracking.module.ts (forwardRef for FamiliesModule) - tracking.service.ts (emit WebSocket events) Frontend (9): - lib/auth/AuthContext.tsx (expose access token) - components/layouts/AppShell/AppShell.tsx (connection status + presence) - app/activities/page.tsx (real-time activity updates) - app/page.tsx (real-time daily summary refresh) - app/family/page.tsx (accessibility fixes) - app/(auth)/login/page.tsx (remove legacyBehavior) - components/common/EmailVerificationBanner.tsx (color contrast fix) Documentation (1): - docs/implementation-gaps.md (updated status) IMPACT: ✅ Real-time family collaboration achieved ✅ Activities sync instantly across all family members' devices ✅ Presence tracking shows who's online ✅ Connection recovery handles poor network conditions ✅ Accessibility improvements (WCAG AA compliance) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
245 lines
6.1 KiB
TypeScript
245 lines
6.1 KiB
TypeScript
'use client';
|
|
|
|
import { createContext, useContext, useEffect, useState, ReactNode } from 'react';
|
|
import { useRouter } from 'next/navigation';
|
|
import apiClient from '@/lib/api/client';
|
|
import { tokenStorage } from '@/lib/utils/tokenStorage';
|
|
|
|
export interface User {
|
|
id: string;
|
|
email: string;
|
|
name: string;
|
|
role: string;
|
|
families?: Array<{
|
|
id: string;
|
|
familyId: string;
|
|
role: string;
|
|
}>;
|
|
}
|
|
|
|
export interface LoginCredentials {
|
|
email: string;
|
|
password: string;
|
|
deviceFingerprint?: string;
|
|
}
|
|
|
|
export interface RegisterData {
|
|
email: string;
|
|
password: string;
|
|
name: string;
|
|
role?: string;
|
|
}
|
|
|
|
interface AuthContextType {
|
|
user: User | null;
|
|
token: string | null;
|
|
isLoading: boolean;
|
|
isAuthenticated: boolean;
|
|
login: (credentials: LoginCredentials) => Promise<void>;
|
|
register: (data: RegisterData) => Promise<void>;
|
|
logout: () => Promise<void>;
|
|
refreshUser: () => Promise<void>;
|
|
}
|
|
|
|
const AuthContext = createContext<AuthContextType | undefined>(undefined);
|
|
|
|
export const AuthProvider = ({ children }: { children: ReactNode }) => {
|
|
const [user, setUser] = useState<User | null>(null);
|
|
const [token, setToken] = useState<string | null>(null);
|
|
const [isLoading, setIsLoading] = useState(true);
|
|
const router = useRouter();
|
|
|
|
const isAuthenticated = !!user;
|
|
|
|
// Check authentication status on mount
|
|
useEffect(() => {
|
|
// Only run on client side
|
|
if (typeof window !== 'undefined') {
|
|
checkAuth();
|
|
} else {
|
|
setIsLoading(false);
|
|
}
|
|
}, []);
|
|
|
|
const checkAuth = async () => {
|
|
// Ensure we're on client side
|
|
if (typeof window === 'undefined') {
|
|
setIsLoading(false);
|
|
return;
|
|
}
|
|
|
|
try {
|
|
const accessToken = tokenStorage.getAccessToken();
|
|
if (!accessToken) {
|
|
setIsLoading(false);
|
|
return;
|
|
}
|
|
|
|
// Set token in state
|
|
setToken(accessToken);
|
|
|
|
const response = await apiClient.get('/api/v1/auth/me');
|
|
|
|
// Check if response has expected structure
|
|
if (response.data?.data) {
|
|
setUser(response.data.data);
|
|
} else if (response.data?.user) {
|
|
// Handle alternative response structure
|
|
setUser(response.data.user);
|
|
} else {
|
|
throw new Error('Invalid response structure');
|
|
}
|
|
} catch (error: any) {
|
|
console.error('Auth check failed:', error);
|
|
// Only clear tokens if it's an actual auth error (401, 403)
|
|
if (error?.response?.status === 401 || error?.response?.status === 403) {
|
|
tokenStorage.clearTokens();
|
|
setUser(null);
|
|
setToken(null);
|
|
}
|
|
} finally {
|
|
setIsLoading(false);
|
|
}
|
|
};
|
|
|
|
const login = async (credentials: LoginCredentials) => {
|
|
try {
|
|
const deviceInfo = {
|
|
deviceId: generateDeviceFingerprint(),
|
|
platform: 'web',
|
|
model: navigator.userAgent,
|
|
osVersion: navigator.platform,
|
|
};
|
|
|
|
const response = await apiClient.post('/api/v1/auth/login', {
|
|
email: credentials.email,
|
|
password: credentials.password,
|
|
deviceInfo,
|
|
});
|
|
|
|
// Backend returns { success, data: { user, tokens } }
|
|
const { data: responseData } = response.data;
|
|
const { tokens, user: userData } = responseData;
|
|
|
|
tokenStorage.setTokens(tokens.accessToken, tokens.refreshToken);
|
|
setToken(tokens.accessToken);
|
|
setUser(userData);
|
|
|
|
router.push('/');
|
|
} catch (error: any) {
|
|
console.error('Login failed:', error);
|
|
throw new Error(error.response?.data?.message || 'Login failed');
|
|
}
|
|
};
|
|
|
|
const register = async (data: RegisterData) => {
|
|
try {
|
|
const deviceInfo = {
|
|
deviceId: generateDeviceFingerprint(),
|
|
platform: 'web',
|
|
model: navigator.userAgent,
|
|
osVersion: navigator.platform,
|
|
};
|
|
|
|
const response = await apiClient.post('/api/v1/auth/register', {
|
|
email: data.email,
|
|
password: data.password,
|
|
name: data.name,
|
|
deviceInfo,
|
|
});
|
|
|
|
// Backend returns { success, data: { user, family, tokens } }
|
|
const { data: responseData } = response.data;
|
|
const { tokens, user: userData } = responseData;
|
|
|
|
if (!tokens?.accessToken || !tokens?.refreshToken) {
|
|
throw new Error('Invalid response from server');
|
|
}
|
|
|
|
const { accessToken, refreshToken } = tokens;
|
|
|
|
tokenStorage.setTokens(accessToken, refreshToken);
|
|
setToken(accessToken);
|
|
setUser(userData);
|
|
|
|
// Redirect to onboarding
|
|
router.push('/onboarding');
|
|
} catch (error: any) {
|
|
console.error('Registration failed:', error);
|
|
throw new Error(error.response?.data?.message || error.message || 'Registration failed');
|
|
}
|
|
};
|
|
|
|
const logout = async () => {
|
|
try {
|
|
await apiClient.post('/api/v1/auth/logout');
|
|
} catch (error) {
|
|
console.error('Logout failed:', error);
|
|
} finally {
|
|
tokenStorage.clearTokens();
|
|
setUser(null);
|
|
setToken(null);
|
|
router.push('/login');
|
|
}
|
|
};
|
|
|
|
const refreshUser = async () => {
|
|
try {
|
|
const response = await apiClient.get('/api/v1/auth/me');
|
|
setUser(response.data.data);
|
|
} catch (error) {
|
|
console.error('Failed to refresh user:', error);
|
|
}
|
|
};
|
|
|
|
return (
|
|
<AuthContext.Provider
|
|
value={{
|
|
user,
|
|
token,
|
|
isLoading,
|
|
isAuthenticated,
|
|
login,
|
|
register,
|
|
logout,
|
|
refreshUser,
|
|
}}
|
|
>
|
|
{children}
|
|
</AuthContext.Provider>
|
|
);
|
|
};
|
|
|
|
export const useAuth = () => {
|
|
const context = useContext(AuthContext);
|
|
if (context === undefined) {
|
|
throw new Error('useAuth must be used within an AuthProvider');
|
|
}
|
|
return context;
|
|
};
|
|
|
|
// Helper function to generate a simple device fingerprint
|
|
function generateDeviceFingerprint(): string {
|
|
const navigator = window.navigator;
|
|
const screen = window.screen;
|
|
|
|
const data = [
|
|
navigator.userAgent,
|
|
navigator.language,
|
|
screen.colorDepth,
|
|
screen.width,
|
|
screen.height,
|
|
new Date().getTimezoneOffset(),
|
|
].join('|');
|
|
|
|
// Simple hash function
|
|
let hash = 0;
|
|
for (let i = 0; i < data.length; i++) {
|
|
const char = data.charCodeAt(i);
|
|
hash = ((hash << 5) - hash) + char;
|
|
hash = hash & hash;
|
|
}
|
|
|
|
return hash.toString(36);
|
|
}
|