Hamza/musadaq-saas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update: 2026-05-25 21:44:11

Browse Source
This commit is contained in:
Hamza-Ayed
2026-05-25 21:44:11 +03:00
parent 2f1a6f9c85
commit 5f62455113
10 changed files with 327 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
musadaq-app/lib/features/auth/controllers/auth_controller.dart
View File

@@ -12,7 +12,7 @@ import '../../../core/services/push_notification_service.dart';
class AuthController extends GetxController {
final Dio _dio = DioClient().client;
final SecureStorage _storage = SecureStorage();
var isLoading = false.obs;
var phone = ''.obs;
@@ -23,20 +23,20 @@ class AuthController extends GetxController {
return;
}
isLoading.value = true;
// Normalize phone number
String normalizedPhone = phoneNumber.replaceAll(RegExp(r'[^0-9+]'), '');
if (normalizedPhone.startsWith('+')) {
normalizedPhone = normalizedPhone.substring(1);
}
if (normalizedPhone.startsWith('07')) {
normalizedPhone = '962' + normalizedPhone.substring(1);
normalizedPhone = '962${normalizedPhone.substring(1)}';
} else if (normalizedPhone.startsWith('7')) {
normalizedPhone = '962' + normalizedPhone;
normalizedPhone = '962$normalizedPhone';
}
phone.value = normalizedPhone;
final response = await _dio.post('auth/mobile/request-otp', data: {
'phone': normalizedPhone,
});
@@ -60,12 +60,12 @@ class AuthController extends GetxController {
Future<void> verifyOtp(String otp) async {
try {
isLoading.value = true;
// Get device info
final deviceInfo = DeviceInfoPlugin();
String deviceId = '';
String deviceName = '';
if (Platform.isAndroid) {
final androidInfo = await deviceInfo.androidInfo;
deviceId = androidInfo.id;
@@ -92,16 +92,16 @@ class AuthController extends GetxController {
if (response.statusCode == 200) {
AppLogger.print('OTP Verify Success. Tokens received.');
final data = response.data['data'];
// Save secure data
await _storage.saveToken(data['access_token']);
await _storage.saveDeviceSecret(data['device_secret']);
if (data['user']['email'] != null) {
await _storage.saveEmail(data['user']['email']);
}
AppSnackbar.showSuccess('مرحباً بك', 'تم تسجيل الدخول بنجاح');
// Navigate to Biometric Setup (unless it's the reviewer)
if (data['user']['email'] == 'reviewer@musadaq.jo') {
Get.offAllNamed(AppRoutes.MAIN);
@@ -111,7 +111,8 @@ class AuthController extends GetxController {
}
} on DioException catch (e, stackTrace) {
AppLogger.error('OTP Verify Failed', e.response?.data, stackTrace);
AppSnackbar.showError('خطأ', e.response?.data['message'] ?? 'رمز التحقق غير صحيح');
AppSnackbar.showError(
'خطأ', e.response?.data['message'] ?? 'رمز التحقق غير صحيح');
} finally {
isLoading.value = false;
}
@@ -120,7 +121,8 @@ class AuthController extends GetxController {
Future<void> loginWithEmail(String email, String password) async {
try {
if (email.trim().isEmpty || password.trim().isEmpty) {
AppSnackbar.showError('خطأ', 'الرجاء إدخال البريد الإلكتروني وكلمة المرور');
AppSnackbar.showError(
'خطأ', 'الرجاء إدخال البريد الإلكتروني وكلمة المرور');
return;
}
isLoading.value = true;
@@ -129,7 +131,7 @@ class AuthController extends GetxController {
final deviceInfo = DeviceInfoPlugin();
String deviceId = '';
String deviceName = '';
if (Platform.isAndroid) {
final androidInfo = await deviceInfo.androidInfo;
deviceId = androidInfo.id;
@@ -150,22 +152,31 @@ class AuthController extends GetxController {
});
if (response.statusCode == 200) {
AppLogger.print('Email Login Success. Tokens received.');
final data = response.data['data'];
if (data['otp_required'] == true) {
AppLogger.print('Email Login verification required via OTP.');
phone.value = data['phone'] ?? '';
AppSnackbar.showSuccess('نجاح', 'تم إرسال رمز التحقق إلى رقم هاتفك المسجل');
Get.toNamed(AppRoutes.OTP_VERIFY);
return;
}
AppLogger.print('Email Login Success. Tokens received.');
// Save secure data
await _storage.saveToken(data['access_token']);
// Note: auth/login might not return device_secret, handle if missing
if (data['device_secret'] != null) {
await _storage.saveDeviceSecret(data['device_secret']);
}
if (data['user']['email'] != null) {
await _storage.saveEmail(data['user']['email']);
}
AppSnackbar.showSuccess('مرحباً بك', 'تم تسجيل الدخول بنجاح');
// Navigate to Dashboard for reviewer, else Biometric Setup
if (email == 'reviewer@musadaq.jo') {
Get.offAllNamed(AppRoutes.MAIN);