Compare commits
No commits in common. "2fa546e6b7354b02da2a17ccd75ad13143baa65e" and "7e17e5ff8d70ee1d075e635f51836bba6401f420" have entirely different histories.
2fa546e6b7
...
7e17e5ff8d
@ -7,7 +7,6 @@ import 'dart:math' as math;
|
||||
import '../../models/am_registration_data.dart';
|
||||
import '../../models/card_assets.dart';
|
||||
import '../../config/display_config.dart';
|
||||
import '../../services/auth_service.dart';
|
||||
import '../../widgets/hover_relief_widget.dart';
|
||||
import '../../widgets/image_button.dart';
|
||||
import '../../widgets/custom_navigation_button.dart';
|
||||
@ -23,28 +22,6 @@ class AmRegisterStep4Screen extends StatefulWidget {
|
||||
}
|
||||
|
||||
class _AmRegisterStep4ScreenState extends State<AmRegisterStep4Screen> {
|
||||
bool _isSubmitting = false;
|
||||
|
||||
Future<void> _submitAMRegistration(AmRegistrationData registrationData) async {
|
||||
if (_isSubmitting) return;
|
||||
setState(() => _isSubmitting = true);
|
||||
try {
|
||||
await AuthService.registerAM(registrationData);
|
||||
if (!mounted) return;
|
||||
_showConfirmationModal(context);
|
||||
} catch (e) {
|
||||
if (!mounted) return;
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(e is Exception ? e.toString().replaceFirst('Exception: ', '') : 'Erreur lors de l\'inscription'),
|
||||
backgroundColor: Colors.red.shade700,
|
||||
),
|
||||
);
|
||||
} finally {
|
||||
if (mounted) setState(() => _isSubmitting = false);
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final registrationData = Provider.of<AmRegistrationData>(context);
|
||||
@ -113,9 +90,12 @@ class _AmRegisterStep4ScreenState extends State<AmRegisterStep4Screen> {
|
||||
Expanded(
|
||||
child: HoverReliefWidget(
|
||||
child: CustomNavigationButton(
|
||||
text: _isSubmitting ? 'Envoi...' : 'Soumettre',
|
||||
text: 'Soumettre',
|
||||
style: NavigationButtonStyle.green,
|
||||
onPressed: () => _submitAMRegistration(registrationData),
|
||||
onPressed: () {
|
||||
print("Données AM finales: ${registrationData.firstName} ${registrationData.lastName}");
|
||||
_showConfirmationModal(context);
|
||||
},
|
||||
width: double.infinity,
|
||||
height: 50,
|
||||
fontSize: 16,
|
||||
@ -126,14 +106,17 @@ class _AmRegisterStep4ScreenState extends State<AmRegisterStep4Screen> {
|
||||
),
|
||||
)
|
||||
else
|
||||
ImageButton(
|
||||
ImageButton(
|
||||
bg: 'assets/images/bg_green.png',
|
||||
text: _isSubmitting ? 'Envoi...' : 'Soumettre ma demande',
|
||||
text: 'Soumettre ma demande',
|
||||
textColor: const Color(0xFF2D6A4F),
|
||||
width: 350,
|
||||
height: 50,
|
||||
fontSize: 18,
|
||||
onPressed: () => _submitAMRegistration(registrationData),
|
||||
onPressed: () {
|
||||
print("Données AM finales: ${registrationData.firstName} ${registrationData.lastName}");
|
||||
_showConfirmationModal(context);
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
|
||||
@ -1,12 +1,9 @@
|
||||
import 'dart:convert';
|
||||
import 'dart:io';
|
||||
import 'package:http/http.dart' as http;
|
||||
import 'package:shared_preferences/shared_preferences.dart';
|
||||
import '../models/user.dart';
|
||||
import '../models/am_registration_data.dart';
|
||||
import 'api/api_config.dart';
|
||||
import 'api/tokenService.dart';
|
||||
import '../utils/nir_utils.dart';
|
||||
|
||||
class AuthService {
|
||||
static const String _currentUserKey = 'current_user';
|
||||
@ -136,70 +133,6 @@ class AuthService {
|
||||
await prefs.setString(_currentUserKey, jsonEncode(user.toJson()));
|
||||
}
|
||||
|
||||
/// Inscription AM complète (POST /auth/register/am).
|
||||
/// En cas de succès (201), aucune donnée utilisateur retournée ; rediriger vers login.
|
||||
static Future<void> registerAM(AmRegistrationData data) async {
|
||||
String? photoBase64;
|
||||
if (data.photoPath != null && data.photoPath!.isNotEmpty && !data.photoPath!.startsWith('assets/')) {
|
||||
try {
|
||||
final file = File(data.photoPath!);
|
||||
if (await file.exists()) {
|
||||
final bytes = await file.readAsBytes();
|
||||
photoBase64 = 'data:image/jpeg;base64,${base64Encode(bytes)}';
|
||||
}
|
||||
} catch (_) {}
|
||||
}
|
||||
|
||||
final body = {
|
||||
'email': data.email,
|
||||
'prenom': data.firstName,
|
||||
'nom': data.lastName,
|
||||
'telephone': data.phone,
|
||||
'adresse': data.streetAddress.isNotEmpty ? data.streetAddress : null,
|
||||
'code_postal': data.postalCode.isNotEmpty ? data.postalCode : null,
|
||||
'ville': data.city.isNotEmpty ? data.city : null,
|
||||
if (photoBase64 != null) 'photo_base64': photoBase64,
|
||||
'consentement_photo': data.photoConsent,
|
||||
'date_naissance': data.dateOfBirth != null
|
||||
? '${data.dateOfBirth!.year}-${data.dateOfBirth!.month.toString().padLeft(2, '0')}-${data.dateOfBirth!.day.toString().padLeft(2, '0')}'
|
||||
: null,
|
||||
'lieu_naissance_ville': data.birthCity.isNotEmpty ? data.birthCity : null,
|
||||
'lieu_naissance_pays': data.birthCountry.isNotEmpty ? data.birthCountry : null,
|
||||
'nir': normalizeNir(data.nir),
|
||||
'numero_agrement': data.agrementNumber,
|
||||
'capacite_accueil': data.capacity ?? 1,
|
||||
'biographie': data.presentationText.isNotEmpty ? data.presentationText : null,
|
||||
'acceptation_cgu': data.cguAccepted,
|
||||
'acceptation_privacy': data.cguAccepted,
|
||||
};
|
||||
|
||||
final response = await http.post(
|
||||
Uri.parse('${ApiConfig.baseUrl}${ApiConfig.registerAM}'),
|
||||
headers: ApiConfig.headers,
|
||||
body: jsonEncode(body),
|
||||
);
|
||||
|
||||
if (response.statusCode == 200 || response.statusCode == 201) {
|
||||
return;
|
||||
}
|
||||
|
||||
final decoded = response.body.isNotEmpty ? jsonDecode(response.body) : null;
|
||||
final message = _extractErrorMessage(decoded, response.statusCode);
|
||||
throw Exception(message);
|
||||
}
|
||||
|
||||
/// Extrait le message d'erreur des réponses NestJS (message string, array, ou objet).
|
||||
static String _extractErrorMessage(dynamic decoded, int statusCode) {
|
||||
const fallback = 'Erreur lors de l\'inscription';
|
||||
if (decoded == null || decoded is! Map) return '$fallback ($statusCode)';
|
||||
final msg = decoded['message'];
|
||||
if (msg == null) return decoded['error'] as String? ?? '$fallback ($statusCode)';
|
||||
if (msg is String) return msg;
|
||||
if (msg is List) return msg.map((e) => e.toString()).join('. ').trim();
|
||||
if (msg is Map && msg['message'] != null) return msg['message'].toString();
|
||||
return '$fallback ($statusCode)';
|
||||
}
|
||||
|
||||
/// Rafraîchit le profil utilisateur depuis l'API
|
||||
static Future<AppUser?> refreshCurrentUser() async {
|
||||
final token = await TokenService.getToken();
|
||||
|
||||
@ -49,11 +49,15 @@ String nirToRaw(String normalized) {
|
||||
return s;
|
||||
}
|
||||
|
||||
/// Formate pour affichage : 1 12 34 56 789 012-34 ou 1 12 34 2A 789 012-34 (Corse).
|
||||
/// Formate pour affichage : 1 12 34 56 789 012-34 ou 1 12 34 2A 789 012-34
|
||||
String formatNir(String raw) {
|
||||
final r = nirToRaw(raw);
|
||||
if (r.length < 15) return r;
|
||||
// Même structure pour tous : sexe + année + mois + département + commune + ordre-clé.
|
||||
final dept = r.substring(5, 7);
|
||||
final isCorsica = dept == '2A' || dept == '2B';
|
||||
if (isCorsica) {
|
||||
return '${r.substring(0, 5)} ${r.substring(5, 7)} ${r.substring(7, 10)} ${r.substring(10, 13)}-${r.substring(13, 15)}';
|
||||
}
|
||||
return '${r.substring(0, 1)} ${r.substring(1, 3)} ${r.substring(3, 5)} ${r.substring(5, 7)} ${r.substring(7, 10)} ${r.substring(10, 13)}-${r.substring(13, 15)}';
|
||||
}
|
||||
|
||||
@ -63,7 +67,7 @@ bool _isFormatValid(String raw) {
|
||||
final dept = raw.substring(5, 7);
|
||||
final restDigits = raw.substring(0, 5) + (dept == '2A' ? '19' : dept == '2B' ? '18' : dept) + raw.substring(7, 15);
|
||||
if (!RegExp(r'^[12]\d{12}\d{2}$').hasMatch(restDigits)) return false;
|
||||
return RegExp(r'^[12]\d{4}(?:\d{2}|2A|2B)\d{8}$').hasMatch(raw);
|
||||
return RegExp(r'^[12]\d{4}(?:\d{2}|2A|2B)\d{6}$').hasMatch(raw);
|
||||
}
|
||||
|
||||
/// Calcule la clé de contrôle (97 - (NIR13 mod 97)). Pour 2A→19, 2B→18.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user