fix
This commit is contained in:
parent
91d90bd2b6
commit
b3476834cf
|
|
@ -1,3 +1,14 @@
|
||||||
|
DateTime? _parseDateTime(dynamic value) {
|
||||||
|
if (value == null) return null;
|
||||||
|
final s = value.toString().trim();
|
||||||
|
if (s.isEmpty) return null;
|
||||||
|
try {
|
||||||
|
return DateTime.parse(s);
|
||||||
|
} catch (_) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
class User {
|
class User {
|
||||||
final String id;
|
final String id;
|
||||||
final String mobileNumber;
|
final String mobileNumber;
|
||||||
|
|
@ -36,8 +47,8 @@ class User {
|
||||||
email: json['email'],
|
email: json['email'],
|
||||||
address: json['address'],
|
address: json['address'],
|
||||||
emergencyContact: json['emergency_contact'],
|
emergencyContact: json['emergency_contact'],
|
||||||
createdAt: json['created_at'] != null ? DateTime.parse(json['created_at']) : DateTime.now(),
|
createdAt: _parseDateTime(json['created_at']) ?? DateTime.now(),
|
||||||
updatedAt: json['updated_at'] != null ? DateTime.parse(json['updated_at']) : DateTime.now(),
|
updatedAt: _parseDateTime(json['updated_at']) ?? DateTime.now(),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -75,18 +75,9 @@ class AuthService extends GetxController {
|
||||||
);
|
);
|
||||||
|
|
||||||
if (response['success']) {
|
if (response['success']) {
|
||||||
final userData = response['data']['user'];
|
final userData = response['data']['user'] as Map<String, dynamic>;
|
||||||
final token = response['data']['token'];
|
final token = response['data']['token'] as String;
|
||||||
|
final user = User.fromJson(userData);
|
||||||
final user = User(
|
|
||||||
id: userData['id'],
|
|
||||||
mobileNumber: userData['mobile_number'],
|
|
||||||
fullName: userData['full_name'],
|
|
||||||
role: userData['role'],
|
|
||||||
isActive: userData['is_active'] ?? true,
|
|
||||||
createdAt: DateTime.parse(userData['created_at']),
|
|
||||||
updatedAt: DateTime.parse(userData['updated_at']),
|
|
||||||
);
|
|
||||||
|
|
||||||
await _saveAuthData(token, user);
|
await _saveAuthData(token, user);
|
||||||
|
|
||||||
|
|
@ -115,18 +106,9 @@ class AuthService extends GetxController {
|
||||||
final response = await _apiService.login(mobileNumber, password);
|
final response = await _apiService.login(mobileNumber, password);
|
||||||
|
|
||||||
if (response['success']) {
|
if (response['success']) {
|
||||||
final userData = response['data']['user'];
|
final userData = response['data']['user'] as Map<String, dynamic>;
|
||||||
final token = response['data']['token'];
|
final token = response['data']['token'] as String;
|
||||||
|
final user = User.fromJson(userData);
|
||||||
final user = User(
|
|
||||||
id: userData['id'],
|
|
||||||
mobileNumber: userData['mobile_number'],
|
|
||||||
fullName: userData['full_name'],
|
|
||||||
role: userData['role'],
|
|
||||||
isActive: userData['is_active'] ?? true,
|
|
||||||
createdAt: DateTime.parse(userData['created_at']),
|
|
||||||
updatedAt: DateTime.parse(userData['updated_at']),
|
|
||||||
);
|
|
||||||
|
|
||||||
await _saveAuthData(token, user);
|
await _saveAuthData(token, user);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue