jmartin/petitspas
1
0
Fork 0
Code Issues 36 Pull Requests Actions Packages Projects Releases Wiki Activity

feat(#14): finalisation redirection et nettoyage

Browse Source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
MARTIN Julien 2026-02-15 23:08:02 +01:00
parent 31857ec891
commit 8e8c6d79b1
3 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
frontend/lib/screens/administrateurs/admin_dashboardScreen.dart
View File

@ -15,13 +15,8 @@ class AdminDashboardScreen extends StatefulWidget {
}
class _AdminDashboardScreenState extends State<AdminDashboardScreen> {
/// null = chargement du statut setup, true/false = connu
bool? _setupCompleted;
/// 0 = Gestion des utilisateurs, 1 = Paramètres
int mainTabIndex = 0;
/// Sous-onglet quand mainTabIndex == 0 : 0=Gestionnaires, 1=Parents, 2=AM, 3=Administrateurs
int subIndex = 0;
@override
@ -38,8 +33,11 @@ class _AdminDashboardScreenState extends State<AdminDashboardScreen> {
_setupCompleted = completed;
if (!completed) mainTabIndex = 1;
});
} catch (_) {
if (mounted) setState(() => _setupCompleted = true);
} catch (e) {
if (mounted) setState(() {
_setupCompleted = false;
mainTabIndex = 1;
});
}
}
@ -96,9 +94,7 @@ class _AdminDashboardScreenState extends State<AdminDashboardScreen> {
Widget _getBody() {
if (mainTabIndex == 1) {
return ParametresPanel(
onSetupCompleted: () => setState(() => _setupCompleted = true),
);
return ParametresPanel(redirectToLoginAfterSave: !_setupCompleted!);
}
switch (subIndex) {
case 0:

36
frontend/lib/services/configuration_service.dart
View File

@ -55,6 +55,12 @@ class ConfigurationService {
: Map<String, String>.from(ApiConfig.headers);
}
static String? _toStr(dynamic v) {
if (v == null) return null;
if (v is String) return v;
return v.toString();
}
/// GET /api/v1/configuration/setup/status
static Future<bool> getSetupStatus() async {
final response = await http.get(
@ -63,7 +69,11 @@ class ConfigurationService {
);
if (response.statusCode != 200) return true;
final data = jsonDecode(response.body);
return data['data']?['setupCompleted'] as bool? ?? true;
final val = data['data']?['setupCompleted'];
if (val is bool) return val;
if (val is String) return val.toLowerCase() == 'true' || val == '1';
if (val is int) return val == 1;
return true; // Par défaut on considère configuré pour ne pas bloquer
}
/// GET /api/v1/configuration (toutes les configs)
@ -73,9 +83,8 @@ class ConfigurationService {
headers: await _headers(),
);
if (response.statusCode != 200) {
throw Exception(
(jsonDecode(response.body) as Map)['message'] ?? 'Erreur chargement configuration',
);
final err = jsonDecode(response.body) as Map<String, dynamic>?;
throw Exception(_toStr(err?['message']) ?? 'Erreur chargement configuration');
}
final data = jsonDecode(response.body);
final list = data['data'] as List<dynamic>? ?? [];
@ -89,9 +98,8 @@ class ConfigurationService {
headers: await _headers(),
);
if (response.statusCode != 200) {
throw Exception(
(jsonDecode(response.body) as Map)['message'] ?? 'Erreur chargement configuration',
);
final err = jsonDecode(response.body) as Map<String, dynamic>?;
throw Exception(_toStr(err?['message']) ?? 'Erreur chargement configuration');
}
final data = jsonDecode(response.body);
final map = data['data'] as Map<String, dynamic>? ?? {};
@ -105,9 +113,9 @@ class ConfigurationService {
headers: await _headers(),
body: jsonEncode(body),
);
if (response.statusCode != 200) {
if (response.statusCode != 200 && response.statusCode != 201) {
final err = jsonDecode(response.body) as Map<String, dynamic>?;
final msg = err != null ? (err['message'] as String? ?? err['error'] as String?) : null;
final msg = err != null ? (_toStr(err['error']) ?? _toStr(err['message'])) : null;
throw Exception(msg ?? 'Erreur lors de la sauvegarde');
}
}
@ -120,10 +128,10 @@ class ConfigurationService {
body: jsonEncode({'testEmail': testEmail}),
);
final data = jsonDecode(response.body) as Map<String, dynamic>?;
if (response.statusCode == 200 && (data?['success'] == true)) {
return data!['message'] as String? ?? 'Test SMTP réussi.';
if ((response.statusCode == 200 || response.statusCode == 201) && (data?['success'] == true)) {
return _toStr(data?['message']) ?? 'Test SMTP réussi.';
}
final msg = data != null ? (data['error'] as String? ?? data['message'] as String?) : null;
final msg = data != null ? (_toStr(data['error']) ?? _toStr(data['message'])) : null;
throw Exception(msg ?? 'Échec du test SMTP');
}
@ -133,9 +141,9 @@ class ConfigurationService {
Uri.parse('${ApiConfig.baseUrl}${ApiConfig.configurationSetupComplete}'),
headers: await _headers(),
);
if (response.statusCode != 200) {
if (response.statusCode != 200 && response.statusCode != 201) {
final err = jsonDecode(response.body) as Map<String, dynamic>?;
final msg = err != null ? (err['message'] as String? ?? err['error'] as String?) : null;
final msg = err != null ? (_toStr(err['error']) ?? _toStr(err['message'])) : null;
throw Exception(msg ?? 'Erreur finalisation configuration');
}
}

19
frontend/lib/widgets/admin/parametres_panel.dart
View File

@ -1,12 +1,13 @@
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:p_tits_pas/services/configuration_service.dart';
/// Panneau Paramètres / Configuration (ticket #15) : 3 sections sur une page.
/// Panneau Paramètres admin : Email (SMTP), Personnalisation, Avancé.
class ParametresPanel extends StatefulWidget {
/// Appelé après une sauvegarde réussie (pour débloquer le reste du dashboard si config initiale).
final VoidCallback? onSetupCompleted;
/// Si true, après sauvegarde on redirige vers le login (première config). Sinon on reste sur la page.
final bool redirectToLoginAfterSave;
const ParametresPanel({super.key, this.onSetupCompleted});
const ParametresPanel({super.key, this.redirectToLoginAfterSave = false});
@override
State<ParametresPanel> createState() => _ParametresPanelState();
@ -107,13 +108,14 @@ class _ParametresPanelState extends State<ParametresPanel> {
return payload;
}
/// Enregistre en base sans marquer la config initiale comme terminée (utilisé avant test SMTP).
/// Sauvegarde en base sans completeSetup (utilisé avant test SMTP).
Future<void> _saveBulkOnly() async {
await ConfigurationService.updateBulk(_buildPayload());
}
/// Sauvegarde + marque la config initiale comme terminée + débloque les panneaux.
/// Sauvegarde la config, marque le setup comme terminé. Si première config, redirige vers le login.
Future<void> _save() async {
final redirectAfter = widget.redirectToLoginAfterSave;
setState(() {
_message = null;
_isSaving = true;
@ -123,11 +125,14 @@ class _ParametresPanelState extends State<ParametresPanel> {
if (!mounted) return;
await ConfigurationService.completeSetup();
if (!mounted) return;
widget.onSetupCompleted?.call();
setState(() {
_isSaving = false;
_message = 'Configuration enregistrée.';
});
if (!mounted) return;
if (redirectAfter) {
GoRouter.of(context).go('/login');
}
} catch (e) {
if (mounted) {
setState(() {