feat: enhance user authentication and profile retrieval
- Updated GET handler in auth route to fetch user UUID from cookie using AuthService. - Improved error handling for unauthenticated and non-existent users. - Added team name retrieval for the user profile, with fallback handling. - Refactored AuthClient to return detailed user information including team details. - Enhanced navigation component to use a dropdown menu for user actions, improving UI/UX. - Implemented loading state in UserContext to manage user info fetching.
This commit is contained in:
36
app/account/page.tsx
Normal file
36
app/account/page.tsx
Normal file
@@ -0,0 +1,36 @@
|
||||
import { redirect } from "next/navigation";
|
||||
import { AuthService, userService, TeamsService } from "@/services";
|
||||
import { AccountForm } from "@/components/account/account-form";
|
||||
|
||||
export default async function AccountPage() {
|
||||
try {
|
||||
// Vérifier si l'utilisateur est connecté
|
||||
const userUuid = await AuthService.getUserUuidFromCookie();
|
||||
|
||||
if (!userUuid) {
|
||||
redirect("/login");
|
||||
}
|
||||
|
||||
// Récupérer le profil utilisateur
|
||||
const userProfile = await userService.getUserByUuid(userUuid);
|
||||
|
||||
if (!userProfile) {
|
||||
redirect("/login");
|
||||
}
|
||||
|
||||
// Charger les équipes pour la sélection
|
||||
const teams = await TeamsService.getTeams();
|
||||
|
||||
return (
|
||||
<div className="container mx-auto px-4 py-8">
|
||||
<div className="max-w-2xl mx-auto">
|
||||
<h1 className="text-3xl font-bold mb-8">Mon compte</h1>
|
||||
<AccountForm initialProfile={userProfile} teams={teams} />
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
} catch (error) {
|
||||
console.error("Error loading account page:", error);
|
||||
redirect("/login");
|
||||
}
|
||||
}
|
||||
46
app/api/auth/profile/route.ts
Normal file
46
app/api/auth/profile/route.ts
Normal file
@@ -0,0 +1,46 @@
|
||||
import { NextRequest, NextResponse } from "next/server";
|
||||
import { AuthService, userService } from "@/services";
|
||||
|
||||
export async function PUT(request: NextRequest) {
|
||||
try {
|
||||
// Vérifier si l'utilisateur est connecté
|
||||
const userUuid = await AuthService.getUserUuidFromCookie();
|
||||
|
||||
if (!userUuid) {
|
||||
return NextResponse.json({ error: "Non authentifié" }, { status: 401 });
|
||||
}
|
||||
|
||||
// Récupérer les données de mise à jour
|
||||
const { firstName, lastName, teamId } = await request.json();
|
||||
|
||||
// Validation des données
|
||||
if (!firstName || !lastName || !teamId) {
|
||||
return NextResponse.json(
|
||||
{ error: "Tous les champs sont requis" },
|
||||
{ status: 400 }
|
||||
);
|
||||
}
|
||||
|
||||
// Mettre à jour l'utilisateur
|
||||
await userService.updateUserByUuid(userUuid, {
|
||||
firstName,
|
||||
lastName,
|
||||
teamId,
|
||||
});
|
||||
|
||||
return NextResponse.json({
|
||||
message: "Profil mis à jour avec succès",
|
||||
user: {
|
||||
firstName,
|
||||
lastName,
|
||||
teamId,
|
||||
},
|
||||
});
|
||||
} catch (error: any) {
|
||||
console.error("Profile update error:", error);
|
||||
return NextResponse.json(
|
||||
{ error: error.message || "Erreur lors de la mise à jour du profil" },
|
||||
{ status: 500 }
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,35 +1,52 @@
|
||||
import { NextRequest, NextResponse } from "next/server";
|
||||
import { cookies } from "next/headers";
|
||||
import { userService } from "@/services/user-service";
|
||||
import { AuthService, COOKIE_NAME } from "@/services/auth-service";
|
||||
import { UserProfile } from "@/lib/types";
|
||||
import { AuthService, userService, TeamsService } from "@/services";
|
||||
|
||||
/**
|
||||
* GET /api/auth - Récupère l'utilisateur actuel depuis le cookie
|
||||
*/
|
||||
export async function GET() {
|
||||
export async function GET(request: NextRequest) {
|
||||
try {
|
||||
const cookieStore = await cookies();
|
||||
const userUuid = cookieStore.get(COOKIE_NAME)?.value;
|
||||
// Récupérer l'UUID utilisateur depuis le cookie
|
||||
const userUuid = await AuthService.getUserUuidFromCookie();
|
||||
|
||||
if (!userUuid) {
|
||||
return NextResponse.json({ user: null }, { status: 200 });
|
||||
return NextResponse.json({ error: "Non authentifié" }, { status: 401 });
|
||||
}
|
||||
|
||||
// Récupérer le profil utilisateur
|
||||
const userProfile = await userService.getUserByUuid(userUuid);
|
||||
|
||||
if (!userProfile) {
|
||||
// Cookie invalide, le supprimer
|
||||
const response = NextResponse.json({ user: null }, { status: 200 });
|
||||
response.cookies.set(COOKIE_NAME, "", { maxAge: 0 });
|
||||
return response;
|
||||
return NextResponse.json(
|
||||
{ error: "Utilisateur non trouvé" },
|
||||
{ status: 404 }
|
||||
);
|
||||
}
|
||||
|
||||
return NextResponse.json({ user: userProfile }, { status: 200 });
|
||||
// Récupérer le nom de l'équipe
|
||||
let teamName = "Équipe non définie";
|
||||
if (userProfile.teamId) {
|
||||
try {
|
||||
const team = await TeamsService.getTeamById(userProfile.teamId);
|
||||
if (team) {
|
||||
teamName = team.name;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error("Failed to fetch team name:", error);
|
||||
}
|
||||
}
|
||||
|
||||
// Retourner les informations complètes de l'utilisateur
|
||||
return NextResponse.json({
|
||||
user: {
|
||||
firstName: userProfile.firstName,
|
||||
lastName: userProfile.lastName,
|
||||
teamId: userProfile.teamId,
|
||||
teamName: teamName,
|
||||
uuid: userUuid,
|
||||
},
|
||||
});
|
||||
} catch (error) {
|
||||
console.error("Error getting current user:", error);
|
||||
console.error("Auth GET error:", error);
|
||||
return NextResponse.json(
|
||||
{ error: "Failed to get current user" },
|
||||
{ error: "Erreur interne du serveur" },
|
||||
{ status: 500 }
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user