Checkpoint: Ajout du champ username dans la table local_users, adaptation de l'auth backend (connexion par username OU email), mise à jour de la page Gestion des utilisateurs avec le champ username visible et éditable, compte adminItinova migré avec username propre.

This commit is contained in:
Manus
2026-04-21 05:31:44 -04:00
parent 535dd19188
commit b3137e8f27
10 changed files with 866 additions and 43 deletions

View File

@@ -1,4 +1,4 @@
{
"version": "4ba97843",
"timestamp": 1776437827804
"version": "59dcc8d3",
"timestamp": 1776763904784
}

View File

@@ -4,7 +4,7 @@ import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
import { Badge } from "@/components/ui/badge";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Card, CardContent } from "@/components/ui/card";
import {
Dialog,
DialogContent,
@@ -26,6 +26,7 @@ import {
Eye,
CheckCircle,
XCircle,
AtSign,
} from "lucide-react";
import { toast } from "sonner";
import { format } from "date-fns";
@@ -37,7 +38,8 @@ type Role = "admin" | "user" | "readonly";
interface LocalUser {
id: number;
name: string;
email: string;
username: string | null;
email: string | null;
role: Role;
isActive: boolean;
createdAt: Date;
@@ -64,13 +66,21 @@ const ROLE_ICONS: Record<Role, React.ReactNode> = {
interface UserFormData {
name: string;
username: string;
email: string;
password: string;
role: Role;
isActive: boolean;
}
const DEFAULT_FORM: UserFormData = { name: "", email: "", password: "", role: "user", isActive: true };
const DEFAULT_FORM: UserFormData = {
name: "",
username: "",
email: "",
password: "",
role: "user",
isActive: true,
};
export default function UsersAdmin() {
const [showDialog, setShowDialog] = useState(false);
@@ -118,7 +128,14 @@ export default function UsersAdmin() {
const openEdit = (user: LocalUser) => {
setEditingUser(user);
setForm({ name: user.name, email: user.email, password: "", role: user.role, isActive: user.isActive });
setForm({
name: user.name,
username: user.username ?? "",
email: user.email ?? "",
password: "",
role: user.role,
isActive: user.isActive,
});
setShowDialog(true);
};
@@ -127,14 +144,21 @@ export default function UsersAdmin() {
const data: Parameters<typeof updateMutation.mutate>[0] = {
id: editingUser.id,
name: form.name,
email: form.email,
username: form.username || undefined,
email: form.email || undefined,
role: form.role,
isActive: form.isActive,
};
if (form.password) data.password = form.password;
updateMutation.mutate(data);
} else {
createMutation.mutate({ name: form.name, email: form.email, password: form.password, role: form.role });
createMutation.mutate({
name: form.name,
username: form.username || undefined,
email: form.email || undefined,
password: form.password,
role: form.role,
});
}
};
@@ -149,7 +173,9 @@ export default function UsersAdmin() {
<Users size={22} className="text-primary" />
<h1 className="text-2xl font-bold text-foreground">Gestion des utilisateurs</h1>
</div>
<p className="text-muted-foreground text-sm">{users.length} utilisateur{users.length !== 1 ? "s" : ""} enregistré{users.length !== 1 ? "s" : ""}</p>
<p className="text-muted-foreground text-sm">
{users.length} utilisateur{users.length !== 1 ? "s" : ""} enregistré{users.length !== 1 ? "s" : ""}
</p>
</div>
<Button onClick={openCreate} className="gap-2">
<Plus size={15} />
@@ -175,7 +201,7 @@ export default function UsersAdmin() {
<thead>
<tr className="border-b border-border bg-muted/30">
<th className="text-left px-4 py-3 font-semibold text-muted-foreground">Nom</th>
<th className="text-left px-4 py-3 font-semibold text-muted-foreground">Email</th>
<th className="text-left px-4 py-3 font-semibold text-muted-foreground">Identifiant / Email</th>
<th className="text-left px-4 py-3 font-semibold text-muted-foreground w-36">Rôle</th>
<th className="text-left px-4 py-3 font-semibold text-muted-foreground w-24">Statut</th>
<th className="text-left px-4 py-3 font-semibold text-muted-foreground w-32">Dernière connexion</th>
@@ -193,7 +219,25 @@ export default function UsersAdmin() {
<span className="font-medium text-foreground">{user.name}</span>
</div>
</td>
<td className="px-4 py-3 text-muted-foreground">{user.email}</td>
<td className="px-4 py-3">
<div className="flex flex-col gap-0.5">
{user.username && (
<span className="inline-flex items-center gap-1 text-xs font-mono bg-violet-50 text-violet-700 border border-violet-200 rounded px-1.5 py-0.5 w-fit">
<User size={10} />
{user.username}
</span>
)}
{user.email && (
<span className="inline-flex items-center gap-1 text-xs text-muted-foreground">
<AtSign size={10} />
{user.email}
</span>
)}
{!user.username && !user.email && (
<span className="text-xs text-muted-foreground italic"></span>
)}
</div>
</td>
<td className="px-4 py-3">
<Badge variant="outline" className={cn("text-xs gap-1", ROLE_COLORS[user.role])}>
{ROLE_ICONS[user.role]}
@@ -218,10 +262,20 @@ export default function UsersAdmin() {
</td>
<td className="px-4 py-3">
<div className="flex items-center gap-1">
<Button variant="ghost" size="icon" className="w-7 h-7 text-muted-foreground hover:text-foreground" onClick={() => openEdit(user)}>
<Button
variant="ghost"
size="icon"
className="w-7 h-7 text-muted-foreground hover:text-foreground"
onClick={() => openEdit(user)}
>
<Pencil size={13} />
</Button>
<Button variant="ghost" size="icon" className="w-7 h-7 text-muted-foreground hover:text-destructive" onClick={() => setDeleteId(user.id)}>
<Button
variant="ghost"
size="icon"
className="w-7 h-7 text-muted-foreground hover:text-destructive"
onClick={() => setDeleteId(user.id)}
>
<Trash2 size={13} />
</Button>
</div>
@@ -241,23 +295,65 @@ export default function UsersAdmin() {
<DialogHeader>
<DialogTitle>{editingUser ? "Modifier l'utilisateur" : "Nouvel utilisateur"}</DialogTitle>
<DialogDescription>
{editingUser ? "Modifiez les informations de l'utilisateur" : "Créez un nouveau compte utilisateur"}
{editingUser
? "Modifiez les informations de l'utilisateur"
: "Créez un nouveau compte. L'identifiant ou l'e-mail servira à la connexion."}
</DialogDescription>
</DialogHeader>
<div className="space-y-4 py-2">
<div className="grid grid-cols-2 gap-4">
{/* Nom complet */}
<div className="space-y-2 col-span-2">
<Label>Nom complet</Label>
<Input placeholder="Jean Dupont" value={form.name} onChange={(e) => setForm((f) => ({ ...f, name: e.target.value }))} />
<Label>Nom complet <span className="text-destructive">*</span></Label>
<Input
placeholder="Jean Dupont"
value={form.name}
onChange={(e) => setForm((f) => ({ ...f, name: e.target.value }))}
/>
</div>
{/* Identifiant */}
<div className="space-y-2 col-span-2">
<Label>Adresse e-mail</Label>
<Input type="email" placeholder="jean@itinova.fr" value={form.email} onChange={(e) => setForm((f) => ({ ...f, email: e.target.value }))} />
<Label>
Identifiant (username)
<span className="ml-1 text-xs text-muted-foreground">(optionnel)</span>
</Label>
<Input
placeholder="jean.dupont"
value={form.username}
onChange={(e) => setForm((f) => ({ ...f, username: e.target.value }))}
/>
<p className="text-xs text-muted-foreground">
Permet la connexion sans e-mail. Ex : <code>adminItinova</code>
</p>
</div>
{/* Email */}
<div className="space-y-2 col-span-2">
<Label>{editingUser ? "Nouveau mot de passe (laisser vide pour ne pas changer)" : "Mot de passe"}</Label>
<Input type="password" placeholder="••••••••" value={form.password} onChange={(e) => setForm((f) => ({ ...f, password: e.target.value }))} />
<Label>
Adresse e-mail
<span className="ml-1 text-xs text-muted-foreground">(optionnel)</span>
</Label>
<Input
type="email"
placeholder="jean@itinova.fr"
value={form.email}
onChange={(e) => setForm((f) => ({ ...f, email: e.target.value }))}
/>
</div>
{/* Mot de passe */}
<div className="space-y-2 col-span-2">
<Label>
{editingUser
? "Nouveau mot de passe (laisser vide pour ne pas changer)"
: <>Mot de passe <span className="text-destructive">*</span></>}
</Label>
<Input
type="password"
placeholder="••••••••"
value={form.password}
onChange={(e) => setForm((f) => ({ ...f, password: e.target.value }))}
/>
</div>
{/* Rôle */}
<div className="space-y-2">
<Label>Rôle</Label>
<Select value={form.role} onValueChange={(v) => setForm((f) => ({ ...f, role: v as Role }))}>
@@ -271,11 +367,15 @@ export default function UsersAdmin() {
</SelectContent>
</Select>
</div>
{/* Statut (modification uniquement) */}
{editingUser && (
<div className="space-y-2">
<Label>Statut</Label>
<div className="flex items-center gap-2 pt-2">
<Switch checked={form.isActive} onCheckedChange={(v) => setForm((f) => ({ ...f, isActive: v }))} />
<Switch
checked={form.isActive}
onCheckedChange={(v) => setForm((f) => ({ ...f, isActive: v }))}
/>
<span className="text-sm">{form.isActive ? "Actif" : "Inactif"}</span>
</div>
</div>
@@ -283,9 +383,16 @@ export default function UsersAdmin() {
</div>
</div>
<DialogFooter>
<Button variant="outline" onClick={() => setShowDialog(false)}>Annuler</Button>
<Button onClick={handleSubmit} disabled={createMutation.isPending || updateMutation.isPending}>
{(createMutation.isPending || updateMutation.isPending) && <Loader2 size={14} className="animate-spin mr-2" />}
<Button variant="outline" onClick={() => setShowDialog(false)}>
Annuler
</Button>
<Button
onClick={handleSubmit}
disabled={createMutation.isPending || updateMutation.isPending}
>
{(createMutation.isPending || updateMutation.isPending) && (
<Loader2 size={14} className="animate-spin mr-2" />
)}
{editingUser ? "Enregistrer" : "Créer"}
</Button>
</DialogFooter>
@@ -297,11 +404,19 @@ export default function UsersAdmin() {
<DialogContent className="sm:max-w-sm">
<DialogHeader>
<DialogTitle>Supprimer l'utilisateur</DialogTitle>
<DialogDescription>Cette action est irréversible. L'utilisateur ne pourra plus se connecter.</DialogDescription>
<DialogDescription>
Cette action est irréversible. L'utilisateur ne pourra plus se connecter.
</DialogDescription>
</DialogHeader>
<DialogFooter>
<Button variant="outline" onClick={() => setDeleteId(null)}>Annuler</Button>
<Button variant="destructive" onClick={() => deleteId && deleteMutation.mutate({ id: deleteId })} disabled={deleteMutation.isPending}>
<Button variant="outline" onClick={() => setDeleteId(null)}>
Annuler
</Button>
<Button
variant="destructive"
onClick={() => deleteId && deleteMutation.mutate({ id: deleteId })}
disabled={deleteMutation.isPending}
>
{deleteMutation.isPending && <Loader2 size={14} className="animate-spin mr-2" />}
Supprimer
</Button>

View File

@@ -0,0 +1,4 @@
ALTER TABLE `local_users` DROP INDEX `local_users_email_unique`;--> statement-breakpoint
ALTER TABLE `local_users` MODIFY COLUMN `email` varchar(320);--> statement-breakpoint
ALTER TABLE `local_users` ADD `username` varchar(128);--> statement-breakpoint
ALTER TABLE `local_users` ADD CONSTRAINT `local_users_username_unique` UNIQUE(`username`);

View File

@@ -0,0 +1,670 @@
{
"version": "5",
"dialect": "mysql",
"id": "c42bd6aa-6824-4752-9e80-d410188548cf",
"prevId": "46aedace-2016-466b-a1f0-6dc05f8f383e",
"tables": {
"aap_items": {
"name": "aap_items",
"columns": {
"id": {
"name": "id",
"type": "int",
"primaryKey": false,
"notNull": true,
"autoincrement": true
},
"dedupKey": {
"name": "dedupKey",
"type": "varchar(64)",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"titre": {
"name": "titre",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"categorie": {
"name": "categorie",
"type": "enum('Handicap','PA','Enfance','Précarité','Sanitaire','Autre')",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"region": {
"name": "region",
"type": "varchar(255)",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"departement": {
"name": "departement",
"type": "varchar(255)",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"dateCloture": {
"name": "dateCloture",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"datePublication": {
"name": "datePublication",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"lien": {
"name": "lien",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"importedAt": {
"name": "importedAt",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "(now())"
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {
"aap_items_id": {
"name": "aap_items_id",
"columns": [
"id"
]
}
},
"uniqueConstraints": {
"aap_items_dedupKey_unique": {
"name": "aap_items_dedupKey_unique",
"columns": [
"dedupKey"
]
}
},
"checkConstraint": {}
},
"app_settings": {
"name": "app_settings",
"columns": {
"id": {
"name": "id",
"type": "int",
"primaryKey": false,
"notNull": true,
"autoincrement": true
},
"key": {
"name": "key",
"type": "varchar(128)",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"value": {
"name": "value",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"updatedAt": {
"name": "updatedAt",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"onUpdate": true,
"default": "(now())"
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {
"app_settings_id": {
"name": "app_settings_id",
"columns": [
"id"
]
}
},
"uniqueConstraints": {
"app_settings_key_unique": {
"name": "app_settings_key_unique",
"columns": [
"key"
]
}
},
"checkConstraint": {}
},
"ideas": {
"name": "ideas",
"columns": {
"id": {
"name": "id",
"type": "int",
"primaryKey": false,
"notNull": true,
"autoincrement": true
},
"userId": {
"name": "userId",
"type": "int",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"userName": {
"name": "userName",
"type": "varchar(255)",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"titre": {
"name": "titre",
"type": "varchar(512)",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"message": {
"name": "message",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"statut": {
"name": "statut",
"type": "enum('ouvert','en_cours','resolu','ferme')",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "'ouvert'"
},
"reponseAdmin": {
"name": "reponseAdmin",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"reponduPar": {
"name": "reponduPar",
"type": "varchar(255)",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"reponduAt": {
"name": "reponduAt",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"createdAt": {
"name": "createdAt",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "(now())"
},
"updatedAt": {
"name": "updatedAt",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"onUpdate": true,
"default": "(now())"
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {
"ideas_id": {
"name": "ideas_id",
"columns": [
"id"
]
}
},
"uniqueConstraints": {},
"checkConstraint": {}
},
"import_logs": {
"name": "import_logs",
"columns": {
"id": {
"name": "id",
"type": "int",
"primaryKey": false,
"notNull": true,
"autoincrement": true
},
"fileType": {
"name": "fileType",
"type": "enum('veille','aap')",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"source": {
"name": "source",
"type": "varchar(512)",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"status": {
"name": "status",
"type": "enum('success','partial','error')",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"totalRows": {
"name": "totalRows",
"type": "int",
"primaryKey": false,
"notNull": false,
"autoincrement": false,
"default": 0
},
"newRows": {
"name": "newRows",
"type": "int",
"primaryKey": false,
"notNull": false,
"autoincrement": false,
"default": 0
},
"skippedRows": {
"name": "skippedRows",
"type": "int",
"primaryKey": false,
"notNull": false,
"autoincrement": false,
"default": 0
},
"errorMessage": {
"name": "errorMessage",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"details": {
"name": "details",
"type": "json",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"startedAt": {
"name": "startedAt",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "(now())"
},
"completedAt": {
"name": "completedAt",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"autoincrement": false
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {
"import_logs_id": {
"name": "import_logs_id",
"columns": [
"id"
]
}
},
"uniqueConstraints": {},
"checkConstraint": {}
},
"local_users": {
"name": "local_users",
"columns": {
"id": {
"name": "id",
"type": "int",
"primaryKey": false,
"notNull": true,
"autoincrement": true
},
"name": {
"name": "name",
"type": "varchar(255)",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"username": {
"name": "username",
"type": "varchar(128)",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"email": {
"name": "email",
"type": "varchar(320)",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"passwordHash": {
"name": "passwordHash",
"type": "varchar(255)",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"role": {
"name": "role",
"type": "enum('admin','user','readonly')",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "'user'"
},
"isActive": {
"name": "isActive",
"type": "boolean",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": true
},
"createdAt": {
"name": "createdAt",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "(now())"
},
"updatedAt": {
"name": "updatedAt",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"onUpdate": true,
"default": "(now())"
},
"lastSignedIn": {
"name": "lastSignedIn",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"autoincrement": false
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {
"local_users_id": {
"name": "local_users_id",
"columns": [
"id"
]
}
},
"uniqueConstraints": {
"local_users_username_unique": {
"name": "local_users_username_unique",
"columns": [
"username"
]
}
},
"checkConstraint": {}
},
"users": {
"name": "users",
"columns": {
"id": {
"name": "id",
"type": "int",
"primaryKey": false,
"notNull": true,
"autoincrement": true
},
"openId": {
"name": "openId",
"type": "varchar(64)",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"email": {
"name": "email",
"type": "varchar(320)",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"loginMethod": {
"name": "loginMethod",
"type": "varchar(64)",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"role": {
"name": "role",
"type": "enum('user','admin')",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "'user'"
},
"createdAt": {
"name": "createdAt",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "(now())"
},
"updatedAt": {
"name": "updatedAt",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"onUpdate": true,
"default": "(now())"
},
"lastSignedIn": {
"name": "lastSignedIn",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "(now())"
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {
"users_id": {
"name": "users_id",
"columns": [
"id"
]
}
},
"uniqueConstraints": {
"users_openId_unique": {
"name": "users_openId_unique",
"columns": [
"openId"
]
}
},
"checkConstraint": {}
},
"veille_items": {
"name": "veille_items",
"columns": {
"id": {
"name": "id",
"type": "int",
"primaryKey": false,
"notNull": true,
"autoincrement": true
},
"dedupKey": {
"name": "dedupKey",
"type": "varchar(64)",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"titre": {
"name": "titre",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"categorie": {
"name": "categorie",
"type": "varchar(128)",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"niveau": {
"name": "niveau",
"type": "varchar(128)",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"territoire": {
"name": "territoire",
"type": "varchar(255)",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"resume": {
"name": "resume",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"source": {
"name": "source",
"type": "varchar(512)",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"passage": {
"name": "passage",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"lien": {
"name": "lien",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"typeVeille": {
"name": "typeVeille",
"type": "enum('reglementaire','concurrentielle','technologique','generale')",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"datePublication": {
"name": "datePublication",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"importedAt": {
"name": "importedAt",
"type": "timestamp",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "(now())"
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {
"veille_items_id": {
"name": "veille_items_id",
"columns": [
"id"
]
}
},
"uniqueConstraints": {
"veille_items_dedupKey_unique": {
"name": "veille_items_dedupKey_unique",
"columns": [
"dedupKey"
]
}
},
"checkConstraint": {}
}
},
"views": {},
"_meta": {
"schemas": {},
"tables": {},
"columns": {}
},
"internal": {
"tables": {},
"indexes": {}
}
}

View File

@@ -22,6 +22,13 @@
"when": 1776437589031,
"tag": "0002_sticky_the_watchers",
"breakpoints": true
},
{
"idx": 3,
"version": "5",
"when": 1776763582959,
"tag": "0003_shocking_secret_warriors",
"breakpoints": true
}
]
}

View File

@@ -31,7 +31,8 @@ export type InsertUser = typeof users.$inferInsert;
export const localUsers = mysqlTable("local_users", {
id: int("id").autoincrement().primaryKey(),
name: varchar("name", { length: 255 }).notNull(),
email: varchar("email", { length: 320 }).notNull().unique(),
username: varchar("username", { length: 128 }).unique(),
email: varchar("email", { length: 320 }),
passwordHash: varchar("passwordHash", { length: 255 }).notNull(),
role: mysqlEnum("role", ["admin", "user", "readonly"]).default("user").notNull(),
isActive: boolean("isActive").default(true).notNull(),

View File

@@ -72,6 +72,7 @@ export async function getLocalUsers() {
.select({
id: localUsers.id,
name: localUsers.name,
username: localUsers.username,
email: localUsers.email,
role: localUsers.role,
isActive: localUsers.isActive,

View File

@@ -7,7 +7,7 @@ import { ENV } from "./_core/env";
const SALT_ROUNDS = 12;
const JWT_EXPIRY = "7d";
const LOCAL_AUTH_COOKIE = "veille_local_auth";
export const LOCAL_AUTH_COOKIE = "veille_local_auth";
export async function hashPassword(password: string): Promise<string> {
return bcrypt.hash(password, SALT_ROUNDS);
@@ -37,24 +37,30 @@ export async function verifyLocalToken(token: string): Promise<{ userId: number;
}
}
export async function loginLocalUser(email: string, password: string) {
/**
* Connexion par username OU email (insensible à la casse pour l'email).
* Le champ `identifier` peut être un nom d'utilisateur libre ou une adresse e-mail.
*/
export async function loginLocalUser(identifier: string, password: string) {
const db = await getDb();
if (!db) throw new Error("Base de données indisponible");
// Recherche par e-mail (insensible à la casse) OU par identifiant exact
const identifier = email.trim();
const users = await db
const id = identifier.trim();
// Cherche d'abord par username exact, puis par email (insensible à la casse)
const results = await db
.select()
.from(localUsers)
.where(
or(
eq(localUsers.email, identifier.toLowerCase()),
eq(localUsers.email, identifier)
eq(localUsers.username, id),
eq(localUsers.email, id.toLowerCase()),
eq(localUsers.email, id)
)
)
.limit(1);
const user = users[0];
const user = results[0];
if (!user || !user.isActive) {
throw new Error("Identifiants incorrects ou compte désactivé");
}
@@ -62,21 +68,29 @@ export async function loginLocalUser(email: string, password: string) {
const valid = await verifyPassword(password, user.passwordHash);
if (!valid) throw new Error("Identifiants incorrects ou compte désactivé");
// Mise à jour lastSignedIn
await db
.update(localUsers)
.set({ lastSignedIn: new Date() })
.where(eq(localUsers.id, user.id));
const token = await generateLocalToken(user.id, user.role);
return { token, user: { id: user.id, name: user.name, email: user.email, role: user.role } };
return {
token,
user: {
id: user.id,
name: user.name,
username: user.username ?? null,
email: user.email ?? null,
role: user.role,
},
};
}
export async function getLocalUserById(id: number) {
const db = await getDb();
if (!db) return null;
const users = await db.select().from(localUsers).where(eq(localUsers.id, id)).limit(1);
return users[0] ?? null;
const results = await db.select().from(localUsers).where(eq(localUsers.id, id)).limit(1);
return results[0] ?? null;
}
export async function ensureAdminExists() {
@@ -93,11 +107,12 @@ export async function ensureAdminExists() {
const hash = await hashPassword("Admin@Itinova2024!");
await db.insert(localUsers).values({
name: "Administrateur",
username: "admin",
email: "admin@itinova.fr",
passwordHash: hash,
role: "admin",
isActive: true,
});
console.log("[LocalAuth] Compte admin par défaut créé : admin@itinova.fr / Admin@Itinova2024!");
console.log("[LocalAuth] Compte admin par défaut créé : admin / Admin@Itinova2024!");
}
}

View File

@@ -195,7 +195,8 @@ export const appRouter = router({
.input(
z.object({
name: z.string().min(2).max(255),
email: z.string().email(),
username: z.string().min(2).max(128).optional(),
email: z.string().email().optional(),
password: z.string().min(8),
role: z.enum(["admin", "user", "readonly"]).default("user"),
})
@@ -204,7 +205,8 @@ export const appRouter = router({
const passwordHash = await hashPassword(input.password);
await createLocalUser({
name: input.name,
email: input.email.toLowerCase(),
username: input.username ?? null,
email: input.email ? input.email.toLowerCase() : null,
passwordHash,
role: input.role,
isActive: true,
@@ -217,6 +219,7 @@ export const appRouter = router({
z.object({
id: z.number().int().positive(),
name: z.string().min(2).max(255).optional(),
username: z.string().min(2).max(128).optional(),
email: z.string().email().optional(),
password: z.string().min(8).optional(),
role: z.enum(["admin", "user", "readonly"]).optional(),

View File

@@ -53,3 +53,10 @@
- [x] Page BoiteAIdees : liste avec date, titre, demandeur, texte, statut, réponse admin
- [x] Bouton "Nouvelle demande" en haut à droite ouvrant une boîte de dialogue
- [x] Menu "Boîte à idées" dans la sidebar accessible à tous les utilisateurs
## Authentification username
- [ ] BDD : ajouter colonne username (unique, nullable) dans la table users
- [ ] Backend : loginLocalUser cherche par username OU email
- [ ] Backend : createLocalUser accepte username optionnel
- [ ] Frontend : page Gestion utilisateurs affiche et permet de saisir le username
- [ ] Mettre à jour le compte adminItinova avec username = adminItinova