feat: Implement a structured API service layer for authentication and user management, replacing the old API utility.
This commit is contained in:
@@ -2,53 +2,38 @@
|
||||
|
||||
import React, { createContext, useContext, useState, useEffect, useCallback } from 'react';
|
||||
import { useRouter } from 'next/navigation';
|
||||
import { api, type LoginResponse } from '@/lib/api';
|
||||
|
||||
interface User {
|
||||
id: string;
|
||||
email: string;
|
||||
role: string;
|
||||
firstName: string;
|
||||
lastName: string;
|
||||
avatar: string | null;
|
||||
}
|
||||
import { authService, AuthUser, getErrorMessage } from '@/services';
|
||||
|
||||
interface AuthContextType {
|
||||
user: User | null;
|
||||
user: AuthUser | null;
|
||||
isLoading: boolean;
|
||||
isAuthenticated: boolean;
|
||||
login: (email: string, password: string) => Promise<void>;
|
||||
logout: () => Promise<void>;
|
||||
error: string | null;
|
||||
}
|
||||
|
||||
const AuthContext = createContext<AuthContextType | undefined>(undefined);
|
||||
|
||||
export function AuthProvider({ children }: { children: React.ReactNode }) {
|
||||
const [user, setUser] = useState<User | null>(null);
|
||||
const [user, setUser] = useState<AuthUser | null>(null);
|
||||
const [isLoading, setIsLoading] = useState(true);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const router = useRouter();
|
||||
|
||||
const checkAuth = useCallback(() => {
|
||||
try {
|
||||
const token = localStorage.getItem('accessToken');
|
||||
const storedUser = localStorage.getItem('user');
|
||||
const storedUser = authService.getStoredUser();
|
||||
|
||||
if (token && storedUser) {
|
||||
const parsedUser = JSON.parse(storedUser);
|
||||
if (parsedUser.role === 'ADMIN') {
|
||||
setUser(parsedUser);
|
||||
} else {
|
||||
// Not admin, clear storage
|
||||
localStorage.removeItem('accessToken');
|
||||
localStorage.removeItem('refreshToken');
|
||||
localStorage.removeItem('user');
|
||||
}
|
||||
if (storedUser && storedUser.role === 'ADMIN') {
|
||||
setUser(storedUser);
|
||||
} else if (storedUser) {
|
||||
// Not admin, clear storage
|
||||
authService.clearAuth();
|
||||
}
|
||||
} catch {
|
||||
// Invalid stored data
|
||||
localStorage.removeItem('accessToken');
|
||||
localStorage.removeItem('refreshToken');
|
||||
localStorage.removeItem('user');
|
||||
authService.clearAuth();
|
||||
} finally {
|
||||
setIsLoading(false);
|
||||
}
|
||||
@@ -59,14 +44,21 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
|
||||
}, [checkAuth]);
|
||||
|
||||
const login = async (email: string, password: string) => {
|
||||
const response: LoginResponse = await api.login(email, password);
|
||||
setUser(response.user);
|
||||
router.push('/dashboard');
|
||||
setError(null);
|
||||
try {
|
||||
const response = await authService.login({ email, password });
|
||||
setUser(response.user);
|
||||
router.push('/dashboard');
|
||||
} catch (err) {
|
||||
const errorMessage = getErrorMessage(err);
|
||||
setError(errorMessage);
|
||||
throw new Error(errorMessage);
|
||||
}
|
||||
};
|
||||
|
||||
const logout = async () => {
|
||||
try {
|
||||
await api.logout();
|
||||
await authService.logout();
|
||||
} finally {
|
||||
setUser(null);
|
||||
router.push('/login');
|
||||
@@ -81,6 +73,7 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
|
||||
isAuthenticated: !!user,
|
||||
login,
|
||||
logout,
|
||||
error,
|
||||
}}
|
||||
>
|
||||
{children}
|
||||
|
||||
Reference in New Issue
Block a user