Compare commits
4 Commits
a91a34dbf8
...
1d68878601
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1d68878601 | ||
|
|
a5adb84a62 | ||
|
|
19d0fc731f | ||
|
|
be04ef16d9 |
@@ -9,6 +9,7 @@ import { Column } from 'primereact/column';
|
|||||||
import { ProgressBar } from 'primereact/progressbar';
|
import { ProgressBar } from 'primereact/progressbar';
|
||||||
import { Chart } from 'primereact/chart';
|
import { Chart } from 'primereact/chart';
|
||||||
import { Tag } from 'primereact/tag';
|
import { Tag } from 'primereact/tag';
|
||||||
|
import { budgetService } from '@/services/api';
|
||||||
|
|
||||||
interface BudgetChantier {
|
interface BudgetChantier {
|
||||||
id: number;
|
id: number;
|
||||||
@@ -45,19 +46,11 @@ export default function ChantierBudgetPage() {
|
|||||||
const loadBudget = async () => {
|
const loadBudget = async () => {
|
||||||
try {
|
try {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
const API_URL = process.env.NEXT_PUBLIC_API_URL || 'https://api.lions.dev/btpxpress';
|
const data = await budgetService.getByChantier(id);
|
||||||
|
|
||||||
// Charger le budget du chantier
|
|
||||||
const response = await fetch(`${API_URL}/api/v1/budgets/chantier/${id}`);
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error('Erreur lors du chargement du budget');
|
|
||||||
}
|
|
||||||
|
|
||||||
const data = await response.json();
|
|
||||||
setBudget(data);
|
setBudget(data);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Erreur:', error);
|
console.error('Erreur lors du chargement du budget:', error);
|
||||||
|
// L'intercepteur API gérera automatiquement la redirection si 401
|
||||||
} finally {
|
} finally {
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,32 +9,8 @@ import { Tag } from 'primereact/tag';
|
|||||||
import { ProgressBar } from 'primereact/progressbar';
|
import { ProgressBar } from 'primereact/progressbar';
|
||||||
import { Divider } from 'primereact/divider';
|
import { Divider } from 'primereact/divider';
|
||||||
import { Skeleton } from 'primereact/skeleton';
|
import { Skeleton } from 'primereact/skeleton';
|
||||||
|
import { chantierService } from '@/services/api';
|
||||||
interface Chantier {
|
import type { Chantier } from '@/types/btp';
|
||||||
id: number;
|
|
||||||
nom: string;
|
|
||||||
description: string;
|
|
||||||
adresse: string;
|
|
||||||
ville: string;
|
|
||||||
codePostal: string;
|
|
||||||
dateDebut: string;
|
|
||||||
dateFin: string;
|
|
||||||
dateLivraison: string;
|
|
||||||
statut: string;
|
|
||||||
budget: number;
|
|
||||||
client: {
|
|
||||||
id: number;
|
|
||||||
nom: string;
|
|
||||||
email: string;
|
|
||||||
telephone: string;
|
|
||||||
};
|
|
||||||
responsable: {
|
|
||||||
id: number;
|
|
||||||
nom: string;
|
|
||||||
prenom: string;
|
|
||||||
};
|
|
||||||
progression: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function ChantierDetailsPage() {
|
export default function ChantierDetailsPage() {
|
||||||
const params = useParams();
|
const params = useParams();
|
||||||
@@ -54,18 +30,12 @@ export default function ChantierDetailsPage() {
|
|||||||
const loadChantier = async () => {
|
const loadChantier = async () => {
|
||||||
try {
|
try {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
const API_URL = process.env.NEXT_PUBLIC_API_URL || 'https://api.lions.dev/btpxpress';
|
const data = await chantierService.getById(id);
|
||||||
const response = await fetch(`${API_URL}/api/v1/chantiers/${id}`);
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error('Erreur lors du chargement du chantier');
|
|
||||||
}
|
|
||||||
|
|
||||||
const data = await response.json();
|
|
||||||
setChantier(data);
|
setChantier(data);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Erreur:', error);
|
console.error('Erreur lors du chargement du chantier:', error);
|
||||||
// TODO: Afficher un toast d'erreur
|
// L'intercepteur API gérera automatiquement la redirection si 401
|
||||||
|
// TODO: Afficher un toast d'erreur pour les autres erreurs
|
||||||
} finally {
|
} finally {
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
}
|
}
|
||||||
@@ -196,8 +166,8 @@ export default function ChantierDetailsPage() {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="flex align-items-center mb-2">
|
<div className="flex align-items-center mb-2">
|
||||||
<i className="pi pi-users mr-2 text-600"></i>
|
<i className="pi pi-building mr-2 text-600"></i>
|
||||||
<span><strong>Responsable:</strong> {chantier.responsable?.prenom} {chantier.responsable?.nom}</span>
|
<span><strong>Type:</strong> {chantier.typeChantier || 'N/A'}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -205,7 +175,7 @@ export default function ChantierDetailsPage() {
|
|||||||
<div className="surface-100 border-round p-3">
|
<div className="surface-100 border-round p-3">
|
||||||
<div className="mb-3">
|
<div className="mb-3">
|
||||||
<span className="text-600 text-sm">Progression</span>
|
<span className="text-600 text-sm">Progression</span>
|
||||||
<ProgressBar value={chantier.progression || 0} className="mt-2" />
|
<ProgressBar value={0} className="mt-2" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="mb-3">
|
<div className="mb-3">
|
||||||
@@ -215,12 +185,12 @@ export default function ChantierDetailsPage() {
|
|||||||
|
|
||||||
<div className="mb-3">
|
<div className="mb-3">
|
||||||
<span className="text-600 text-sm">Fin prévue</span>
|
<span className="text-600 text-sm">Fin prévue</span>
|
||||||
<div className="font-bold">{formatDate(chantier.dateFin)}</div>
|
<div className="font-bold">{formatDate(chantier.dateFinPrevue || '')}</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<span className="text-600 text-sm">Budget</span>
|
<span className="text-600 text-sm">Budget</span>
|
||||||
<div className="font-bold text-xl text-primary">{formatMontant(chantier.budget)}</div>
|
<div className="font-bold text-xl text-primary">{formatMontant(chantier.montantPrevu || 0)}</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -239,7 +209,7 @@ export default function ChantierDetailsPage() {
|
|||||||
<i className="pi pi-calendar text-4xl text-blue-500 mb-2"></i>
|
<i className="pi pi-calendar text-4xl text-blue-500 mb-2"></i>
|
||||||
<div className="text-600 text-sm mb-1">Durée</div>
|
<div className="text-600 text-sm mb-1">Durée</div>
|
||||||
<div className="text-2xl font-bold">
|
<div className="text-2xl font-bold">
|
||||||
{Math.ceil((new Date(chantier.dateFin).getTime() - new Date(chantier.dateDebut).getTime()) / (1000 * 60 * 60 * 24))} jours
|
{chantier.dateFinPrevue ? Math.ceil((new Date(chantier.dateFinPrevue).getTime() - new Date(chantier.dateDebut).getTime()) / (1000 * 60 * 60 * 24)) : 0} jours
|
||||||
</div>
|
</div>
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
@@ -248,7 +218,7 @@ export default function ChantierDetailsPage() {
|
|||||||
<Card className="text-center">
|
<Card className="text-center">
|
||||||
<i className="pi pi-check-circle text-4xl text-green-500 mb-2"></i>
|
<i className="pi pi-check-circle text-4xl text-green-500 mb-2"></i>
|
||||||
<div className="text-600 text-sm mb-1">Avancement</div>
|
<div className="text-600 text-sm mb-1">Avancement</div>
|
||||||
<div className="text-2xl font-bold">{chantier.progression || 0}%</div>
|
<div className="text-2xl font-bold">N/A</div>
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -256,7 +226,7 @@ export default function ChantierDetailsPage() {
|
|||||||
<Card className="text-center">
|
<Card className="text-center">
|
||||||
<i className="pi pi-euro text-4xl text-orange-500 mb-2"></i>
|
<i className="pi pi-euro text-4xl text-orange-500 mb-2"></i>
|
||||||
<div className="text-600 text-sm mb-1">Budget</div>
|
<div className="text-600 text-sm mb-1">Budget</div>
|
||||||
<div className="text-2xl font-bold">{formatMontant(chantier.budget)}</div>
|
<div className="text-2xl font-bold">{formatMontant(chantier.montantPrevu || 0)}</div>
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -9,32 +9,20 @@ import { Timeline } from 'primereact/timeline';
|
|||||||
import { Tag } from 'primereact/tag';
|
import { Tag } from 'primereact/tag';
|
||||||
import { DataTable } from 'primereact/datatable';
|
import { DataTable } from 'primereact/datatable';
|
||||||
import { Column } from 'primereact/column';
|
import { Column } from 'primereact/column';
|
||||||
|
import { Chart } from 'primereact/chart';
|
||||||
interface TacheChantier {
|
import { TabView, TabPanel } from 'primereact/tabview';
|
||||||
id: number;
|
import { planningService } from '@/services/api';
|
||||||
nom: string;
|
import type { PlanningEvent } from '@/types/btp';
|
||||||
description: string;
|
|
||||||
dateDebut: string;
|
|
||||||
dateFin: string;
|
|
||||||
statut: string;
|
|
||||||
responsable: {
|
|
||||||
nom: string;
|
|
||||||
prenom: string;
|
|
||||||
};
|
|
||||||
equipe: {
|
|
||||||
nom: string;
|
|
||||||
};
|
|
||||||
progression: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function ChantierPlanningPage() {
|
export default function ChantierPlanningPage() {
|
||||||
const params = useParams();
|
const params = useParams();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const id = params.id as string;
|
const id = params.id as string;
|
||||||
|
|
||||||
const [taches, setTaches] = useState<TacheChantier[]>([]);
|
const [taches, setTaches] = useState<PlanningEvent[]>([]);
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
const [selectedDate, setSelectedDate] = useState<Date | null>(new Date());
|
const [selectedDate, setSelectedDate] = useState<Date | null>(new Date());
|
||||||
|
const [viewMode, setViewMode] = useState<'timeline' | 'gantt'>('timeline');
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (id) {
|
if (id) {
|
||||||
@@ -45,19 +33,13 @@ export default function ChantierPlanningPage() {
|
|||||||
const loadPlanning = async () => {
|
const loadPlanning = async () => {
|
||||||
try {
|
try {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
const API_URL = process.env.NEXT_PUBLIC_API_URL || 'https://api.lions.dev/btpxpress';
|
// Récupérer les événements de planning pour ce chantier
|
||||||
|
const data = await planningService.getEvents({ chantierId: id });
|
||||||
// Charger les tâches du chantier
|
setTaches(data || []);
|
||||||
const response = await fetch(`${API_URL}/api/v1/chantiers/${id}/taches`);
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error('Erreur lors du chargement du planning');
|
|
||||||
}
|
|
||||||
|
|
||||||
const data = await response.json();
|
|
||||||
setTaches(data);
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Erreur:', error);
|
console.error('Erreur lors du chargement du planning:', error);
|
||||||
|
// L'intercepteur API gérera automatiquement la redirection si 401
|
||||||
|
setTaches([]);
|
||||||
} finally {
|
} finally {
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
}
|
}
|
||||||
@@ -93,7 +75,7 @@ export default function ChantierPlanningPage() {
|
|||||||
return labels[statut] || statut;
|
return labels[statut] || statut;
|
||||||
};
|
};
|
||||||
|
|
||||||
const statutBodyTemplate = (rowData: TacheChantier) => {
|
const statutBodyTemplate = (rowData: PlanningEvent) => {
|
||||||
return (
|
return (
|
||||||
<Tag
|
<Tag
|
||||||
value={getStatutLabel(rowData.statut)}
|
value={getStatutLabel(rowData.statut)}
|
||||||
@@ -102,7 +84,7 @@ export default function ChantierPlanningPage() {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const dateBodyTemplate = (rowData: TacheChantier) => {
|
const dateBodyTemplate = (rowData: PlanningEvent) => {
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<div><strong>Début:</strong> {formatDate(rowData.dateDebut)}</div>
|
<div><strong>Début:</strong> {formatDate(rowData.dateDebut)}</div>
|
||||||
@@ -111,31 +93,16 @@ export default function ChantierPlanningPage() {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const responsableBodyTemplate = (rowData: TacheChantier) => {
|
const equipeBodyTemplate = (rowData: PlanningEvent) => {
|
||||||
return `${rowData.responsable?.prenom} ${rowData.responsable?.nom}`;
|
|
||||||
};
|
|
||||||
|
|
||||||
const equipeBodyTemplate = (rowData: TacheChantier) => {
|
|
||||||
return rowData.equipe?.nom || 'Non assignée';
|
return rowData.equipe?.nom || 'Non assignée';
|
||||||
};
|
};
|
||||||
|
|
||||||
const progressionBodyTemplate = (rowData: TacheChantier) => {
|
const prioriteBodyTemplate = (rowData: PlanningEvent) => {
|
||||||
return (
|
const severity = rowData.priorite === 'CRITIQUE' ? 'danger' : rowData.priorite === 'HAUTE' ? 'warning' : rowData.priorite === 'NORMALE' ? 'info' : 'success';
|
||||||
<div className="flex align-items-center">
|
return <Tag value={rowData.priorite} severity={severity} />;
|
||||||
<div className="flex-1 mr-2">
|
|
||||||
<div className="surface-300 border-round" style={{ height: '8px' }}>
|
|
||||||
<div
|
|
||||||
className="bg-primary border-round"
|
|
||||||
style={{ height: '8px', width: `${rowData.progression}%` }}
|
|
||||||
></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<span>{rowData.progression}%</span>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const actionsBodyTemplate = (rowData: TacheChantier) => {
|
const actionsBodyTemplate = (rowData: PlanningEvent) => {
|
||||||
return (
|
return (
|
||||||
<div className="flex gap-2">
|
<div className="flex gap-2">
|
||||||
<Button
|
<Button
|
||||||
@@ -157,7 +124,7 @@ export default function ChantierPlanningPage() {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const customizedMarker = (item: TacheChantier) => {
|
const customizedMarker = (item: PlanningEvent) => {
|
||||||
return (
|
return (
|
||||||
<span
|
<span
|
||||||
className="flex w-2rem h-2rem align-items-center justify-content-center text-white border-circle z-1 shadow-1"
|
className="flex w-2rem h-2rem align-items-center justify-content-center text-white border-circle z-1 shadow-1"
|
||||||
@@ -168,23 +135,85 @@ export default function ChantierPlanningPage() {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const customizedContent = (item: TacheChantier) => {
|
const customizedContent = (item: PlanningEvent) => {
|
||||||
return (
|
return (
|
||||||
<Card>
|
<Card>
|
||||||
<div className="flex justify-content-between align-items-center mb-2">
|
<div className="flex justify-content-between align-items-center mb-2">
|
||||||
<span className="font-bold">{item.nom}</span>
|
<span className="font-bold">{item.titre}</span>
|
||||||
<Tag value={getStatutLabel(item.statut)} severity={getStatutSeverity(item.statut)} />
|
<Tag value={getStatutLabel(item.statut)} severity={getStatutSeverity(item.statut)} />
|
||||||
</div>
|
</div>
|
||||||
<p className="text-600 mb-2">{item.description}</p>
|
<p className="text-600 mb-2">{item.description}</p>
|
||||||
<div className="text-sm">
|
<div className="text-sm">
|
||||||
<div><strong>Responsable:</strong> {item.responsable?.prenom} {item.responsable?.nom}</div>
|
|
||||||
<div><strong>Équipe:</strong> {item.equipe?.nom || 'Non assignée'}</div>
|
<div><strong>Équipe:</strong> {item.equipe?.nom || 'Non assignée'}</div>
|
||||||
|
<div><strong>Priorité:</strong> {item.priorite}</div>
|
||||||
<div><strong>Dates:</strong> {formatDate(item.dateDebut)} - {formatDate(item.dateFin)}</div>
|
<div><strong>Dates:</strong> {formatDate(item.dateDebut)} - {formatDate(item.dateFin)}</div>
|
||||||
</div>
|
</div>
|
||||||
</Card>
|
</Card>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Générer les données pour le diagramme de Gantt
|
||||||
|
const getGanttData = () => {
|
||||||
|
if (!taches || taches.length === 0) return null;
|
||||||
|
|
||||||
|
// Calculer les durées en jours pour chaque tâche
|
||||||
|
const ganttDatasets = taches.map(tache => {
|
||||||
|
const debut = new Date(tache.dateDebut).getTime();
|
||||||
|
const fin = new Date(tache.dateFin).getTime();
|
||||||
|
const duree = Math.ceil((fin - debut) / (1000 * 60 * 60 * 24));
|
||||||
|
|
||||||
|
return {
|
||||||
|
label: tache.titre,
|
||||||
|
duree: duree,
|
||||||
|
statut: tache.statut
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
const colors = ganttDatasets.map(item => {
|
||||||
|
switch (item.statut?.toUpperCase()) {
|
||||||
|
case 'TERMINE': return '#10b981';
|
||||||
|
case 'EN_COURS': return '#3b82f6';
|
||||||
|
case 'EN_RETARD': return '#ef4444';
|
||||||
|
default: return '#6b7280';
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return {
|
||||||
|
labels: ganttDatasets.map(d => d.label),
|
||||||
|
datasets: [{
|
||||||
|
label: 'Durée (jours)',
|
||||||
|
data: ganttDatasets.map(d => d.duree),
|
||||||
|
backgroundColor: colors,
|
||||||
|
borderColor: colors,
|
||||||
|
borderWidth: 1
|
||||||
|
}]
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
const ganttOptions = {
|
||||||
|
indexAxis: 'y' as const,
|
||||||
|
responsive: true,
|
||||||
|
maintainAspectRatio: false,
|
||||||
|
plugins: {
|
||||||
|
legend: {
|
||||||
|
display: false
|
||||||
|
},
|
||||||
|
title: {
|
||||||
|
display: true,
|
||||||
|
text: 'Diagramme de Gantt - Durée des tâches'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
scales: {
|
||||||
|
x: {
|
||||||
|
beginAtZero: true,
|
||||||
|
title: {
|
||||||
|
display: true,
|
||||||
|
text: 'Durée (jours)'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="grid">
|
<div className="grid">
|
||||||
<div className="col-12">
|
<div className="col-12">
|
||||||
@@ -200,9 +229,10 @@ export default function ChantierPlanningPage() {
|
|||||||
</div>
|
</div>
|
||||||
<div className="flex gap-2">
|
<div className="flex gap-2">
|
||||||
<Button
|
<Button
|
||||||
label="Vue Gantt"
|
label={viewMode === 'timeline' ? 'Vue Gantt' : 'Vue Timeline'}
|
||||||
icon="pi pi-chart-bar"
|
icon={viewMode === 'timeline' ? 'pi pi-chart-bar' : 'pi pi-history'}
|
||||||
className="p-button-outlined"
|
className="p-button-outlined"
|
||||||
|
onClick={() => setViewMode(viewMode === 'timeline' ? 'gantt' : 'timeline')}
|
||||||
/>
|
/>
|
||||||
<Button
|
<Button
|
||||||
label="Ajouter une tâche"
|
label="Ajouter une tâche"
|
||||||
@@ -247,9 +277,10 @@ export default function ChantierPlanningPage() {
|
|||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Timeline */}
|
{/* Timeline ou Gantt */}
|
||||||
<div className="col-12 lg:col-8">
|
<div className="col-12 lg:col-8">
|
||||||
<Card title="Chronologie des tâches">
|
<Card title={viewMode === 'timeline' ? 'Chronologie des tâches' : 'Diagramme de Gantt'}>
|
||||||
|
{viewMode === 'timeline' ? (
|
||||||
<Timeline
|
<Timeline
|
||||||
value={taches}
|
value={taches}
|
||||||
align="alternate"
|
align="alternate"
|
||||||
@@ -257,6 +288,18 @@ export default function ChantierPlanningPage() {
|
|||||||
marker={customizedMarker}
|
marker={customizedMarker}
|
||||||
content={customizedContent}
|
content={customizedContent}
|
||||||
/>
|
/>
|
||||||
|
) : (
|
||||||
|
<div style={{ height: '400px' }}>
|
||||||
|
{getGanttData() ? (
|
||||||
|
<Chart type="bar" data={getGanttData()!} options={ganttOptions} />
|
||||||
|
) : (
|
||||||
|
<div className="text-center p-5 text-600">
|
||||||
|
<i className="pi pi-chart-bar text-4xl mb-3"></i>
|
||||||
|
<p>Aucune tâche à afficher dans le diagramme de Gantt</p>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -273,12 +316,11 @@ export default function ChantierPlanningPage() {
|
|||||||
sortField="dateDebut"
|
sortField="dateDebut"
|
||||||
sortOrder={1}
|
sortOrder={1}
|
||||||
>
|
>
|
||||||
<Column field="nom" header="Tâche" sortable filter />
|
<Column field="titre" header="Tâche" sortable filter />
|
||||||
<Column field="statut" header="Statut" body={statutBodyTemplate} sortable filter />
|
<Column field="statut" header="Statut" body={statutBodyTemplate} sortable filter />
|
||||||
<Column header="Dates" body={dateBodyTemplate} sortable />
|
<Column header="Dates" body={dateBodyTemplate} sortable />
|
||||||
<Column header="Responsable" body={responsableBodyTemplate} sortable filter />
|
<Column header="Priorité" body={prioriteBodyTemplate} sortable filter />
|
||||||
<Column header="Équipe" body={equipeBodyTemplate} sortable filter />
|
<Column header="Équipe" body={equipeBodyTemplate} sortable filter />
|
||||||
<Column header="Progression" body={progressionBodyTemplate} sortable />
|
|
||||||
<Column header="Actions" body={actionsBodyTemplate} />
|
<Column header="Actions" body={actionsBodyTemplate} />
|
||||||
</DataTable>
|
</DataTable>
|
||||||
</Card>
|
</Card>
|
||||||
|
|||||||
@@ -10,36 +10,8 @@ import { Divider } from 'primereact/divider';
|
|||||||
import { DataTable } from 'primereact/datatable';
|
import { DataTable } from 'primereact/datatable';
|
||||||
import { Column } from 'primereact/column';
|
import { Column } from 'primereact/column';
|
||||||
import { Tag } from 'primereact/tag';
|
import { Tag } from 'primereact/tag';
|
||||||
|
import { clientService } from '@/services/api';
|
||||||
interface Client {
|
import type { Client, Chantier, Facture } from '@/types/btp';
|
||||||
id: number;
|
|
||||||
nom: string;
|
|
||||||
email: string;
|
|
||||||
telephone: string;
|
|
||||||
adresse: string;
|
|
||||||
ville: string;
|
|
||||||
codePostal: string;
|
|
||||||
typeClient: string;
|
|
||||||
dateCreation: string;
|
|
||||||
chantiers: Chantier[];
|
|
||||||
factures: Facture[];
|
|
||||||
}
|
|
||||||
|
|
||||||
interface Chantier {
|
|
||||||
id: number;
|
|
||||||
nom: string;
|
|
||||||
statut: string;
|
|
||||||
dateDebut: string;
|
|
||||||
budget: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface Facture {
|
|
||||||
id: number;
|
|
||||||
numero: string;
|
|
||||||
montant: number;
|
|
||||||
dateEmission: string;
|
|
||||||
statut: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function ClientDetailsPage() {
|
export default function ClientDetailsPage() {
|
||||||
const params = useParams();
|
const params = useParams();
|
||||||
@@ -58,15 +30,11 @@ export default function ClientDetailsPage() {
|
|||||||
const loadClient = async () => {
|
const loadClient = async () => {
|
||||||
try {
|
try {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
const API_URL = process.env.NEXT_PUBLIC_API_URL || 'https://api.lions.dev/btpxpress';
|
const data = await clientService.getById(id);
|
||||||
const response = await fetch(`${API_URL}/api/v1/clients/${id}`);
|
|
||||||
|
|
||||||
if (response.ok) {
|
|
||||||
const data = await response.json();
|
|
||||||
setClient(data);
|
setClient(data);
|
||||||
}
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Erreur:', error);
|
console.error('Erreur lors du chargement du client:', error);
|
||||||
|
// L'intercepteur API gérera automatiquement la redirection si 401
|
||||||
} finally {
|
} finally {
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
}
|
}
|
||||||
@@ -87,7 +55,8 @@ export default function ClientDetailsPage() {
|
|||||||
|
|
||||||
const statutFactureTemplate = (rowData: Facture) => {
|
const statutFactureTemplate = (rowData: Facture) => {
|
||||||
const severity = rowData.statut === 'PAYEE' ? 'success' :
|
const severity = rowData.statut === 'PAYEE' ? 'success' :
|
||||||
rowData.statut === 'EN_ATTENTE' ? 'warning' : 'danger';
|
rowData.statut === 'ENVOYEE' || rowData.statut === 'BROUILLON' ? 'warning' :
|
||||||
|
rowData.statut === 'PARTIELLEMENT_PAYEE' ? 'info' : 'danger';
|
||||||
return <Tag value={rowData.statut} severity={severity} />;
|
return <Tag value={rowData.statut} severity={severity} />;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -109,8 +78,8 @@ export default function ClientDetailsPage() {
|
|||||||
/>
|
/>
|
||||||
<Avatar label={client.nom[0]} size="xlarge" shape="circle" className="mr-3" />
|
<Avatar label={client.nom[0]} size="xlarge" shape="circle" className="mr-3" />
|
||||||
<div>
|
<div>
|
||||||
<h2 className="m-0">{client.nom}</h2>
|
<h2 className="m-0">{client.nom} {client.prenom}</h2>
|
||||||
<p className="text-600 m-0">{client.typeClient}</p>
|
<p className="text-600 m-0">{client.entreprise || 'Particulier'}</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<Button
|
<Button
|
||||||
@@ -140,81 +109,24 @@ export default function ClientDetailsPage() {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="col-12 md:col-6">
|
<div className="col-12 md:col-6">
|
||||||
<h3>Statistiques</h3>
|
<h3>Informations supplémentaires</h3>
|
||||||
<div className="grid">
|
<div className="mb-2"><strong>SIRET:</strong> {client.siret || 'N/A'}</div>
|
||||||
<div className="col-6">
|
<div className="mb-2"><strong>N° TVA:</strong> {client.numeroTVA || 'N/A'}</div>
|
||||||
<Card className="text-center">
|
<div className="mb-2"><strong>Date de création:</strong> {new Date(client.dateCreation).toLocaleDateString('fr-FR')}</div>
|
||||||
<div className="text-600">Chantiers</div>
|
|
||||||
<div className="text-2xl font-bold">{client.chantiers?.length || 0}</div>
|
|
||||||
</Card>
|
|
||||||
</div>
|
|
||||||
<div className="col-6">
|
|
||||||
<Card className="text-center">
|
|
||||||
<div className="text-600">Factures</div>
|
|
||||||
<div className="text-2xl font-bold">{client.factures?.length || 0}</div>
|
|
||||||
</Card>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="col-12">
|
<div className="col-12">
|
||||||
<Card>
|
<Card title="Activités">
|
||||||
<TabView>
|
<p className="text-600">
|
||||||
<TabPanel header="Chantiers" leftIcon="pi pi-home mr-2">
|
Les chantiers et factures associés à ce client seront affichés ici une fois la relation établie dans le backend.
|
||||||
<DataTable value={client.chantiers || []} emptyMessage="Aucun chantier">
|
</p>
|
||||||
<Column field="nom" header="Nom" sortable />
|
<div className="flex gap-2 mt-3">
|
||||||
<Column field="statut" header="Statut" body={statutChantierTemplate} sortable />
|
<Button label="Voir les chantiers" icon="pi pi-home" className="p-button-outlined" onClick={() => router.push('/chantiers')} />
|
||||||
<Column field="dateDebut" header="Date début" sortable />
|
<Button label="Voir les factures" icon="pi pi-file" className="p-button-outlined" onClick={() => router.push('/factures')} />
|
||||||
<Column
|
</div>
|
||||||
field="budget"
|
|
||||||
header="Budget"
|
|
||||||
body={(rowData) => formatMontant(rowData.budget)}
|
|
||||||
sortable
|
|
||||||
/>
|
|
||||||
<Column
|
|
||||||
header="Actions"
|
|
||||||
body={(rowData) => (
|
|
||||||
<Button
|
|
||||||
icon="pi pi-eye"
|
|
||||||
className="p-button-text p-button-sm"
|
|
||||||
onClick={() => router.push(`/chantiers/${rowData.id}`)}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
</DataTable>
|
|
||||||
</TabPanel>
|
|
||||||
|
|
||||||
<TabPanel header="Factures" leftIcon="pi pi-file mr-2">
|
|
||||||
<DataTable value={client.factures || []} emptyMessage="Aucune facture">
|
|
||||||
<Column field="numero" header="Numéro" sortable />
|
|
||||||
<Column
|
|
||||||
field="montant"
|
|
||||||
header="Montant"
|
|
||||||
body={(rowData) => formatMontant(rowData.montant)}
|
|
||||||
sortable
|
|
||||||
/>
|
|
||||||
<Column field="dateEmission" header="Date" sortable />
|
|
||||||
<Column field="statut" header="Statut" body={statutFactureTemplate} sortable />
|
|
||||||
<Column
|
|
||||||
header="Actions"
|
|
||||||
body={(rowData) => (
|
|
||||||
<Button
|
|
||||||
icon="pi pi-eye"
|
|
||||||
className="p-button-text p-button-sm"
|
|
||||||
onClick={() => router.push(`/factures/${rowData.id}`)}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
</DataTable>
|
|
||||||
</TabPanel>
|
|
||||||
|
|
||||||
<TabPanel header="Documents" leftIcon="pi pi-folder mr-2">
|
|
||||||
<p>Documents du client</p>
|
|
||||||
</TabPanel>
|
|
||||||
</TabView>
|
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -36,61 +36,28 @@ const Dashboard = () => {
|
|||||||
const searchParams = useSearchParams();
|
const searchParams = useSearchParams();
|
||||||
const [selectedChantier, setSelectedChantier] = useState<ChantierActif | null>(null);
|
const [selectedChantier, setSelectedChantier] = useState<ChantierActif | null>(null);
|
||||||
const [showQuickView, setShowQuickView] = useState(false);
|
const [showQuickView, setShowQuickView] = useState(false);
|
||||||
const [authProcessed, setAuthProcessed] = useState(false);
|
|
||||||
const [authError, setAuthError] = useState<string | null>(null);
|
|
||||||
const [authInProgress, setAuthInProgress] = useState(false);
|
|
||||||
const [isHydrated, setIsHydrated] = useState(false);
|
|
||||||
|
|
||||||
// Flag global pour éviter les appels multiples (React 18 StrictMode)
|
// Nettoyer les paramètres OAuth de l'URL après le retour de Keycloak
|
||||||
const authProcessingRef = useRef(false);
|
|
||||||
// Mémoriser le code traité pour éviter les retraitements
|
|
||||||
const processedCodeRef = useRef<string | null>(null);
|
|
||||||
// Flag pour éviter les redirections multiples
|
|
||||||
const redirectingRef = useRef(false);
|
|
||||||
|
|
||||||
const currentCode = searchParams.get('code');
|
|
||||||
const currentState = searchParams.get('state');
|
|
||||||
|
|
||||||
console.log('🏗️ Dashboard: SearchParams:', {
|
|
||||||
code: currentCode?.substring(0, 20) + '...',
|
|
||||||
state: currentState,
|
|
||||||
authProcessed,
|
|
||||||
processedCode: processedCodeRef.current?.substring(0, 20) + '...',
|
|
||||||
authInProgress: authInProgress
|
|
||||||
});
|
|
||||||
|
|
||||||
// Gérer l'hydratation pour éviter les erreurs SSR/CSR
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setIsHydrated(true);
|
if (typeof window === 'undefined') return;
|
||||||
}, []);
|
|
||||||
|
|
||||||
// Réinitialiser authProcessed si on a un nouveau code d'autorisation
|
|
||||||
useEffect(() => {
|
|
||||||
if (!isHydrated) return; // Attendre l'hydratation
|
|
||||||
|
|
||||||
if (currentCode && authProcessed && !authInProgress && processedCodeRef.current !== currentCode) {
|
|
||||||
console.log('🔄 Dashboard: Nouveau code détecté, réinitialisation authProcessed');
|
|
||||||
setAuthProcessed(false);
|
|
||||||
processedCodeRef.current = null;
|
|
||||||
}
|
|
||||||
}, [currentCode, authProcessed, authInProgress, isHydrated]);
|
|
||||||
|
|
||||||
// Fonction pour nettoyer l'URL des paramètres d'authentification
|
|
||||||
const cleanAuthParams = useCallback(() => {
|
|
||||||
if (typeof window === 'undefined') return; // Protection SSR
|
|
||||||
|
|
||||||
const url = new URL(window.location.href);
|
const url = new URL(window.location.href);
|
||||||
if (url.searchParams.has('code') || url.searchParams.has('state')) {
|
|
||||||
|
// Nettoyer query string
|
||||||
|
if (url.searchParams.has('code') || url.searchParams.has('state') || url.searchParams.has('session_state')) {
|
||||||
|
console.log('🧹 Dashboard: Nettoyage des paramètres OAuth de l\'URL (query)');
|
||||||
url.search = '';
|
url.search = '';
|
||||||
window.history.replaceState({}, '', url.toString());
|
window.history.replaceState({}, '', url.toString());
|
||||||
// Nettoyer sessionStorage après succès if (typeof window !== 'undefined') { sessionStorage.removeItem('oauth_code_processed'); }
|
}
|
||||||
|
|
||||||
|
// Nettoyer fragment (hash) si Keycloak utilise implicit flow par erreur
|
||||||
|
if (url.hash && (url.hash.includes('code=') || url.hash.includes('state='))) {
|
||||||
|
console.log('🧹 Dashboard: Nettoyage des paramètres OAuth de l\'URL (fragment)');
|
||||||
|
url.hash = '';
|
||||||
|
window.history.replaceState({}, '', url.toString());
|
||||||
}
|
}
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
// Hooks pour les données et actions du dashboard
|
|
||||||
// Charger les données après authentification ou si pas de code d'autorisation
|
|
||||||
const shouldLoadData = authProcessed || !currentCode;
|
|
||||||
|
|
||||||
const {
|
const {
|
||||||
metrics,
|
metrics,
|
||||||
chantiersActifs,
|
chantiersActifs,
|
||||||
@@ -104,6 +71,8 @@ const Dashboard = () => {
|
|||||||
onRefresh: refresh
|
onRefresh: refresh
|
||||||
});
|
});
|
||||||
|
|
||||||
|
console.log('🏗️ Dashboard: État du chargement -', { loading, metricsLoaded: !!metrics, chantiersCount: chantiersActifs?.length || 0 });
|
||||||
|
|
||||||
// Optimisations avec useMemo pour les calculs coûteux
|
// Optimisations avec useMemo pour les calculs coûteux
|
||||||
const formattedMetrics = useMemo(() => {
|
const formattedMetrics = useMemo(() => {
|
||||||
if (!metrics) return null;
|
if (!metrics) return null;
|
||||||
@@ -194,129 +163,6 @@ const Dashboard = () => {
|
|||||||
chantierActions.handleQuickView(chantier);
|
chantierActions.handleQuickView(chantier);
|
||||||
}, [chantierActions]);
|
}, [chantierActions]);
|
||||||
|
|
||||||
// Traiter l'authentification Keycloak si nécessaire
|
|
||||||
useEffect(() => {
|
|
||||||
// Attendre l'hydratation avant de traiter l'authentification
|
|
||||||
if (!isHydrated) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Mode développement : ignorer l'authentification Keycloak
|
|
||||||
if (process.env.NEXT_PUBLIC_DEV_MODE === 'true' || process.env.NEXT_PUBLIC_SKIP_AUTH === 'true') {
|
|
||||||
console.log('🔧 Dashboard: Mode développement détecté, authentification ignorée');
|
|
||||||
setAuthProcessed(true);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Si l'authentification est déjà terminée, ne rien faire
|
|
||||||
if (authProcessed) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Si on est en train de rediriger, ne rien faire
|
|
||||||
if (redirectingRef.current) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const processAuth = async () => {
|
|
||||||
try {
|
|
||||||
// Protection absolue contre les boucles
|
|
||||||
if (authInProgress || authProcessingRef.current) {
|
|
||||||
console.log('🛑 Dashboard: Processus d\'authentification déjà en cours, arrêt');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Les tokens sont maintenant stockés dans des cookies HttpOnly
|
|
||||||
// Le middleware les vérifiera automatiquement
|
|
||||||
// Pas besoin de vérifier localStorage
|
|
||||||
|
|
||||||
const code = currentCode;
|
|
||||||
const state = currentState;
|
|
||||||
const error = searchParams.get('error');
|
|
||||||
|
|
||||||
if (error) {
|
|
||||||
setAuthError(`Erreur d'authentification: ${error}`);
|
|
||||||
setAuthProcessed(true);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Vérifier si ce code a déjà été traité
|
|
||||||
if (code && !authProcessed && !authInProgress && !authProcessingRef.current && processedCodeRef.current !== code) {
|
|
||||||
try {
|
|
||||||
console.log('🔐 Traitement du code d\'autorisation Keycloak...', { code: code.substring(0, 20) + '...', state });
|
|
||||||
|
|
||||||
// Marquer IMMÉDIATEMENT dans sessionStorage pour empêcher double traitement
|
|
||||||
if (typeof window !== 'undefined') {
|
|
||||||
sessionStorage.setItem('oauth_code_processed', code);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Marquer l'authentification comme en cours pour éviter les appels multiples
|
|
||||||
authProcessingRef.current = true;
|
|
||||||
processedCodeRef.current = code;
|
|
||||||
setAuthInProgress(true);
|
|
||||||
|
|
||||||
console.log('📡 Appel de /api/auth/token...');
|
|
||||||
|
|
||||||
// Utiliser fetch au lieu d'un formulaire pour éviter la boucle de redirection
|
|
||||||
const response = await fetch('/api/auth/token', {
|
|
||||||
method: 'POST',
|
|
||||||
headers: { 'Content-Type': 'application/json' },
|
|
||||||
body: JSON.stringify({ code, state: state || '' })
|
|
||||||
});
|
|
||||||
|
|
||||||
if (response.ok) {
|
|
||||||
console.log('✅ Authentification réussie, tokens stockés dans les cookies');
|
|
||||||
|
|
||||||
// Nettoyer l'URL en enlevant les paramètres OAuth
|
|
||||||
window.history.replaceState({}, '', '/dashboard');
|
|
||||||
// Nettoyer sessionStorage après succès if (typeof window !== 'undefined') { sessionStorage.removeItem('oauth_code_processed'); }
|
|
||||||
|
|
||||||
// Marquer l'authentification comme terminée
|
|
||||||
setAuthProcessed(true);
|
|
||||||
setAuthInProgress(false);
|
|
||||||
authProcessingRef.current = false;
|
|
||||||
} else {
|
|
||||||
console.error("❌ Erreur lors de l'authentification");
|
|
||||||
const errorData = await response.json();
|
|
||||||
setAuthError(`Erreur lors de l'authentification: ${errorData.error || 'Erreur inconnue'}`);
|
|
||||||
setAuthProcessed(true);
|
|
||||||
setAuthInProgress(false);
|
|
||||||
authProcessingRef.current = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
} catch (error) {
|
|
||||||
console.error('❌ Erreur lors du traitement de l\'authentification:', error);
|
|
||||||
|
|
||||||
// ARRÊTER LA BOUCLE : Ne pas rediriger automatiquement, juste marquer comme traité
|
|
||||||
console.log('🛑 Dashboard: Erreur d\'authentification, arrêt du processus pour éviter la boucle');
|
|
||||||
|
|
||||||
const errorMessage = error instanceof Error ? error.message : 'Erreur inconnue lors de l\'authentification';
|
|
||||||
setAuthError(`Erreur lors de l'authentification: ${errorMessage}`);
|
|
||||||
setAuthProcessed(true);
|
|
||||||
setAuthInProgress(false);
|
|
||||||
authProcessingRef.current = false;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
setAuthProcessed(true);
|
|
||||||
setAuthInProgress(false);
|
|
||||||
authProcessingRef.current = false;
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.error('❌ Erreur générale lors du traitement de l\'authentification:', error);
|
|
||||||
const errorMessage = error instanceof Error ? error.message : 'Erreur inconnue lors de l\'authentification';
|
|
||||||
setAuthError(`Erreur lors de l'authentification: ${errorMessage}`);
|
|
||||||
setAuthProcessed(true);
|
|
||||||
setAuthInProgress(false);
|
|
||||||
authProcessingRef.current = false;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
processAuth();
|
|
||||||
}, [currentCode, currentState, authProcessed, authInProgress, isHydrated]);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
const actionBodyTemplate = useCallback((rowData: ChantierActif) => {
|
const actionBodyTemplate = useCallback((rowData: ChantierActif) => {
|
||||||
const actions: ActionButtonType[] = ['VIEW', 'PHASES', 'PLANNING', 'STATS', 'MENU'];
|
const actions: ActionButtonType[] = ['VIEW', 'PHASES', 'PLANNING', 'STATS', 'MENU'];
|
||||||
|
|
||||||
@@ -385,68 +231,6 @@ const Dashboard = () => {
|
|||||||
);
|
);
|
||||||
}, [handleQuickView, router, chantierActions]);
|
}, [handleQuickView, router, chantierActions]);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Attendre l'hydratation pour éviter les erreurs SSR/CSR
|
|
||||||
if (!isHydrated) {
|
|
||||||
return (
|
|
||||||
<div className="grid">
|
|
||||||
<div className="col-12">
|
|
||||||
<div className="card">
|
|
||||||
<div className="text-center">
|
|
||||||
<ProgressSpinner style={{ width: '50px', height: '50px' }} />
|
|
||||||
<h5 className="mt-3">Chargement...</h5>
|
|
||||||
<p className="text-600">Initialisation de l'application</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Afficher le chargement pendant le traitement de l'authentification
|
|
||||||
if (!authProcessed) {
|
|
||||||
return (
|
|
||||||
<div className="grid">
|
|
||||||
<div className="col-12">
|
|
||||||
<div className="card">
|
|
||||||
<div className="text-center">
|
|
||||||
<ProgressSpinner style={{ width: '50px', height: '50px' }} />
|
|
||||||
<h5 className="mt-3">Authentification en cours...</h5>
|
|
||||||
<p className="text-600">Traitement des informations de connexion</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Afficher l'erreur d'authentification
|
|
||||||
if (authError) {
|
|
||||||
return (
|
|
||||||
<div className="grid">
|
|
||||||
<div className="col-12">
|
|
||||||
<div className="card">
|
|
||||||
<div className="text-center">
|
|
||||||
<i className="pi pi-exclamation-triangle text-red-500" style={{ fontSize: '4rem' }}></i>
|
|
||||||
<h5 className="text-red-500">Erreur d'authentification</h5>
|
|
||||||
<p className="text-600 mb-4">{authError}</p>
|
|
||||||
<Button
|
|
||||||
label="Retour à la connexion"
|
|
||||||
icon="pi pi-sign-in"
|
|
||||||
onClick={() => window.location.href = '/api/auth/login'}
|
|
||||||
className="p-button-outlined"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (loading) {
|
if (loading) {
|
||||||
return (
|
return (
|
||||||
<div className="grid">
|
<div className="grid">
|
||||||
|
|||||||
@@ -10,38 +10,8 @@ import { Calendar } from 'primereact/calendar';
|
|||||||
import { DataTable } from 'primereact/datatable';
|
import { DataTable } from 'primereact/datatable';
|
||||||
import { Column } from 'primereact/column';
|
import { Column } from 'primereact/column';
|
||||||
import { Timeline } from 'primereact/timeline';
|
import { Timeline } from 'primereact/timeline';
|
||||||
|
import { materielService } from '@/services/api';
|
||||||
interface Materiel {
|
import type { Materiel } from '@/types/btp';
|
||||||
id: number;
|
|
||||||
nom: string;
|
|
||||||
reference: string;
|
|
||||||
type: string;
|
|
||||||
marque: string;
|
|
||||||
modele: string;
|
|
||||||
statut: string;
|
|
||||||
dateAchat: string;
|
|
||||||
prixAchat: number;
|
|
||||||
tauxJournalier: number;
|
|
||||||
disponibilite: string;
|
|
||||||
reservations: Reservation[];
|
|
||||||
maintenances: Maintenance[];
|
|
||||||
}
|
|
||||||
|
|
||||||
interface Reservation {
|
|
||||||
id: number;
|
|
||||||
chantier: string;
|
|
||||||
dateDebut: string;
|
|
||||||
dateFin: string;
|
|
||||||
statut: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface Maintenance {
|
|
||||||
id: number;
|
|
||||||
type: string;
|
|
||||||
date: string;
|
|
||||||
description: string;
|
|
||||||
cout: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function MaterielDetailsPage() {
|
export default function MaterielDetailsPage() {
|
||||||
const params = useParams();
|
const params = useParams();
|
||||||
@@ -60,15 +30,11 @@ export default function MaterielDetailsPage() {
|
|||||||
const loadMateriel = async () => {
|
const loadMateriel = async () => {
|
||||||
try {
|
try {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
const API_URL = process.env.NEXT_PUBLIC_API_URL || 'https://api.lions.dev/btpxpress';
|
const data = await materielService.getById(id);
|
||||||
const response = await fetch(`${API_URL}/api/v1/materiels/${id}`);
|
|
||||||
|
|
||||||
if (response.ok) {
|
|
||||||
const data = await response.json();
|
|
||||||
setMateriel(data);
|
setMateriel(data);
|
||||||
}
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Erreur:', error);
|
console.error('Erreur lors du chargement du matériel:', error);
|
||||||
|
// L'intercepteur API gérera automatiquement la redirection si 401
|
||||||
} finally {
|
} finally {
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
}
|
}
|
||||||
@@ -96,9 +62,6 @@ export default function MaterielDetailsPage() {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const statutTemplate = (rowData: Reservation) => {
|
|
||||||
return <Tag value={rowData.statut} severity={getStatutSeverity(rowData.statut)} />;
|
|
||||||
};
|
|
||||||
|
|
||||||
if (loading || !materiel) {
|
if (loading || !materiel) {
|
||||||
return <div>Chargement...</div>;
|
return <div>Chargement...</div>;
|
||||||
@@ -118,7 +81,7 @@ export default function MaterielDetailsPage() {
|
|||||||
/>
|
/>
|
||||||
<div>
|
<div>
|
||||||
<h2 className="m-0">{materiel.nom}</h2>
|
<h2 className="m-0">{materiel.nom}</h2>
|
||||||
<p className="text-600 m-0">{materiel.reference}</p>
|
<p className="text-600 m-0">{materiel.numeroSerie || 'N/A'}</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
@@ -139,11 +102,11 @@ export default function MaterielDetailsPage() {
|
|||||||
<div className="col-12 md:col-6">
|
<div className="col-12 md:col-6">
|
||||||
<h3>Informations</h3>
|
<h3>Informations</h3>
|
||||||
<div className="mb-2"><strong>Type:</strong> {materiel.type}</div>
|
<div className="mb-2"><strong>Type:</strong> {materiel.type}</div>
|
||||||
<div className="mb-2"><strong>Marque:</strong> {materiel.marque}</div>
|
<div className="mb-2"><strong>Marque:</strong> {materiel.marque || 'N/A'}</div>
|
||||||
<div className="mb-2"><strong>Modèle:</strong> {materiel.modele}</div>
|
<div className="mb-2"><strong>Modèle:</strong> {materiel.modele || 'N/A'}</div>
|
||||||
<div className="mb-2"><strong>Date d'achat:</strong> {materiel.dateAchat}</div>
|
<div className="mb-2"><strong>Date d'achat:</strong> {materiel.dateAchat || 'N/A'}</div>
|
||||||
<div className="mb-2"><strong>Prix d'achat:</strong> {formatMontant(materiel.prixAchat)}</div>
|
<div className="mb-2"><strong>Valeur d'achat:</strong> {formatMontant(materiel.valeurAchat || 0)}</div>
|
||||||
<div className="mb-2"><strong>Tarif journalier:</strong> {formatMontant(materiel.tauxJournalier)}</div>
|
<div className="mb-2"><strong>Coût d'utilisation:</strong> {formatMontant(materiel.coutUtilisation || 0)}</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="col-12 md:col-6">
|
<div className="col-12 md:col-6">
|
||||||
@@ -155,41 +118,14 @@ export default function MaterielDetailsPage() {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="col-12">
|
<div className="col-12">
|
||||||
<Card>
|
<Card title="Historique d'utilisation">
|
||||||
<TabView>
|
<p className="text-600">
|
||||||
<TabPanel header="Réservations" leftIcon="pi pi-calendar mr-2">
|
Les réservations et maintenances de ce matériel seront affichées ici une fois la relation établie dans le backend.
|
||||||
<DataTable value={materiel.reservations || []} emptyMessage="Aucune réservation">
|
</p>
|
||||||
<Column field="chantier" header="Chantier" sortable />
|
<div className="flex gap-2 mt-3">
|
||||||
<Column field="dateDebut" header="Date début" sortable />
|
<Button label="Voir le planning" icon="pi pi-calendar" className="p-button-outlined" onClick={() => router.push('/planning')} />
|
||||||
<Column field="dateFin" header="Date fin" sortable />
|
<Button label="Planifier une maintenance" icon="pi pi-wrench" className="p-button-outlined" />
|
||||||
<Column field="statut" header="Statut" body={statutTemplate} sortable />
|
</div>
|
||||||
<Column
|
|
||||||
header="Actions"
|
|
||||||
body={() => (
|
|
||||||
<Button icon="pi pi-eye" className="p-button-text p-button-sm" />
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
</DataTable>
|
|
||||||
</TabPanel>
|
|
||||||
|
|
||||||
<TabPanel header="Maintenances" leftIcon="pi pi-wrench mr-2">
|
|
||||||
<Timeline
|
|
||||||
value={materiel.maintenances || []}
|
|
||||||
content={(item: Maintenance) => (
|
|
||||||
<Card>
|
|
||||||
<div><strong>{item.type}</strong></div>
|
|
||||||
<div className="text-600">{item.date}</div>
|
|
||||||
<p>{item.description}</p>
|
|
||||||
<div><strong>Coût:</strong> {formatMontant(item.cout)}</div>
|
|
||||||
</Card>
|
|
||||||
)}
|
|
||||||
/>
|
|
||||||
</TabPanel>
|
|
||||||
|
|
||||||
<TabPanel header="Documents" leftIcon="pi pi-folder mr-2">
|
|
||||||
<p>Documents techniques et certificats</p>
|
|
||||||
</TabPanel>
|
|
||||||
</TabView>
|
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import { Button } from 'primereact/button';
|
|||||||
import { LayoutContext } from '../../layout/context/layoutcontext';
|
import { LayoutContext } from '../../layout/context/layoutcontext';
|
||||||
import { PrimeReactContext } from 'primereact/api';
|
import { PrimeReactContext } from 'primereact/api';
|
||||||
import type { ColorScheme, Page } from '@/types';
|
import type { ColorScheme, Page } from '@/types';
|
||||||
|
import { redirectToLogin } from '@/lib/auth';
|
||||||
|
|
||||||
const LandingPage: Page = () => {
|
const LandingPage: Page = () => {
|
||||||
const { layoutConfig, setLayoutConfig } = useContext(LayoutContext);
|
const { layoutConfig, setLayoutConfig } = useContext(LayoutContext);
|
||||||
@@ -140,13 +141,13 @@ const LandingPage: Page = () => {
|
|||||||
</StyleClass>
|
</StyleClass>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<a href="http://localhost:8080/api/v1/auth/login" className="p-ripple flex m-0 md:ml-5 md:px-0 px-3 py-3 text-gray-800 font-medium line-height-3 hover:text-gray-800 cursor-pointer">
|
<a onClick={() => redirectToLogin()} className="p-ripple flex m-0 md:ml-5 md:px-0 px-3 py-3 text-gray-800 font-medium line-height-3 hover:text-gray-800 cursor-pointer">
|
||||||
<span>Connexion</span>
|
<span>Connexion</span>
|
||||||
<Ripple />
|
<Ripple />
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<a href="http://localhost:8080/api/v1/auth/login" className="p-ripple flex m-0 md:ml-5 md:px-0 px-3 py-3 text-gray-800 font-medium line-height-3 hover:text-gray-800 cursor-pointer">
|
<a onClick={() => redirectToLogin()} className="p-ripple flex m-0 md:ml-5 md:px-0 px-3 py-3 text-gray-800 font-medium line-height-3 hover:text-gray-800 cursor-pointer">
|
||||||
<span>Inscription</span>
|
<span>Inscription</span>
|
||||||
<Ripple />
|
<Ripple />
|
||||||
</a>
|
</a>
|
||||||
@@ -182,7 +183,7 @@ const LandingPage: Page = () => {
|
|||||||
Bienvenue sur BTP Xpress
|
Bienvenue sur BTP Xpress
|
||||||
</h1>
|
</h1>
|
||||||
<h2 className="mt-0 font-medium text-4xl text-gray-700">Votre plateforme de gestion BTP moderne</h2>
|
<h2 className="mt-0 font-medium text-4xl text-gray-700">Votre plateforme de gestion BTP moderne</h2>
|
||||||
<a href="http://localhost:8080/api/v1/auth/login" className="p-button text-gray-700 bg-cyan-500 border-cyan-500 font-bold border-round" style={{ mixBlendMode: 'multiply', padding: ' 0.858rem 1.142rem' }}>
|
<a onClick={() => redirectToLogin()} className="p-button text-gray-700 bg-cyan-500 border-cyan-500 font-bold border-round" style={{ mixBlendMode: 'multiply', padding: ' 0.858rem 1.142rem' }}>
|
||||||
<span className="p-button-text">Commencer</span>
|
<span className="p-button-text">Commencer</span>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,29 +0,0 @@
|
|||||||
import { NextRequest, NextResponse } from 'next/server';
|
|
||||||
|
|
||||||
const KEYCLOAK_URL = process.env.NEXT_PUBLIC_KEYCLOAK_URL || 'https://security.lions.dev';
|
|
||||||
const KEYCLOAK_REALM = process.env.NEXT_PUBLIC_KEYCLOAK_REALM || 'btpxpress';
|
|
||||||
const CLIENT_ID = process.env.NEXT_PUBLIC_KEYCLOAK_CLIENT_ID || 'btpxpress-frontend';
|
|
||||||
const REDIRECT_URI = process.env.NEXT_PUBLIC_APP_URL
|
|
||||||
? `${process.env.NEXT_PUBLIC_APP_URL}/auth/callback`
|
|
||||||
: 'https://btpxpress.lions.dev/auth/callback';
|
|
||||||
|
|
||||||
export async function GET(request: NextRequest) {
|
|
||||||
console.log('🔐 Login API called');
|
|
||||||
|
|
||||||
// Générer un state aléatoire pour CSRF protection
|
|
||||||
const state = Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);
|
|
||||||
|
|
||||||
// Construire l'URL d'autorisation Keycloak
|
|
||||||
const authUrl = new URL(`${KEYCLOAK_URL}/realms/${KEYCLOAK_REALM}/protocol/openid-connect/auth`);
|
|
||||||
|
|
||||||
authUrl.searchParams.set('client_id', CLIENT_ID);
|
|
||||||
authUrl.searchParams.set('redirect_uri', REDIRECT_URI);
|
|
||||||
authUrl.searchParams.set('response_type', 'code');
|
|
||||||
authUrl.searchParams.set('scope', 'openid profile email');
|
|
||||||
authUrl.searchParams.set('state', state);
|
|
||||||
|
|
||||||
console.log('✅ Redirecting to Keycloak:', authUrl.toString());
|
|
||||||
|
|
||||||
// Rediriger vers Keycloak pour l'authentification
|
|
||||||
return NextResponse.redirect(authUrl.toString());
|
|
||||||
}
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
import { NextRequest, NextResponse } from 'next/server';
|
|
||||||
import { cookies } from 'next/headers';
|
|
||||||
|
|
||||||
const KEYCLOAK_URL = process.env.NEXT_PUBLIC_KEYCLOAK_URL || 'https://security.lions.dev';
|
|
||||||
const KEYCLOAK_REALM = process.env.NEXT_PUBLIC_KEYCLOAK_REALM || 'btpxpress';
|
|
||||||
const CLIENT_ID = process.env.NEXT_PUBLIC_KEYCLOAK_CLIENT_ID || 'btpxpress-frontend';
|
|
||||||
const POST_LOGOUT_REDIRECT_URI = process.env.NEXT_PUBLIC_APP_URL || 'https://btpxpress.lions.dev';
|
|
||||||
|
|
||||||
export async function GET(request: NextRequest) {
|
|
||||||
console.log('🚪 Logout API called');
|
|
||||||
|
|
||||||
const cookieStore = cookies();
|
|
||||||
|
|
||||||
// Récupérer l'id_token avant de supprimer les cookies
|
|
||||||
const idToken = cookieStore.get('id_token')?.value;
|
|
||||||
|
|
||||||
// Supprimer tous les cookies d'authentification
|
|
||||||
cookieStore.delete('access_token');
|
|
||||||
cookieStore.delete('refresh_token');
|
|
||||||
cookieStore.delete('id_token');
|
|
||||||
cookieStore.delete('token_expires_at');
|
|
||||||
|
|
||||||
console.log('✅ Authentication cookies deleted');
|
|
||||||
|
|
||||||
// Si on a un id_token, on fait un logout Keycloak
|
|
||||||
if (idToken) {
|
|
||||||
const logoutUrl = new URL(
|
|
||||||
`${KEYCLOAK_URL}/realms/${KEYCLOAK_REALM}/protocol/openid-connect/logout`
|
|
||||||
);
|
|
||||||
|
|
||||||
logoutUrl.searchParams.set('client_id', CLIENT_ID);
|
|
||||||
logoutUrl.searchParams.set('post_logout_redirect_uri', POST_LOGOUT_REDIRECT_URI);
|
|
||||||
logoutUrl.searchParams.set('id_token_hint', idToken);
|
|
||||||
|
|
||||||
console.log('✅ Redirecting to Keycloak logout');
|
|
||||||
|
|
||||||
return NextResponse.redirect(logoutUrl.toString());
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sinon, rediriger directement vers la page d'accueil
|
|
||||||
console.log('✅ Redirecting to home page');
|
|
||||||
return NextResponse.redirect(POST_LOGOUT_REDIRECT_URI);
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function POST(request: NextRequest) {
|
|
||||||
// Même logique pour POST
|
|
||||||
return GET(request);
|
|
||||||
}
|
|
||||||
@@ -1,138 +0,0 @@
|
|||||||
import { NextRequest, NextResponse } from 'next/server';
|
|
||||||
import { cookies } from 'next/headers';
|
|
||||||
|
|
||||||
const KEYCLOAK_URL = process.env.NEXT_PUBLIC_KEYCLOAK_URL || 'https://security.lions.dev';
|
|
||||||
const KEYCLOAK_REALM = process.env.NEXT_PUBLIC_KEYCLOAK_REALM || 'btpxpress';
|
|
||||||
const CLIENT_ID = process.env.NEXT_PUBLIC_KEYCLOAK_CLIENT_ID || 'btpxpress-frontend';
|
|
||||||
const REDIRECT_URI = process.env.NEXT_PUBLIC_APP_URL
|
|
||||||
? `${process.env.NEXT_PUBLIC_APP_URL}/auth/callback`
|
|
||||||
: 'https://btpxpress.lions.dev/auth/callback';
|
|
||||||
|
|
||||||
const TOKEN_ENDPOINT = `${KEYCLOAK_URL}/realms/${KEYCLOAK_REALM}/protocol/openid-connect/token`;
|
|
||||||
|
|
||||||
export async function POST(request: NextRequest) {
|
|
||||||
console.log('🔐 Token exchange API called');
|
|
||||||
|
|
||||||
try {
|
|
||||||
const body = await request.json();
|
|
||||||
const { code, state } = body;
|
|
||||||
|
|
||||||
if (!code) {
|
|
||||||
console.error('❌ No authorization code provided');
|
|
||||||
return NextResponse.json(
|
|
||||||
{ error: 'Code d\'autorisation manquant' },
|
|
||||||
{ status: 400 }
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log('✅ Exchanging code with Keycloak...');
|
|
||||||
console.log('📍 Token endpoint:', TOKEN_ENDPOINT);
|
|
||||||
console.log('📍 Client ID:', CLIENT_ID);
|
|
||||||
console.log('📍 Redirect URI:', REDIRECT_URI);
|
|
||||||
|
|
||||||
// Préparer les paramètres pour l'échange de code
|
|
||||||
const params = new URLSearchParams({
|
|
||||||
grant_type: 'authorization_code',
|
|
||||||
client_id: CLIENT_ID,
|
|
||||||
code: code,
|
|
||||||
redirect_uri: REDIRECT_URI,
|
|
||||||
});
|
|
||||||
|
|
||||||
// Échanger le code contre des tokens
|
|
||||||
const tokenResponse = await fetch(TOKEN_ENDPOINT, {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/x-www-form-urlencoded',
|
|
||||||
},
|
|
||||||
body: params.toString(),
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!tokenResponse.ok) {
|
|
||||||
const errorText = await tokenResponse.text();
|
|
||||||
console.error('❌ Keycloak token exchange failed:', tokenResponse.status, errorText);
|
|
||||||
|
|
||||||
let errorData;
|
|
||||||
try {
|
|
||||||
errorData = JSON.parse(errorText);
|
|
||||||
} catch {
|
|
||||||
errorData = { error: 'Token exchange failed', details: errorText };
|
|
||||||
}
|
|
||||||
|
|
||||||
return NextResponse.json(
|
|
||||||
{
|
|
||||||
error: errorData.error || 'Échec de l\'échange de token',
|
|
||||||
error_description: errorData.error_description || 'Erreur lors de la communication avec Keycloak',
|
|
||||||
details: errorData
|
|
||||||
},
|
|
||||||
{ status: tokenResponse.status }
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const tokens = await tokenResponse.json();
|
|
||||||
console.log('✅ Tokens received from Keycloak');
|
|
||||||
|
|
||||||
// Stocker les tokens dans des cookies HttpOnly sécurisés
|
|
||||||
const cookieStore = cookies();
|
|
||||||
const isProduction = process.env.NODE_ENV === 'production';
|
|
||||||
|
|
||||||
// Access token (durée: expires_in secondes)
|
|
||||||
cookieStore.set('access_token', tokens.access_token, {
|
|
||||||
httpOnly: true,
|
|
||||||
secure: isProduction,
|
|
||||||
sameSite: 'lax',
|
|
||||||
maxAge: tokens.expires_in || 300, // Par défaut 5 minutes
|
|
||||||
path: '/',
|
|
||||||
});
|
|
||||||
|
|
||||||
// Refresh token (durée plus longue)
|
|
||||||
if (tokens.refresh_token) {
|
|
||||||
cookieStore.set('refresh_token', tokens.refresh_token, {
|
|
||||||
httpOnly: true,
|
|
||||||
secure: isProduction,
|
|
||||||
sameSite: 'lax',
|
|
||||||
maxAge: tokens.refresh_expires_in || 1800, // Par défaut 30 minutes
|
|
||||||
path: '/',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// ID token
|
|
||||||
if (tokens.id_token) {
|
|
||||||
cookieStore.set('id_token', tokens.id_token, {
|
|
||||||
httpOnly: true,
|
|
||||||
secure: isProduction,
|
|
||||||
sameSite: 'lax',
|
|
||||||
maxAge: tokens.expires_in || 300,
|
|
||||||
path: '/',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Stocker aussi le temps d'expiration
|
|
||||||
cookieStore.set('token_expires_at', String(Date.now() + (tokens.expires_in * 1000)), {
|
|
||||||
httpOnly: true,
|
|
||||||
secure: isProduction,
|
|
||||||
sameSite: 'lax',
|
|
||||||
maxAge: tokens.expires_in || 300,
|
|
||||||
path: '/',
|
|
||||||
});
|
|
||||||
|
|
||||||
console.log('✅ Tokens stored in HttpOnly cookies');
|
|
||||||
|
|
||||||
// Retourner une réponse de succès (sans les tokens)
|
|
||||||
return NextResponse.json({
|
|
||||||
success: true,
|
|
||||||
message: 'Authentification réussie',
|
|
||||||
expires_in: tokens.expires_in,
|
|
||||||
});
|
|
||||||
|
|
||||||
} catch (error) {
|
|
||||||
console.error('❌ Error in token exchange API:', error);
|
|
||||||
|
|
||||||
return NextResponse.json(
|
|
||||||
{
|
|
||||||
error: 'Erreur serveur',
|
|
||||||
message: error instanceof Error ? error.message : 'Erreur inconnue'
|
|
||||||
},
|
|
||||||
{ status: 500 }
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,82 +0,0 @@
|
|||||||
import { NextRequest, NextResponse } from 'next/server';
|
|
||||||
import { cookies } from 'next/headers';
|
|
||||||
|
|
||||||
const KEYCLOAK_URL = process.env.NEXT_PUBLIC_KEYCLOAK_URL || 'https://security.lions.dev';
|
|
||||||
const KEYCLOAK_REALM = process.env.NEXT_PUBLIC_KEYCLOAK_REALM || 'btpxpress';
|
|
||||||
|
|
||||||
const USERINFO_ENDPOINT = `${KEYCLOAK_URL}/realms/${KEYCLOAK_REALM}/protocol/openid-connect/userinfo`;
|
|
||||||
|
|
||||||
export async function GET(request: NextRequest) {
|
|
||||||
console.log('👤 Userinfo API called');
|
|
||||||
|
|
||||||
try {
|
|
||||||
const cookieStore = cookies();
|
|
||||||
const accessToken = cookieStore.get('access_token')?.value;
|
|
||||||
|
|
||||||
if (!accessToken) {
|
|
||||||
console.error('❌ No access token found');
|
|
||||||
return NextResponse.json(
|
|
||||||
{ error: 'Non authentifié', authenticated: false },
|
|
||||||
{ status: 401 }
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log('✅ Access token found, fetching user info from Keycloak');
|
|
||||||
|
|
||||||
// Récupérer les informations utilisateur depuis Keycloak
|
|
||||||
const userinfoResponse = await fetch(USERINFO_ENDPOINT, {
|
|
||||||
method: 'GET',
|
|
||||||
headers: {
|
|
||||||
'Authorization': `Bearer ${accessToken}`,
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!userinfoResponse.ok) {
|
|
||||||
const errorText = await userinfoResponse.text();
|
|
||||||
console.error('❌ Keycloak userinfo failed:', userinfoResponse.status, errorText);
|
|
||||||
|
|
||||||
// Si le token est invalide ou expiré
|
|
||||||
if (userinfoResponse.status === 401) {
|
|
||||||
// Supprimer les cookies invalides
|
|
||||||
cookieStore.delete('access_token');
|
|
||||||
cookieStore.delete('refresh_token');
|
|
||||||
cookieStore.delete('id_token');
|
|
||||||
cookieStore.delete('token_expires_at');
|
|
||||||
|
|
||||||
return NextResponse.json(
|
|
||||||
{ error: 'Token expiré ou invalide', authenticated: false },
|
|
||||||
{ status: 401 }
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return NextResponse.json(
|
|
||||||
{
|
|
||||||
error: 'Erreur lors de la récupération des informations utilisateur',
|
|
||||||
authenticated: false
|
|
||||||
},
|
|
||||||
{ status: userinfoResponse.status }
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const userinfo = await userinfoResponse.json();
|
|
||||||
console.log('✅ User info retrieved:', userinfo.preferred_username || userinfo.sub);
|
|
||||||
|
|
||||||
return NextResponse.json({
|
|
||||||
authenticated: true,
|
|
||||||
user: userinfo,
|
|
||||||
});
|
|
||||||
|
|
||||||
} catch (error) {
|
|
||||||
console.error('❌ Error in userinfo API:', error);
|
|
||||||
|
|
||||||
return NextResponse.json(
|
|
||||||
{
|
|
||||||
error: 'Erreur serveur',
|
|
||||||
authenticated: false,
|
|
||||||
message: error instanceof Error ? error.message : 'Erreur inconnue'
|
|
||||||
},
|
|
||||||
{ status: 500 }
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,11 +1,12 @@
|
|||||||
'use client';
|
'use client';
|
||||||
|
|
||||||
import React from 'react';
|
import React, { Suspense } from 'react';
|
||||||
import { useSearchParams } from 'next/navigation';
|
import { useSearchParams } from 'next/navigation';
|
||||||
import { Button } from 'primereact/button';
|
import { Button } from 'primereact/button';
|
||||||
import { Card } from 'primereact/card';
|
import { Card } from 'primereact/card';
|
||||||
|
import { redirectToLogin } from '@/lib/auth';
|
||||||
|
|
||||||
export default function LoginPage() {
|
function LoginContent() {
|
||||||
const searchParams = useSearchParams();
|
const searchParams = useSearchParams();
|
||||||
const returnUrl = searchParams.get('returnUrl') || '/dashboard';
|
const returnUrl = searchParams.get('returnUrl') || '/dashboard';
|
||||||
|
|
||||||
@@ -15,8 +16,8 @@ export default function LoginPage() {
|
|||||||
sessionStorage.setItem('returnUrl', returnUrl);
|
sessionStorage.setItem('returnUrl', returnUrl);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Rediriger vers l'API de login qui initiera le flux OAuth
|
// Rediriger vers Keycloak pour l'authentification
|
||||||
window.location.href = '/api/auth/login';
|
redirectToLogin(returnUrl);
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -68,3 +69,15 @@ export default function LoginPage() {
|
|||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export default function LoginPage() {
|
||||||
|
return (
|
||||||
|
<Suspense fallback={
|
||||||
|
<div className="min-h-screen flex align-items-center justify-content-center">
|
||||||
|
<i className="pi pi-spin pi-spinner text-4xl"></i>
|
||||||
|
</div>
|
||||||
|
}>
|
||||||
|
<LoginContent />
|
||||||
|
</Suspense>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|||||||
19
app/page.tsx
19
app/page.tsx
@@ -11,6 +11,7 @@ import { Button } from 'primereact/button';
|
|||||||
import { LayoutContext } from '../layout/context/layoutcontext';
|
import { LayoutContext } from '../layout/context/layoutcontext';
|
||||||
import { PrimeReactContext } from 'primereact/api';
|
import { PrimeReactContext } from 'primereact/api';
|
||||||
import type { ColorScheme } from '@/types';
|
import type { ColorScheme } from '@/types';
|
||||||
|
import { redirectToLogin } from '@/lib/auth';
|
||||||
|
|
||||||
const LandingPage = () => {
|
const LandingPage = () => {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
@@ -110,7 +111,7 @@ const LandingPage = () => {
|
|||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<a onClick={() => window.location.href = 'http://localhost:8080/api/v1/auth/login'} className="p-ripple flex m-0 md:ml-5 md:px-0 px-3 py-3 text-gray-800 font-medium line-height-3 hover:text-gray-800 cursor-pointer">
|
<a onClick={() => redirectToLogin()} className="p-ripple flex m-0 md:ml-5 md:px-0 px-3 py-3 text-gray-800 font-medium line-height-3 hover:text-gray-800 cursor-pointer">
|
||||||
<span>Connexion</span>
|
<span>Connexion</span>
|
||||||
<Ripple />
|
<Ripple />
|
||||||
</a>
|
</a>
|
||||||
@@ -168,7 +169,7 @@ const LandingPage = () => {
|
|||||||
<span className="font-semibold text-gray-800">Facturation automatisée</span>
|
<span className="font-semibold text-gray-800">Facturation automatisée</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<a onClick={() => window.location.href = 'http://localhost:8080/api/v1/auth/login'} className="p-button text-white bg-orange-500 border-orange-500 font-bold border-round cursor-pointer mr-3 shadow-3" style={{ padding: '1.2rem 2.5rem', fontSize: '1.2rem' }}>
|
<a onClick={() => redirectToLogin()} className="p-button text-white bg-orange-500 border-orange-500 font-bold border-round cursor-pointer mr-3 shadow-3" style={{ padding: '1.2rem 2.5rem', fontSize: '1.2rem' }}>
|
||||||
<i className="pi pi-play mr-2"></i>
|
<i className="pi pi-play mr-2"></i>
|
||||||
Démarrer maintenant
|
Démarrer maintenant
|
||||||
</a>
|
</a>
|
||||||
@@ -469,7 +470,7 @@ const LandingPage = () => {
|
|||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<Button
|
<Button
|
||||||
onClick={() => window.location.href = 'http://localhost:8080/api/v1/auth/login'}
|
onClick={() => redirectToLogin()}
|
||||||
className="w-full p-button-outlined border-orange-300 text-orange-600 font-semibold py-3"
|
className="w-full p-button-outlined border-orange-300 text-orange-600 font-semibold py-3"
|
||||||
>
|
>
|
||||||
Commencer l'essai gratuit
|
Commencer l'essai gratuit
|
||||||
@@ -513,7 +514,7 @@ const LandingPage = () => {
|
|||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<Button
|
<Button
|
||||||
onClick={() => window.location.href = 'http://localhost:8080/api/v1/auth/login'}
|
onClick={() => redirectToLogin()}
|
||||||
className="w-full bg-cyan-500 border-cyan-500 text-white font-semibold py-3"
|
className="w-full bg-cyan-500 border-cyan-500 text-white font-semibold py-3"
|
||||||
>
|
>
|
||||||
Démarrer maintenant
|
Démarrer maintenant
|
||||||
@@ -554,7 +555,7 @@ const LandingPage = () => {
|
|||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<Button
|
<Button
|
||||||
onClick={() => window.location.href = 'http://localhost:8080/api/v1/auth/login'}
|
onClick={() => redirectToLogin()}
|
||||||
className="w-full p-button-outlined border-purple-300 text-purple-600 font-semibold py-3"
|
className="w-full p-button-outlined border-purple-300 text-purple-600 font-semibold py-3"
|
||||||
>
|
>
|
||||||
Nous contacter
|
Nous contacter
|
||||||
@@ -576,7 +577,7 @@ const LandingPage = () => {
|
|||||||
</p>
|
</p>
|
||||||
<div className="flex flex-wrap justify-content-center gap-3">
|
<div className="flex flex-wrap justify-content-center gap-3">
|
||||||
<Button
|
<Button
|
||||||
onClick={() => window.location.href = 'http://localhost:8080/api/v1/auth/login'}
|
onClick={() => redirectToLogin()}
|
||||||
style={{
|
style={{
|
||||||
backgroundColor: 'white',
|
backgroundColor: 'white',
|
||||||
color: '#f97316',
|
color: '#f97316',
|
||||||
@@ -591,7 +592,7 @@ const LandingPage = () => {
|
|||||||
Essai gratuit 30 jours
|
Essai gratuit 30 jours
|
||||||
</Button>
|
</Button>
|
||||||
<Button
|
<Button
|
||||||
onClick={() => window.location.href = 'http://localhost:8080/api/v1/auth/login'}
|
onClick={() => redirectToLogin()}
|
||||||
style={{
|
style={{
|
||||||
backgroundColor: 'transparent',
|
backgroundColor: 'transparent',
|
||||||
color: 'white',
|
color: 'white',
|
||||||
@@ -636,8 +637,8 @@ const LandingPage = () => {
|
|||||||
<ul className="list-none p-0">
|
<ul className="list-none p-0">
|
||||||
<li className="mb-2"><a href="#features" className="text-gray-300 hover:text-white">Fonctionnalités</a></li>
|
<li className="mb-2"><a href="#features" className="text-gray-300 hover:text-white">Fonctionnalités</a></li>
|
||||||
<li className="mb-2"><a href="#pricing" className="text-gray-300 hover:text-white">Tarifs</a></li>
|
<li className="mb-2"><a href="#pricing" className="text-gray-300 hover:text-white">Tarifs</a></li>
|
||||||
<li className="mb-2"><a href="http://localhost:8080/api/v1/auth/login" className="text-gray-300 hover:text-white">Démo</a></li>
|
<li className="mb-2"><a onClick={() => redirectToLogin()} className="text-gray-300 hover:text-white">Démo</a></li>
|
||||||
<li className="mb-2"><a href="http://localhost:8080/api/v1/auth/login" className="text-gray-300 hover:text-white">Essai gratuit</a></li>
|
<li className="mb-2"><a onClick={() => redirectToLogin()} className="text-gray-300 hover:text-white">Essai gratuit</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<div className="col-6 md:col-3 mb-4">
|
<div className="col-6 md:col-3 mb-4">
|
||||||
|
|||||||
@@ -1,266 +0,0 @@
|
|||||||
'use client';
|
|
||||||
|
|
||||||
import React, { useContext, useEffect, useRef, useState } from 'react';
|
|
||||||
import { Ripple } from 'primereact/ripple';
|
|
||||||
import { InputText } from 'primereact/inputtext';
|
|
||||||
import { StyleClass } from 'primereact/styleclass';
|
|
||||||
import { useRouter } from 'next/navigation';
|
|
||||||
import { Button } from 'primereact/button';
|
|
||||||
import { LayoutContext } from '../layout/context/layoutcontext';
|
|
||||||
import { PrimeReactContext } from 'primereact/api';
|
|
||||||
import type { ColorScheme } from '@/types';
|
|
||||||
|
|
||||||
const LandingPage = () => {
|
|
||||||
const router = useRouter();
|
|
||||||
const { layoutConfig, setLayoutConfig } = useContext(LayoutContext);
|
|
||||||
const { changeTheme } = useContext(PrimeReactContext);
|
|
||||||
|
|
||||||
const homeRef = useRef(null);
|
|
||||||
const timesRef = useRef(null);
|
|
||||||
const menuRef = useRef(null);
|
|
||||||
const menuButtonRef = useRef(null);
|
|
||||||
const meetRef = useRef(null);
|
|
||||||
const featuresRef = useRef(null);
|
|
||||||
const pricingRef = useRef(null);
|
|
||||||
const pricingButtonRef = useRef(null);
|
|
||||||
const buyRef = useRef(null);
|
|
||||||
const featuresButtonRef = useRef(null);
|
|
||||||
|
|
||||||
const goHome = () => {
|
|
||||||
router.push('/');
|
|
||||||
};
|
|
||||||
|
|
||||||
const scrollToElement = (el: React.RefObject<HTMLElement>) => {
|
|
||||||
if (el.current) {
|
|
||||||
el.current?.scrollIntoView({
|
|
||||||
behavior: 'smooth',
|
|
||||||
block: 'start',
|
|
||||||
inline: 'nearest'
|
|
||||||
});
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const changeColorScheme = (colorScheme: ColorScheme) => {
|
|
||||||
changeTheme?.(layoutConfig.colorScheme, colorScheme, 'theme-link', () => {
|
|
||||||
setLayoutConfig((prevState) => ({
|
|
||||||
...prevState,
|
|
||||||
colorScheme,
|
|
||||||
menuTheme: layoutConfig.colorScheme === 'dark' ? 'dark' : 'light'
|
|
||||||
}));
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
changeColorScheme('light');
|
|
||||||
setLayoutConfig((prevState) => ({
|
|
||||||
...prevState,
|
|
||||||
menuTheme: 'light'
|
|
||||||
}));
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div ref={homeRef} className="landing-container" style={{ background: '#100e23' }}>
|
|
||||||
<div id="header" className="landing-header flex flex-column w-full p-6" style={{ minHeight: '1000px', background: 'linear-gradient(135deg, #ffffff 0%, #f8fafc 50%, #f1f5f9 100%)' }}>
|
|
||||||
<div className="header-menu-container flex align-items-center justify-content-between">
|
|
||||||
<div className="header-left-elements flex align-items-center justify-content-between">
|
|
||||||
<div className="cursor-pointer layout-topbar-logo flex align-items-center" onClick={goHome}>
|
|
||||||
<i className="pi pi-building text-orange-600 text-3xl mr-3"></i>
|
|
||||||
<span className="text-2xl font-bold text-gray-800">BTP Xpress</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<StyleClass nodeRef={menuButtonRef} selector="@next" enterClassName="hidden" enterActiveClassName="px-scalein" leaveToClassName="hidden" leaveActiveClassName="px-fadeout">
|
|
||||||
<a ref={menuButtonRef} className="p-ripple cursor-pointer block lg:hidden text-gray-800 font-medium line-height-3 hover:text-gray-800" style={{ fontSize: '2rem' }}>
|
|
||||||
<i className="pi pi-bars"></i>
|
|
||||||
<Ripple />
|
|
||||||
</a>
|
|
||||||
</StyleClass>
|
|
||||||
<ul
|
|
||||||
ref={menuRef}
|
|
||||||
id="menu"
|
|
||||||
style={{ top: '0px', right: '0%' }}
|
|
||||||
className="list-none lg:flex lg:flex-row flex-column align-items-start bg-white absolute lg:relative h-screen lg:h-auto lg:surface-ground m-0 z-5 w-full sm:w-6 lg:w-full py-6 lg:py-0"
|
|
||||||
>
|
|
||||||
<StyleClass nodeRef={timesRef} selector="@parent" enterClassName="hidden" enterActiveClassName="px-scalein" leaveToClassName="hidden" leaveActiveClassName="px-fadeout">
|
|
||||||
<a ref={timesRef} className="p-ripple cursor-pointer block lg:hidden text-gray-800 font-medium line-height-3 hover:text-gray-800 absolute" style={{ top: '3rem', right: '2rem' }}>
|
|
||||||
<i className="pi pi-times text-4xl"></i>
|
|
||||||
<Ripple />
|
|
||||||
</a>
|
|
||||||
</StyleClass>
|
|
||||||
<li>
|
|
||||||
<a onClick={() => scrollToElement(homeRef)} className="p-ripple flex m-0 md:ml-5 md:px-0 px-3 py-3 text-gray-800 font-medium line-height-3 hover:text-gray-800 cursor-pointer">
|
|
||||||
<span>Accueil</span>
|
|
||||||
<Ripple />
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a onClick={() => scrollToElement(meetRef)} className="p-ripple flex m-0 md:ml-5 md:px-0 px-3 py-3 text-gray-800 font-medium line-height-3 hover:text-gray-800 cursor-pointer">
|
|
||||||
<span>Découvrir</span>
|
|
||||||
<Ripple />
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a onClick={() => scrollToElement(featuresRef)} className="p-ripple flex m-0 md:ml-5 md:px-0 px-3 py-3 text-gray-800 font-medium line-height-3 hover:text-gray-800 cursor-pointer">
|
|
||||||
<span>Fonctionnalités</span>
|
|
||||||
<Ripple />
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a onClick={() => scrollToElement(pricingRef)} className="p-ripple flex m-0 md:ml-5 md:px-0 px-3 py-3 text-gray-800 font-medium line-height-3 hover:text-gray-800 cursor-pointer">
|
|
||||||
<span>Tarifs</span>
|
|
||||||
<Ripple />
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<a onClick={() => window.location.href = '/api/auth/login'} className="p-ripple flex m-0 md:ml-5 md:px-0 px-3 py-3 text-gray-800 font-medium line-height-3 hover:text-gray-800 cursor-pointer">
|
|
||||||
<span>Connexion</span>
|
|
||||||
<Ripple />
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
<div className="header-right-elements flex align-items-center">
|
|
||||||
<a onClick={() => {
|
|
||||||
const keycloakUrl = process.env.NEXT_PUBLIC_KEYCLOAK_URL || 'https://security.lions.dev';
|
|
||||||
const realm = process.env.NEXT_PUBLIC_KEYCLOAK_REALM || 'btpxpress';
|
|
||||||
const clientId = process.env.NEXT_PUBLIC_KEYCLOAK_CLIENT_ID || 'btpxpress-frontend';
|
|
||||||
const redirectUri = encodeURIComponent(window.location.origin + '/dashboard');
|
|
||||||
window.location.href = `${keycloakUrl}/realms/${realm}/protocol/openid_connect/registrations?client_id=${clientId}&response_type=code&redirect_uri=${redirectUri}`;
|
|
||||||
}} className="p-button p-button-outlined p-button-secondary p-button-text p-button p-component font-medium border-round text-white bg-orange-500 border-orange-500 cursor-pointer mr-3" style={{ padding: '0.714rem 1.5rem' }}>
|
|
||||||
<span aria-hidden="true" className="p-button-label">
|
|
||||||
Démarrer maintenant
|
|
||||||
</span>
|
|
||||||
</a>
|
|
||||||
<a href="/pages/contact">
|
|
||||||
<Button className="contact-button mr-3 p-button-outlined p-button-secondary p-button-text p-button p-component font-medium border-round text-gray-700" style={{ background: 'rgba(68, 72, 109, 0.05)' }}>
|
|
||||||
<span aria-hidden="true" className="p-button-label">
|
|
||||||
Contact
|
|
||||||
</span>
|
|
||||||
</Button>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="header-text" style={{ padding: '100px 60px' }}>
|
|
||||||
<div className="flex align-items-center mb-4">
|
|
||||||
<i className="pi pi-building text-orange-600 text-4xl mr-3"></i>
|
|
||||||
<span className="text-3xl font-bold text-gray-800">BTP Xpress</span>
|
|
||||||
</div>
|
|
||||||
<h1 className="mb-0 text-gray-800" style={{ fontSize: '80px', lineHeight: '95px' }}>
|
|
||||||
Construisez l'avenir
|
|
||||||
</h1>
|
|
||||||
<h2 className="mt-0 font-medium text-4xl text-gray-700">avec BTP Xpress, la suite logicielle qui transforme le BTP</h2>
|
|
||||||
<p className="text-xl text-gray-600 mb-5 line-height-3" style={{ maxWidth: '650px' }}>
|
|
||||||
<strong>Fini les chantiers qui dérapent, les budgets qui explosent et les équipes désorganisées.</strong>
|
|
||||||
BTP Xpress centralise tout : de la première estimation au dernier m² livré,
|
|
||||||
pilotez vos projets avec la précision d'un architecte et l'efficacité d'un chef de chantier expérimenté.
|
|
||||||
</p>
|
|
||||||
|
|
||||||
<div className="flex flex-wrap gap-3 mb-6">
|
|
||||||
<div className="flex align-items-center bg-white px-4 py-2 border-round shadow-2">
|
|
||||||
<i className="pi pi-check-circle text-green-600 mr-2"></i>
|
|
||||||
<span className="font-semibold text-gray-800">Gestion complète de projets</span>
|
|
||||||
</div>
|
|
||||||
<div className="flex align-items-center bg-white px-4 py-2 border-round shadow-2">
|
|
||||||
<i className="pi pi-check-circle text-green-600 mr-2"></i>
|
|
||||||
<span className="font-semibold text-gray-800">Suivi temps réel</span>
|
|
||||||
</div>
|
|
||||||
<div className="flex align-items-center bg-white px-4 py-2 border-round shadow-2">
|
|
||||||
<i className="pi pi-check-circle text-green-600 mr-2"></i>
|
|
||||||
<span className="font-semibold text-gray-800">Facturation automatisée</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<a onClick={() => window.location.href = '/api/auth/login'} className="p-button text-white bg-orange-500 border-orange-500 font-bold border-round cursor-pointer mr-3 shadow-3" style={{ padding: '1.2rem 2.5rem', fontSize: '1.2rem' }}>
|
|
||||||
<i className="pi pi-play mr-2"></i>
|
|
||||||
Démarrer maintenant
|
|
||||||
</a>
|
|
||||||
<a href="#features" className="p-button p-button-outlined text-orange-600 border-orange-300 font-bold border-round cursor-pointer" style={{ padding: '1.2rem 2.5rem', fontSize: '1.2rem' }}>
|
|
||||||
<i className="pi pi-eye mr-2"></i>
|
|
||||||
Voir les fonctionnalités
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div ref={featuresRef} className="header-features" style={{ padding: '100px 60px' }}>
|
|
||||||
<div className="text-center mb-6">
|
|
||||||
<h2 className="text-4xl font-bold text-gray-800 mb-4">Spécialisé pour tous les métiers du BTP</h2>
|
|
||||||
<p className="text-xl text-gray-600">Une solution adaptée à chaque corps de métier</p>
|
|
||||||
</div>
|
|
||||||
<div className="grid">
|
|
||||||
<div className="col-12 md:col-6 lg:col-3 mb-4">
|
|
||||||
<div className="bg-white p-6 border-round shadow-2 text-center h-full">
|
|
||||||
<i className="pi pi-home text-4xl mb-3 block"></i>
|
|
||||||
<span className="title mb-3 block text-2xl font-semibold">Gros Œuvre & Structure</span>
|
|
||||||
<span className="content">Béton, maçonnerie, charpente : gérez vos approvisionnements, planifiez vos coulages, suivez vos cadences et optimisez vos rotations d'équipes.</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="col-12 md:col-6 lg:col-3 mb-4">
|
|
||||||
<div className="bg-white p-6 border-round shadow-2 text-center h-full">
|
|
||||||
<i className="pi pi-wrench text-4xl mb-3 block"></i>
|
|
||||||
<span className="title mb-3 block text-2xl font-semibold">Second Œuvre & Finitions</span>
|
|
||||||
<span className="content">Électricité, plomberie, peinture, carrelage : coordonnez vos interventions, gérez vos stocks et respectez les délais de livraison.</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="col-12 md:col-6 lg:col-3 mb-4">
|
|
||||||
<div className="bg-white p-6 border-round shadow-2 text-center h-full">
|
|
||||||
<i className="pi pi-car text-4xl mb-3 block"></i>
|
|
||||||
<span className="title mb-3 block text-2xl font-semibold">Travaux Publics & VRD</span>
|
|
||||||
<span className="content">Terrassement, voirie, réseaux : planifiez vos chantiers, gérez votre matériel et optimisez vos déplacements d'équipes.</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="col-12 md:col-6 lg:col-3 mb-4">
|
|
||||||
<div className="bg-white p-6 border-round shadow-2 text-center h-full">
|
|
||||||
<i className="pi pi-briefcase text-4xl mb-3 block"></i>
|
|
||||||
<span className="title mb-3 block text-2xl font-semibold">Maîtrise d'Œuvre & AMO</span>
|
|
||||||
<span className="content">Pilotage de projets, coordination, suivi budgétaire : centralisez tous vos dossiers et collaborez efficacement avec tous les intervenants.</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div ref={meetRef} id="meet-btpxpress" className="flex justify-content-center w-full relative text-center py-8" style={{ minHeight: '400px', background: 'linear-gradient(135deg, #f97316 0%, #fb923c 30%, #fed7aa 100%)', boxShadow: '0 10px 25px rgba(249, 115, 22, 0.15)', zIndex: 100, position: 'relative' }}>
|
|
||||||
<div className="flex flex-column align-items-center justify-content-center px-6">
|
|
||||||
<h2 className="text-4xl font-bold text-gray-800 mb-4">
|
|
||||||
BTP Xpress en action
|
|
||||||
</h2>
|
|
||||||
<p className="text-xl text-gray-700 mb-6 line-height-3" style={{ maxWidth: '600px' }}>
|
|
||||||
Découvrez comment nos clients transforment leur activité BTP avec des outils pensés pour leur réussite
|
|
||||||
</p>
|
|
||||||
<div className="grid w-full" style={{ maxWidth: '900px' }}>
|
|
||||||
<div className="col-12 md:col-4 text-center mb-4">
|
|
||||||
<div className="bg-white border-round p-4 shadow-2" style={{ border: '1px solid #e5e7eb' }}>
|
|
||||||
<i className="pi pi-clock text-orange-600 text-4xl mb-3"></i>
|
|
||||||
<div className="text-3xl font-bold text-green-600 mb-2">-50%</div>
|
|
||||||
<div className="text-lg font-semibold text-gray-800">Temps administratif</div>
|
|
||||||
<div className="text-sm text-gray-600">Automatisation des tâches répétitives</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="col-12 md:col-4 text-center mb-4">
|
|
||||||
<div className="bg-white border-round p-4 shadow-2" style={{ border: '1px solid #e5e7eb' }}>
|
|
||||||
<i className="pi pi-chart-bar text-green-600 text-4xl mb-3"></i>
|
|
||||||
<div className="text-3xl font-bold text-green-600 mb-2">+35%</div>
|
|
||||||
<div className="text-lg font-semibold text-gray-800">Rentabilité</div>
|
|
||||||
<div className="text-sm text-gray-600">Optimisation des coûts et marges</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="col-12 md:col-4 text-center mb-4">
|
|
||||||
<div className="bg-white border-round p-4 shadow-2" style={{ border: '1px solid #e5e7eb' }}>
|
|
||||||
<i className="pi pi-users text-blue-600 text-4xl mb-3"></i>
|
|
||||||
<div className="text-3xl font-bold text-blue-600 mb-2">98%</div>
|
|
||||||
<div className="text-lg font-semibold text-gray-800">Satisfaction client</div>
|
|
||||||
<div className="text-sm text-gray-600">Respect des délais et qualité</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="w-full py-6" style={{ background: 'linear-gradient(180deg, #ffffff 0%, #f9fafb 50%, #f3f4f6 100%)' }}>
|
|
||||||
<div id="features" className="px-4 lg:px-8 features">
|
|
||||||
<h2 className="font-medium text-3xl text-center text-gray-800 mb-6">La différence BTP Xpress : des résultats concrets</h2>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default LandingPage;
|
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
import { LayoutProvider } from '../layout/context/layoutcontext';
|
import { LayoutProvider } from '../layout/context/layoutcontext';
|
||||||
import { PrimeReactProvider } from 'primereact/api';
|
import { PrimeReactProvider } from 'primereact/api';
|
||||||
|
import { KeycloakProvider } from '../contexts/KeycloakContext';
|
||||||
import { AuthProvider } from '../contexts/AuthContext';
|
import { AuthProvider } from '../contexts/AuthContext';
|
||||||
import { DevAuthProvider } from './auth/DevAuthProvider';
|
import { DevAuthProvider } from './auth/DevAuthProvider';
|
||||||
import { useServerStatusInit } from '../hooks/useServerStatusInit';
|
import { useServerStatusInit } from '../hooks/useServerStatusInit';
|
||||||
@@ -12,11 +13,13 @@ export function ClientProviders({ children }: { children: React.ReactNode }) {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<PrimeReactProvider>
|
<PrimeReactProvider>
|
||||||
|
<KeycloakProvider>
|
||||||
<DevAuthProvider>
|
<DevAuthProvider>
|
||||||
<AuthProvider>
|
<AuthProvider>
|
||||||
<LayoutProvider>{children}</LayoutProvider>
|
<LayoutProvider>{children}</LayoutProvider>
|
||||||
</AuthProvider>
|
</AuthProvider>
|
||||||
</DevAuthProvider>
|
</DevAuthProvider>
|
||||||
|
</KeycloakProvider>
|
||||||
</PrimeReactProvider>
|
</PrimeReactProvider>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { useAuth } from '../contexts/AuthContext';
|
import { useAuth } from '../contexts/AuthContext';
|
||||||
|
import { useKeycloak } from '../contexts/KeycloakContext';
|
||||||
import LoadingSpinner from './ui/LoadingSpinner';
|
import LoadingSpinner from './ui/LoadingSpinner';
|
||||||
import { useRouter, useSearchParams, usePathname } from 'next/navigation';
|
import { useRouter, useSearchParams, usePathname } from 'next/navigation';
|
||||||
import { useEffect, useRef, useMemo } from 'react';
|
import { useEffect, useRef, useMemo } from 'react';
|
||||||
@@ -18,6 +19,7 @@ const ProtectedLayout: React.FC<ProtectedLayoutProps> = ({
|
|||||||
requiredPermissions = []
|
requiredPermissions = []
|
||||||
}) => {
|
}) => {
|
||||||
const { isAuthenticated, isLoading, user, hasRole, hasPermission } = useAuth();
|
const { isAuthenticated, isLoading, user, hasRole, hasPermission } = useAuth();
|
||||||
|
const { keycloak } = useKeycloak();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const searchParams = useSearchParams();
|
const searchParams = useSearchParams();
|
||||||
const pathname = usePathname();
|
const pathname = usePathname();
|
||||||
@@ -26,8 +28,8 @@ const ProtectedLayout: React.FC<ProtectedLayoutProps> = ({
|
|||||||
// Vérifier s'il y a un code d'autorisation dans l'URL
|
// Vérifier s'il y a un code d'autorisation dans l'URL
|
||||||
// Utiliser useMemo pour éviter les re-rendus inutiles
|
// Utiliser useMemo pour éviter les re-rendus inutiles
|
||||||
const hasAuthCode = useMemo(() => {
|
const hasAuthCode = useMemo(() => {
|
||||||
return searchParams.get('code') !== null && pathname === '/dashboard';
|
return searchParams.get('code') !== null;
|
||||||
}, [searchParams, pathname]);
|
}, [searchParams]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
console.log('🔍 ProtectedLayout useEffect:', {
|
console.log('🔍 ProtectedLayout useEffect:', {
|
||||||
@@ -48,11 +50,17 @@ const ProtectedLayout: React.FC<ProtectedLayoutProps> = ({
|
|||||||
// Marquer comme redirigé pour éviter les boucles
|
// Marquer comme redirigé pour éviter les boucles
|
||||||
redirectedRef.current = true;
|
redirectedRef.current = true;
|
||||||
|
|
||||||
// Rediriger vers la page de connexion avec l'URL de retour
|
// Rediriger vers Keycloak avec l'URL de retour
|
||||||
|
console.log('🔒 ProtectedLayout: Redirection vers Keycloak');
|
||||||
|
if (keycloak) {
|
||||||
const searchParamsStr = searchParams.toString();
|
const searchParamsStr = searchParams.toString();
|
||||||
const currentPath = pathname + (searchParamsStr ? `?${searchParamsStr}` : '');
|
const currentPath = pathname + (searchParamsStr ? `?${searchParamsStr}` : '');
|
||||||
console.log('🔒 ProtectedLayout: Redirection vers /api/auth/login');
|
const redirectUri = currentPath && currentPath !== '/'
|
||||||
window.location.href = `/api/auth/login?redirect=${encodeURIComponent(currentPath)}`;
|
? `${window.location.origin}${currentPath}`
|
||||||
|
: `${window.location.origin}/dashboard`;
|
||||||
|
|
||||||
|
keycloak.login({ redirectUri });
|
||||||
|
}
|
||||||
} else if (hasAuthCode) {
|
} else if (hasAuthCode) {
|
||||||
console.log('🔓 ProtectedLayout: Code d\'autorisation détecté, pas de redirection');
|
console.log('🔓 ProtectedLayout: Code d\'autorisation détecté, pas de redirection');
|
||||||
} else if (isAuthenticated) {
|
} else if (isAuthenticated) {
|
||||||
@@ -60,7 +68,7 @@ const ProtectedLayout: React.FC<ProtectedLayoutProps> = ({
|
|||||||
} else if (isLoading) {
|
} else if (isLoading) {
|
||||||
console.log('⏳ ProtectedLayout: Chargement en cours, pas de redirection');
|
console.log('⏳ ProtectedLayout: Chargement en cours, pas de redirection');
|
||||||
}
|
}
|
||||||
}, [isAuthenticated, isLoading, hasAuthCode, pathname]);
|
}, [isAuthenticated, isLoading, hasAuthCode, pathname, keycloak]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (isAuthenticated && user) {
|
if (isAuthenticated && user) {
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import { StyleClass } from 'primereact/styleclass';
|
|||||||
import { useRouter } from 'next/navigation';
|
import { useRouter } from 'next/navigation';
|
||||||
import { useDevAuth } from '../auth/DevAuthProvider';
|
import { useDevAuth } from '../auth/DevAuthProvider';
|
||||||
import Link from 'next/link';
|
import Link from 'next/link';
|
||||||
|
import { redirectToLogin } from '@/lib/auth';
|
||||||
|
|
||||||
interface AppLayoutProps {
|
interface AppLayoutProps {
|
||||||
children: React.ReactNode;
|
children: React.ReactNode;
|
||||||
@@ -114,7 +115,7 @@ export const AppLayout: React.FC<AppLayoutProps> = ({ children }) => {
|
|||||||
icon: 'pi pi-sign-out',
|
icon: 'pi pi-sign-out',
|
||||||
command: () => {
|
command: () => {
|
||||||
logout();
|
logout();
|
||||||
window.location.href = '/api/auth/login';
|
redirectToLogin();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
'use client';
|
'use client';
|
||||||
|
|
||||||
import React, { createContext, useContext, useEffect, useState, useCallback, ReactNode } from 'react';
|
import React, { createContext, useContext, useEffect, useState, useCallback, ReactNode } from 'react';
|
||||||
import { initKeycloak, keycloakInitOptions, RoleUtils, BTP_ROLES, KEYCLOAK_TIMEOUTS, KEYCLOAK_REDIRECTS } from '@/config/keycloak';
|
import { useKeycloak } from './KeycloakContext';
|
||||||
|
import { RoleUtils, BTP_ROLES } from '@/config/keycloak';
|
||||||
import { useRouter } from 'next/navigation';
|
import { useRouter } from 'next/navigation';
|
||||||
|
|
||||||
// Types pour l'authentification
|
// Types pour l'authentification
|
||||||
@@ -62,6 +63,9 @@ interface AuthProviderProps {
|
|||||||
export const AuthProvider: React.FC<AuthProviderProps> = ({ children }) => {
|
export const AuthProvider: React.FC<AuthProviderProps> = ({ children }) => {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
|
|
||||||
|
// Utiliser le contexte Keycloak
|
||||||
|
const { keycloak, authenticated, loading, token, login: keycloakLogin, logout: keycloakLogout, updateToken: keycloakUpdateToken } = useKeycloak();
|
||||||
|
|
||||||
// État de l'authentification
|
// État de l'authentification
|
||||||
const [authState, setAuthState] = useState<AuthState>({
|
const [authState, setAuthState] = useState<AuthState>({
|
||||||
isAuthenticated: false,
|
isAuthenticated: false,
|
||||||
@@ -178,11 +182,10 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ children }) => {
|
|||||||
}
|
}
|
||||||
}, [fetchUserInfo, extractUserInfo]);
|
}, [fetchUserInfo, extractUserInfo]);
|
||||||
|
|
||||||
// Fonction de connexion
|
// Fonction de connexion - utilise Keycloak JS SDK
|
||||||
const login = useCallback(async (): Promise<void> => {
|
const login = useCallback(async (): Promise<void> => {
|
||||||
try {
|
try {
|
||||||
// Redirection directe vers l'API d'authentification
|
keycloakLogin();
|
||||||
window.location.href = '/api/auth/login';
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Erreur lors de la connexion:', error);
|
console.error('Erreur lors de la connexion:', error);
|
||||||
setAuthState(prev => ({
|
setAuthState(prev => ({
|
||||||
@@ -191,21 +194,12 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ children }) => {
|
|||||||
isLoading: false,
|
isLoading: false,
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
}, []);
|
}, [keycloakLogin]);
|
||||||
|
|
||||||
// Fonction de déconnexion
|
// Fonction de déconnexion - utilise Keycloak JS SDK
|
||||||
const logout = useCallback(async (): Promise<void> => {
|
const logout = useCallback(async (): Promise<void> => {
|
||||||
try {
|
try {
|
||||||
// Nettoyer les tokens locaux
|
keycloakLogout();
|
||||||
localStorage.removeItem('accessToken');
|
|
||||||
localStorage.removeItem('refreshToken');
|
|
||||||
localStorage.removeItem('idToken');
|
|
||||||
|
|
||||||
// Supprimer le cookie
|
|
||||||
document.cookie = 'keycloak-token=; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT';
|
|
||||||
|
|
||||||
// Redirection directe vers l'API de déconnexion
|
|
||||||
window.location.href = '/api/auth/logout';
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Erreur lors de la déconnexion:', error);
|
console.error('Erreur lors de la déconnexion:', error);
|
||||||
// Forcer la déconnexion locale même en cas d'erreur
|
// Forcer la déconnexion locale même en cas d'erreur
|
||||||
@@ -219,45 +213,32 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ children }) => {
|
|||||||
});
|
});
|
||||||
router.push('/');
|
router.push('/');
|
||||||
}
|
}
|
||||||
}, [router]);
|
}, [keycloakLogout, router]);
|
||||||
|
|
||||||
// Fonction pour rafraîchir l'authentification
|
// Fonction pour rafraîchir l'authentification - utilise Keycloak SDK
|
||||||
const refreshAuth = useCallback(async (): Promise<void> => {
|
const refreshAuth = useCallback(async (): Promise<void> => {
|
||||||
try {
|
try {
|
||||||
// Vérifier les tokens stockés
|
if (keycloak && authenticated) {
|
||||||
const accessToken = localStorage.getItem('accessToken');
|
await keycloakUpdateToken();
|
||||||
const refreshToken = localStorage.getItem('refreshToken');
|
|
||||||
|
|
||||||
if (!refreshToken) {
|
|
||||||
await logout();
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Implémenter le rafraîchissement via API si nécessaire
|
|
||||||
console.log('Rafraîchissement des tokens...');
|
|
||||||
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Erreur lors du rafraîchissement du token:', error);
|
console.error('Erreur lors du rafraîchissement du token:', error);
|
||||||
await logout();
|
await logout();
|
||||||
}
|
}
|
||||||
}, [logout]);
|
}, [keycloak, authenticated, keycloakUpdateToken, logout]);
|
||||||
|
|
||||||
// Fonction pour mettre à jour le token
|
// Fonction pour mettre à jour le token - utilise Keycloak SDK
|
||||||
const updateToken = useCallback(async (minValidity: number = 30): Promise<boolean> => {
|
const updateToken = useCallback(async (minValidity: number = 30): Promise<boolean> => {
|
||||||
try {
|
try {
|
||||||
// Vérifier si le token est encore valide
|
if (keycloak && authenticated) {
|
||||||
const accessToken = localStorage.getItem('accessToken');
|
return await keycloakUpdateToken();
|
||||||
if (!accessToken) {
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
return false;
|
||||||
// TODO: Vérifier l'expiration du token et rafraîchir si nécessaire
|
|
||||||
return true;
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Erreur lors de la mise à jour du token:', error);
|
console.error('Erreur lors de la mise à jour du token:', error);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}, []);
|
}, [keycloak, authenticated, keycloakUpdateToken]);
|
||||||
|
|
||||||
// Fonctions utilitaires pour les rôles et permissions
|
// Fonctions utilitaires pour les rôles et permissions
|
||||||
const hasRole = useCallback((role: string): boolean => {
|
const hasRole = useCallback((role: string): boolean => {
|
||||||
@@ -277,65 +258,39 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ children }) => {
|
|||||||
return RoleUtils.isRoleHigher(authState.user.highestRole, role);
|
return RoleUtils.isRoleHigher(authState.user.highestRole, role);
|
||||||
}, [authState.user]);
|
}, [authState.user]);
|
||||||
|
|
||||||
// Initialisation de Keycloak - Désactivée pour utiliser l'authentification manuelle
|
// Synchroniser l'état avec KeycloakContext
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const initializeKeycloak = async () => {
|
const syncAuthState = async () => {
|
||||||
try {
|
if (loading) {
|
||||||
// Vérifier s'il y a des tokens stockés localement
|
setAuthState({
|
||||||
const accessToken = localStorage.getItem('accessToken');
|
isAuthenticated: false,
|
||||||
const refreshToken = localStorage.getItem('refreshToken');
|
isLoading: true,
|
||||||
const idToken = localStorage.getItem('idToken');
|
user: null,
|
||||||
|
token: null,
|
||||||
|
refreshToken: null,
|
||||||
|
error: null,
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (accessToken) {
|
if (authenticated && keycloak && token) {
|
||||||
// Stocker aussi dans un cookie pour le middleware
|
// Essayer de récupérer les informations utilisateur depuis l'API
|
||||||
document.cookie = `keycloak-token=${accessToken}; path=/; max-age=3600; SameSite=Lax`;
|
let user = await fetchUserInfo(token);
|
||||||
|
|
||||||
// Récupérer les informations utilisateur depuis l'API
|
// Si l'API ne répond pas, extraire du token JWT
|
||||||
try {
|
if (!user) {
|
||||||
const user = await fetchUserInfo(accessToken);
|
user = extractUserInfo(keycloak);
|
||||||
|
}
|
||||||
|
|
||||||
if (user) {
|
|
||||||
setAuthState({
|
setAuthState({
|
||||||
isAuthenticated: true,
|
isAuthenticated: true,
|
||||||
isLoading: false,
|
isLoading: false,
|
||||||
user,
|
user,
|
||||||
token: accessToken,
|
token: token,
|
||||||
refreshToken: refreshToken,
|
refreshToken: keycloak.refreshToken || null,
|
||||||
error: null,
|
error: null,
|
||||||
});
|
});
|
||||||
return;
|
} else {
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.warn('Impossible de récupérer les informations utilisateur depuis l\'API, utilisation des données par défaut');
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fallback avec des données par défaut si l'API ne répond pas
|
|
||||||
setAuthState({
|
|
||||||
isAuthenticated: true,
|
|
||||||
isLoading: false,
|
|
||||||
user: {
|
|
||||||
id: 'dev-user-001',
|
|
||||||
username: 'admin.btpxpress',
|
|
||||||
email: 'admin@btpxpress.com',
|
|
||||||
firstName: 'Jean-Michel',
|
|
||||||
lastName: 'Martineau',
|
|
||||||
fullName: 'Jean-Michel Martineau',
|
|
||||||
roles: [BTP_ROLES.SUPER_ADMIN, BTP_ROLES.ADMIN, BTP_ROLES.DIRECTEUR],
|
|
||||||
permissions: RoleUtils.getUserPermissions([BTP_ROLES.SUPER_ADMIN]),
|
|
||||||
highestRole: BTP_ROLES.SUPER_ADMIN,
|
|
||||||
isAdmin: true,
|
|
||||||
isManager: true,
|
|
||||||
isEmployee: false,
|
|
||||||
isClient: false,
|
|
||||||
},
|
|
||||||
token: accessToken,
|
|
||||||
refreshToken: refreshToken,
|
|
||||||
error: null,
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Pas de tokens, rester non authentifié
|
|
||||||
setAuthState({
|
setAuthState({
|
||||||
isAuthenticated: false,
|
isAuthenticated: false,
|
||||||
isLoading: false,
|
isLoading: false,
|
||||||
@@ -344,33 +299,13 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ children }) => {
|
|||||||
refreshToken: null,
|
refreshToken: null,
|
||||||
error: null,
|
error: null,
|
||||||
});
|
});
|
||||||
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Erreur lors de l\'initialisation de l\'authentification:', error);
|
|
||||||
setAuthState({
|
|
||||||
isAuthenticated: false,
|
|
||||||
isLoading: false,
|
|
||||||
user: null,
|
|
||||||
token: null,
|
|
||||||
refreshToken: null,
|
|
||||||
error: 'Erreur lors de l\'initialisation de l\'authentification',
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
initializeKeycloak();
|
syncAuthState();
|
||||||
}, [updateAuthState, refreshAuth, logout]);
|
}, [authenticated, loading, token, keycloak, fetchUserInfo, extractUserInfo]);
|
||||||
|
|
||||||
// Rafraîchissement automatique du token
|
// Le rafraîchissement automatique du token est géré par KeycloakContext
|
||||||
useEffect(() => {
|
|
||||||
if (!authState.isAuthenticated) return;
|
|
||||||
|
|
||||||
const interval = setInterval(() => {
|
|
||||||
updateToken();
|
|
||||||
}, KEYCLOAK_TIMEOUTS.SESSION_CHECK_INTERVAL * 1000);
|
|
||||||
|
|
||||||
return () => clearInterval(interval);
|
|
||||||
}, [authState.isAuthenticated, updateToken]);
|
|
||||||
|
|
||||||
// Valeur du contexte
|
// Valeur du contexte
|
||||||
const contextValue: AuthContextType = {
|
const contextValue: AuthContextType = {
|
||||||
|
|||||||
119
contexts/KeycloakContext.tsx
Normal file
119
contexts/KeycloakContext.tsx
Normal file
@@ -0,0 +1,119 @@
|
|||||||
|
'use client';
|
||||||
|
|
||||||
|
import React, { createContext, useContext, useState, useEffect, ReactNode } from 'react';
|
||||||
|
import Keycloak from 'keycloak-js';
|
||||||
|
import keycloak from '../lib/keycloak';
|
||||||
|
|
||||||
|
interface KeycloakContextType {
|
||||||
|
keycloak: Keycloak | null;
|
||||||
|
authenticated: boolean;
|
||||||
|
loading: boolean;
|
||||||
|
token: string | null;
|
||||||
|
login: () => void;
|
||||||
|
logout: () => void;
|
||||||
|
updateToken: () => Promise<boolean>;
|
||||||
|
}
|
||||||
|
|
||||||
|
const KeycloakContext = createContext<KeycloakContextType | undefined>(undefined);
|
||||||
|
|
||||||
|
export const useKeycloak = () => {
|
||||||
|
const context = useContext(KeycloakContext);
|
||||||
|
if (!context) {
|
||||||
|
throw new Error('useKeycloak must be used within a KeycloakProvider');
|
||||||
|
}
|
||||||
|
return context;
|
||||||
|
};
|
||||||
|
|
||||||
|
interface KeycloakProviderProps {
|
||||||
|
children: ReactNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const KeycloakProvider: React.FC<KeycloakProviderProps> = ({ children }) => {
|
||||||
|
const [authenticated, setAuthenticated] = useState(false);
|
||||||
|
const [loading, setLoading] = useState(true);
|
||||||
|
const [token, setToken] = useState<string | null>(null);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const initKeycloak = async () => {
|
||||||
|
try {
|
||||||
|
console.log('🔐 Initializing Keycloak...');
|
||||||
|
|
||||||
|
const authenticated = await keycloak.init({
|
||||||
|
onLoad: 'check-sso',
|
||||||
|
silentCheckSsoRedirectUri: window.location.origin + '/silent-check-sso.html',
|
||||||
|
pkceMethod: 'S256',
|
||||||
|
checkLoginIframe: false, // Désactivé pour éviter les problèmes CORS
|
||||||
|
flow: 'standard', // Force authorization_code flow (pas implicit/hybrid)
|
||||||
|
responseMode: 'query', // Force query string au lieu de fragment
|
||||||
|
});
|
||||||
|
|
||||||
|
console.log(`✅ Keycloak initialized. Authenticated: ${authenticated}`);
|
||||||
|
|
||||||
|
setAuthenticated(authenticated);
|
||||||
|
setToken(keycloak.token || null);
|
||||||
|
|
||||||
|
// Rafraîchir le token automatiquement
|
||||||
|
if (authenticated) {
|
||||||
|
setInterval(() => {
|
||||||
|
keycloak.updateToken(70).then((refreshed) => {
|
||||||
|
if (refreshed) {
|
||||||
|
console.log('🔄 Token refreshed');
|
||||||
|
setToken(keycloak.token || null);
|
||||||
|
}
|
||||||
|
}).catch(() => {
|
||||||
|
console.error('❌ Failed to refresh token');
|
||||||
|
setAuthenticated(false);
|
||||||
|
});
|
||||||
|
}, 60000); // Toutes les 60 secondes
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('❌ Keycloak initialization failed:', error);
|
||||||
|
} finally {
|
||||||
|
setLoading(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
initKeycloak();
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const login = () => {
|
||||||
|
keycloak.login({
|
||||||
|
redirectUri: window.location.origin + '/dashboard',
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const logout = () => {
|
||||||
|
keycloak.logout({
|
||||||
|
redirectUri: window.location.origin,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const updateToken = async (): Promise<boolean> => {
|
||||||
|
try {
|
||||||
|
const refreshed = await keycloak.updateToken(30);
|
||||||
|
if (refreshed) {
|
||||||
|
setToken(keycloak.token || null);
|
||||||
|
}
|
||||||
|
return refreshed;
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to update token', error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const value: KeycloakContextType = {
|
||||||
|
keycloak,
|
||||||
|
authenticated,
|
||||||
|
loading,
|
||||||
|
token,
|
||||||
|
login,
|
||||||
|
logout,
|
||||||
|
updateToken,
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<KeycloakContext.Provider value={value}>
|
||||||
|
{children}
|
||||||
|
</KeycloakContext.Provider>
|
||||||
|
);
|
||||||
|
};
|
||||||
78
lib/auth.ts
Normal file
78
lib/auth.ts
Normal file
@@ -0,0 +1,78 @@
|
|||||||
|
/**
|
||||||
|
* Utilitaires d'authentification centralisés
|
||||||
|
* Utilise le SDK Keycloak JS pour toutes les opérations d'authentification
|
||||||
|
*
|
||||||
|
* IMPORTANT: Utilise un import conditionnel pour éviter les erreurs SSR
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Récupère l'instance Keycloak de manière sécurisée (client-side uniquement)
|
||||||
|
*/
|
||||||
|
const getKeycloak = async () => {
|
||||||
|
if (typeof window === 'undefined') return null;
|
||||||
|
const { default: keycloak } = await import('./keycloak');
|
||||||
|
return keycloak;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Redirige vers la page de connexion Keycloak
|
||||||
|
*/
|
||||||
|
export const redirectToLogin = async (returnUrl?: string) => {
|
||||||
|
if (typeof window === 'undefined') return;
|
||||||
|
|
||||||
|
const keycloak = await getKeycloak();
|
||||||
|
if (keycloak) {
|
||||||
|
const redirectUri = returnUrl
|
||||||
|
? `${window.location.origin}${returnUrl}`
|
||||||
|
: `${window.location.origin}/dashboard`;
|
||||||
|
|
||||||
|
keycloak.login({ redirectUri });
|
||||||
|
} else {
|
||||||
|
console.error('❌ Keycloak non initialisé');
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Redirige vers la page de déconnexion Keycloak
|
||||||
|
*/
|
||||||
|
export const redirectToLogout = async () => {
|
||||||
|
if (typeof window === 'undefined') return;
|
||||||
|
|
||||||
|
const keycloak = await getKeycloak();
|
||||||
|
if (keycloak) {
|
||||||
|
keycloak.logout({ redirectUri: window.location.origin });
|
||||||
|
} else {
|
||||||
|
console.error('❌ Keycloak non initialisé');
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Vérifie si l'utilisateur est authentifié
|
||||||
|
*/
|
||||||
|
export const isAuthenticated = async (): Promise<boolean> => {
|
||||||
|
const keycloak = await getKeycloak();
|
||||||
|
return keycloak?.authenticated ?? false;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Récupère le token d'accès actuel
|
||||||
|
*/
|
||||||
|
export const getAccessToken = async (): Promise<string | undefined> => {
|
||||||
|
const keycloak = await getKeycloak();
|
||||||
|
return keycloak?.token;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Rafraîchit le token si nécessaire
|
||||||
|
*/
|
||||||
|
export const refreshToken = async (minValidity: number = 30): Promise<boolean> => {
|
||||||
|
const keycloak = await getKeycloak();
|
||||||
|
if (!keycloak) return false;
|
||||||
|
|
||||||
|
try {
|
||||||
|
return await keycloak.updateToken(minValidity);
|
||||||
|
} catch (error) {
|
||||||
|
console.error('❌ Erreur lors du rafraîchissement du token:', error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
};
|
||||||
14
lib/keycloak.ts
Normal file
14
lib/keycloak.ts
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
import Keycloak from 'keycloak-js';
|
||||||
|
|
||||||
|
// Configuration Keycloak
|
||||||
|
const keycloakConfig = {
|
||||||
|
url: process.env.NEXT_PUBLIC_KEYCLOAK_URL || 'https://security.lions.dev',
|
||||||
|
realm: process.env.NEXT_PUBLIC_KEYCLOAK_REALM || 'btpxpress',
|
||||||
|
clientId: process.env.NEXT_PUBLIC_KEYCLOAK_CLIENT_ID || 'btpxpress-frontend',
|
||||||
|
};
|
||||||
|
|
||||||
|
// Créer une instance Keycloak uniquement côté client
|
||||||
|
// Pour éviter les erreurs SSR (document is not defined)
|
||||||
|
const keycloak = typeof window !== 'undefined' ? new Keycloak(keycloakConfig) : null;
|
||||||
|
|
||||||
|
export default keycloak as Keycloak;
|
||||||
@@ -1,97 +1,17 @@
|
|||||||
/**
|
/**
|
||||||
* Middleware Next.js pour l'authentification OAuth avec Keycloak
|
* Middleware Next.js simplifié pour Frontend-Centric auth
|
||||||
*
|
*
|
||||||
* Ce middleware protège les routes privées en vérifiant la présence
|
* Avec Keycloak JS SDK, l'authentification est gérée côté client par KeycloakContext.
|
||||||
* d'un access_token dans les cookies HttpOnly.
|
* Ce middleware laisse passer toutes les requêtes - la protection des routes est
|
||||||
|
* gérée par ProtectedLayout et AuthContext côté client.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { NextResponse } from 'next/server';
|
import { NextResponse } from 'next/server';
|
||||||
import type { NextRequest } from 'next/server';
|
import type { NextRequest } from 'next/server';
|
||||||
|
|
||||||
// Routes publiques accessibles sans authentification
|
|
||||||
const PUBLIC_ROUTES = [
|
|
||||||
'/',
|
|
||||||
'/auth/login',
|
|
||||||
'/auth/callback',
|
|
||||||
'/api/auth/login',
|
|
||||||
'/api/auth/callback',
|
|
||||||
'/api/auth/token',
|
|
||||||
'/api/health',
|
|
||||||
];
|
|
||||||
|
|
||||||
// Routes API publiques (patterns)
|
|
||||||
const PUBLIC_API_PATTERNS = [
|
|
||||||
/^\/api\/auth\/.*/,
|
|
||||||
/^\/api\/health/,
|
|
||||||
];
|
|
||||||
|
|
||||||
// Vérifie si une route est publique
|
|
||||||
function isPublicRoute(pathname: string): boolean {
|
|
||||||
// Vérifier les routes exactes
|
|
||||||
if (PUBLIC_ROUTES.includes(pathname)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Vérifier les patterns
|
|
||||||
return PUBLIC_API_PATTERNS.some(pattern => pattern.test(pathname));
|
|
||||||
}
|
|
||||||
|
|
||||||
export function middleware(request: NextRequest) {
|
export function middleware(request: NextRequest) {
|
||||||
const { pathname } = request.nextUrl;
|
// Laisser passer toutes les requêtes
|
||||||
|
// L'authentification est gérée côté client par Keycloak JS SDK
|
||||||
console.log('🔒 Middleware - Checking:', pathname);
|
|
||||||
|
|
||||||
// Laisser passer les routes publiques
|
|
||||||
if (isPublicRoute(pathname)) {
|
|
||||||
console.log('✅ Middleware - Public route, allowing');
|
|
||||||
return NextResponse.next();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Laisser passer les fichiers statiques
|
|
||||||
if (
|
|
||||||
pathname.startsWith('/_next') ||
|
|
||||||
pathname.startsWith('/static') ||
|
|
||||||
pathname.includes('.')
|
|
||||||
) {
|
|
||||||
return NextResponse.next();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Vérifier la présence du token d'authentification
|
|
||||||
const accessToken = request.cookies.get('access_token');
|
|
||||||
const tokenExpiresAt = request.cookies.get('token_expires_at');
|
|
||||||
|
|
||||||
if (!accessToken) {
|
|
||||||
console.log('❌ Middleware - No access token, redirecting to login');
|
|
||||||
|
|
||||||
// Rediriger vers la page de login avec l'URL de retour
|
|
||||||
const loginUrl = new URL('/auth/login', request.url);
|
|
||||||
loginUrl.searchParams.set('returnUrl', pathname);
|
|
||||||
|
|
||||||
return NextResponse.redirect(loginUrl);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Vérifier si le token est expiré
|
|
||||||
if (tokenExpiresAt) {
|
|
||||||
const expiresAt = parseInt(tokenExpiresAt.value, 10);
|
|
||||||
const now = Date.now();
|
|
||||||
|
|
||||||
if (now >= expiresAt) {
|
|
||||||
console.log('❌ Middleware - Token expired, redirecting to login');
|
|
||||||
|
|
||||||
// Supprimer les cookies expirés
|
|
||||||
const response = NextResponse.redirect(new URL('/auth/login', request.url));
|
|
||||||
response.cookies.delete('access_token');
|
|
||||||
response.cookies.delete('refresh_token');
|
|
||||||
response.cookies.delete('id_token');
|
|
||||||
response.cookies.delete('token_expires_at');
|
|
||||||
|
|
||||||
return response;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log('✅ Middleware - Authenticated, allowing');
|
|
||||||
|
|
||||||
// L'utilisateur est authentifié, laisser passer
|
|
||||||
return NextResponse.next();
|
return NextResponse.next();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
11
public/silent-check-sso.html
Normal file
11
public/silent-check-sso.html
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title>Silent SSO Check</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<script>
|
||||||
|
parent.postMessage(location.href, location.origin);
|
||||||
|
</script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import { API_CONFIG } from '../config/api';
|
import { API_CONFIG } from '../config/api';
|
||||||
import { keycloak, KEYCLOAK_TIMEOUTS } from '../config/keycloak';
|
import keycloak from '../lib/keycloak';
|
||||||
|
|
||||||
class ApiService {
|
class ApiService {
|
||||||
private api = axios.create({
|
private api = axios.create({
|
||||||
@@ -16,8 +16,8 @@ class ApiService {
|
|||||||
// Vérifier si Keycloak est initialisé et l'utilisateur authentifié
|
// Vérifier si Keycloak est initialisé et l'utilisateur authentifié
|
||||||
if (keycloak && keycloak.authenticated) {
|
if (keycloak && keycloak.authenticated) {
|
||||||
try {
|
try {
|
||||||
// Rafraîchir le token si nécessaire
|
// Rafraîchir le token si nécessaire (70 secondes avant expiration)
|
||||||
await keycloak.updateToken(KEYCLOAK_TIMEOUTS.TOKEN_REFRESH_BEFORE_EXPIRY);
|
await keycloak.updateToken(70);
|
||||||
|
|
||||||
// Ajouter le token Bearer à l'en-tête Authorization
|
// Ajouter le token Bearer à l'en-tête Authorization
|
||||||
if (keycloak.token) {
|
if (keycloak.token) {
|
||||||
@@ -29,22 +29,6 @@ class ApiService {
|
|||||||
keycloak.login();
|
keycloak.login();
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
// Fallback vers l'ancien système pour la rétrocompatibilité
|
|
||||||
let token = null;
|
|
||||||
try {
|
|
||||||
const authTokenItem = sessionStorage.getItem('auth_token') || localStorage.getItem('auth_token');
|
|
||||||
if (authTokenItem) {
|
|
||||||
const parsed = JSON.parse(authTokenItem);
|
|
||||||
token = parsed.value;
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
token = localStorage.getItem('token');
|
|
||||||
}
|
|
||||||
|
|
||||||
if (token) {
|
|
||||||
config.headers['Authorization'] = `Bearer ${token}`;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return config;
|
return config;
|
||||||
},
|
},
|
||||||
@@ -73,12 +57,10 @@ class ApiService {
|
|||||||
const hasAuthCode = currentUrl.includes('code=') && currentUrl.includes('/dashboard');
|
const hasAuthCode = currentUrl.includes('code=') && currentUrl.includes('/dashboard');
|
||||||
|
|
||||||
if (!hasAuthCode) {
|
if (!hasAuthCode) {
|
||||||
// Fallback vers l'ancien système
|
console.log('❌ Non authentifié, redirection vers Keycloak...');
|
||||||
localStorage.removeItem('token');
|
if (keycloak) {
|
||||||
localStorage.removeItem('user');
|
keycloak.login();
|
||||||
localStorage.removeItem('auth_token');
|
}
|
||||||
sessionStorage.removeItem('auth_token');
|
|
||||||
window.location.href = '/api/auth/login';
|
|
||||||
} else {
|
} else {
|
||||||
console.log('🔄 ApiService: Erreur 401 ignorée car authentification en cours...');
|
console.log('🔄 ApiService: Erreur 401 ignorée car authentification en cours...');
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
import axios, { AxiosInstance, AxiosResponse } from 'axios';
|
import axios, { AxiosInstance, AxiosResponse } from 'axios';
|
||||||
import { API_CONFIG } from '../config/api';
|
import { API_CONFIG } from '../config/api';
|
||||||
import { keycloak, KEYCLOAK_TIMEOUTS } from '../config/keycloak';
|
import keycloak from '../lib/keycloak';
|
||||||
import { CacheService, CacheKeys } from './cacheService';
|
import { CacheService, CacheKeys } from './cacheService';
|
||||||
import {
|
import {
|
||||||
Client,
|
Client,
|
||||||
@@ -39,19 +39,28 @@ class ApiService {
|
|||||||
headers: API_CONFIG.headers,
|
headers: API_CONFIG.headers,
|
||||||
});
|
});
|
||||||
|
|
||||||
// Interceptor pour les requêtes - ajouter le token d'authentification
|
// Interceptor pour les requêtes
|
||||||
this.api.interceptors.request.use(
|
this.api.interceptors.request.use(
|
||||||
async (config) => {
|
async (config) => {
|
||||||
// Utiliser le token stocké dans localStorage (nouveau système)
|
console.log('🔐 API Request:', config.url);
|
||||||
if (typeof window !== 'undefined') {
|
|
||||||
const accessToken = localStorage.getItem('accessToken');
|
|
||||||
|
|
||||||
if (accessToken) {
|
// Vérifier si Keycloak est initialisé et l'utilisateur authentifié
|
||||||
config.headers['Authorization'] = `Bearer ${accessToken}`;
|
if (keycloak && keycloak.authenticated && keycloak.token) {
|
||||||
console.log('🔐 API Request avec token:', config.url);
|
try {
|
||||||
} else {
|
// Rafraîchir le token si nécessaire (70 secondes avant expiration)
|
||||||
console.log('⚠️ API Request sans token:', config.url);
|
await keycloak.updateToken(70);
|
||||||
|
|
||||||
|
// Ajouter le token Bearer à l'en-tête Authorization
|
||||||
|
config.headers['Authorization'] = `Bearer ${keycloak.token}`;
|
||||||
|
console.log('✅ Token ajouté à la requête');
|
||||||
|
} catch (error) {
|
||||||
|
console.error('❌ Erreur lors de la mise à jour du token Keycloak:', error);
|
||||||
|
// En cas d'erreur, rediriger vers la page de connexion
|
||||||
|
keycloak.login();
|
||||||
|
throw error;
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
console.warn('⚠️ Keycloak non authentifié, requête sans token');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ajouter des en-têtes par défaut
|
// Ajouter des en-têtes par défaut
|
||||||
@@ -100,24 +109,35 @@ class ApiService {
|
|||||||
this.notifyServerStatus(true);
|
this.notifyServerStatus(true);
|
||||||
|
|
||||||
if (error.response?.status === 401) {
|
if (error.response?.status === 401) {
|
||||||
// Gestion des erreurs d'authentification
|
// Gestion des erreurs d'authentification (token expiré ou absent)
|
||||||
if (typeof window !== 'undefined') {
|
if (typeof window !== 'undefined') {
|
||||||
const currentUrl = window.location.href;
|
const currentUrl = window.location.href;
|
||||||
const hasAuthCode = currentUrl.includes('code=') && currentUrl.includes('/dashboard');
|
const hasAuthCode = currentUrl.includes('code=') && currentUrl.includes('/dashboard');
|
||||||
|
|
||||||
if (!hasAuthCode) {
|
if (!hasAuthCode) {
|
||||||
console.log('🔄 Token expiré, redirection vers la connexion...');
|
console.log('🔄 Token expiré ou absent, redirection vers Keycloak...');
|
||||||
|
|
||||||
|
// Essayer de rafraîchir le token Keycloak
|
||||||
|
if (keycloak && keycloak.authenticated) {
|
||||||
|
try {
|
||||||
|
await keycloak.updateToken(-1); // Force refresh
|
||||||
|
// Retry the original request
|
||||||
|
return this.api.request(error.config);
|
||||||
|
} catch (refreshError) {
|
||||||
|
console.error('❌ Impossible de rafraîchir le token, reconnexion requise');
|
||||||
// Sauvegarder la page actuelle pour y revenir après reconnexion
|
// Sauvegarder la page actuelle pour y revenir après reconnexion
|
||||||
const currentPath = window.location.pathname + window.location.search;
|
const currentPath = window.location.pathname + window.location.search;
|
||||||
localStorage.setItem('returnUrl', currentPath);
|
sessionStorage.setItem('returnUrl', currentPath);
|
||||||
|
// Rediriger vers Keycloak pour authentification
|
||||||
// Nettoyer les tokens expirés
|
keycloak.login();
|
||||||
localStorage.removeItem('accessToken');
|
}
|
||||||
localStorage.removeItem('refreshToken');
|
} else {
|
||||||
localStorage.removeItem('idToken');
|
// Pas authentifié, rediriger vers Keycloak
|
||||||
|
console.log('❌ Non authentifié, redirection vers Keycloak...');
|
||||||
// Rediriger vers la page de connexion
|
if (keycloak) {
|
||||||
window.location.href = '/api/auth/login';
|
keycloak.login();
|
||||||
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
console.log('🔄 API Service: Erreur 401 ignorée car authentification en cours...');
|
console.log('🔄 API Service: Erreur 401 ignorée car authentification en cours...');
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user