feat: استيراد كود سيرو إلى تريبز (سيرو @ecfe7568) — بلا تعديل
قرار المالك 2026-07-27: باك إند سيرو PHP هو المعتمد، وتطبيقاته المجرّبة ميدانياً تحل محل إعادة البناء المؤرشفة. سيرو نفسه لم يُمسّ. الخريطة: backend · payment_server · loction_server · ride_server · passenger_server · docker · dashboard · stress_test → الجذر siro_rider → apps/rider siro_driver → apps/driver siro_admin → dashboards/admin siro_service → dashboards/service android_bot → apps/android_bot socialBot → apps/socialBot نُسخ المتعقَّب في git سيرو فقط عبر `git archive` (3,198 ملفاً / ~169 م.ب) لا `cp -r` — فاستُثنيت مخلفات البناء تلقائياً. بلا أي تعديل محتوى عمداً: كل ما يلي يصير فرقاً مقروءاً مقابل المصدر. لم يُستورد وسببه: siromove.com (الموقع التسويقي يبقى marketing/ في تريبز، سيرو فيه 8 ملفات) · docs و planning (تريبز له docs/ الخاص) · deploy.sh (ليس نشراً على سيرفر بل `git add . && git push origin --all` — فخّ في مستودع آخر) · transit_dashboard (بانتظار قرار مصير backend-transit و dashboards/transit-web). ⚠️ لا يبني بعد — ثلاثة نواقص متوقعة ومقصودة: 1. `.env` و `lib/env/env.g.dart` غير متعقَّبين في سيرو (أسرار لكل مستأجر): كل تطبيق فلاتر يحتاج .env خاصاً ثم توليد env.g.dart بـ build_runner. 2. إعدادات Firebase (9 ملفات google-services.json و GoogleService-Info.plist) يستبعدها .gitignore تريبز — ولكل مستأجر مشروع Firebase خاص أصلاً. 3. apps/driver في سيرو يشير إلى `../../Intaleq/packages/get` خارج المستودع → يجب ضمّ الحزم داخله أسوة بـ apps/rider. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Hamza-Ayed
co-authored by
Claude Opus 5
Claude Opus 5
parent
9909d9b4c1
commit
4d8414c96b
@@ -0,0 +1,214 @@
|
||||
import 'dart:convert';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:siro_service/constant/links.dart';
|
||||
import 'package:siro_service/controller/functions/crud.dart';
|
||||
import 'package:siro_service/controller/functions/device_helper.dart';
|
||||
import 'package:siro_service/controller/functions/encrypt_decrypt.dart';
|
||||
|
||||
import '../constant/box_name.dart';
|
||||
import '../main.dart';
|
||||
import '../print.dart';
|
||||
import '../views/home/main.dart';
|
||||
import '../views/widgets/mycircular.dart';
|
||||
|
||||
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
|
||||
|
||||
class LoginController extends GetxController {
|
||||
var email = TextEditingController(); // Kept for UI compatibility
|
||||
var password = TextEditingController();
|
||||
final formKey = GlobalKey<FormState>();
|
||||
|
||||
final FlutterSecureStorage storage = const FlutterSecureStorage();
|
||||
|
||||
var selectedCountry = 'Jordan'.obs;
|
||||
bool isFirstRun = box.read(BoxName.countryCode) == null;
|
||||
|
||||
void changeCountry(String country) {
|
||||
selectedCountry.value = country;
|
||||
box.write(BoxName.countryCode, country);
|
||||
}
|
||||
|
||||
void login() async {
|
||||
// Ensure fingerprint is ready
|
||||
String fingerprint = box.read(BoxName.fingerPrint) ?? '';
|
||||
if (fingerprint.isEmpty) {
|
||||
fingerprint = await DeviceHelper.getDeviceFingerprint();
|
||||
}
|
||||
|
||||
String? storedPassword = await storage.read(key: 'password');
|
||||
String pass = storedPassword ?? password.text;
|
||||
|
||||
if (pass.isEmpty && !formKey.currentState!.validate()) return;
|
||||
|
||||
var payload = {
|
||||
"fingerprint": fingerprint,
|
||||
"password": pass,
|
||||
"email": email.text.trim(),
|
||||
"aud": "service",
|
||||
};
|
||||
|
||||
Log.print('🚀 Login Payload: $payload');
|
||||
var res = await CRUD().post(link: AppLink.login, payload: payload);
|
||||
Log.print('📥 Login Response: $res');
|
||||
|
||||
if (res != 'failure' && res is Map && res['status'] == 'success') {
|
||||
var d = res['message']; // V1 returns {status, message: {jwt, data: {user...}}}
|
||||
|
||||
// Save JWT immediately so subsequent CRUD calls don't trigger
|
||||
// unnecessary session refresh (which calls getJWT without email)
|
||||
final jwt = d['jwt'];
|
||||
final hmac = d['hmac'];
|
||||
await box.write(BoxName.jwt, c(jwt));
|
||||
await storage.write(key: BoxName.jwt, value: c(jwt));
|
||||
if (hmac != null) {
|
||||
await box.write(BoxName.hmac, hmac);
|
||||
}
|
||||
await storage.write(key: 'password', value: pass);
|
||||
await box.write(BoxName.password, pass);
|
||||
final emailStr = email.text.trim();
|
||||
await storage.write(key: 'email', value: emailStr);
|
||||
await box.write(BoxName.email, emailStr);
|
||||
|
||||
bool otpRequired = d['otp_required'] ?? true;
|
||||
if (otpRequired) {
|
||||
String phone = d['data']['phone'] ?? '';
|
||||
bool otpSent = await _sendOtp(phone);
|
||||
if (otpSent) {
|
||||
_showOtpDialog(phone, pass, fingerprint, d);
|
||||
} else {
|
||||
mySnackbarError('Failed to send OTP'.tr);
|
||||
}
|
||||
} else {
|
||||
await _finalizeLogin(pass, d);
|
||||
}
|
||||
} else {
|
||||
mySnackbarError(
|
||||
res is Map ? res['message'].toString().tr : 'فشل تسجيل الدخول'.tr,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Future<bool> _sendOtp(String phone) async {
|
||||
try {
|
||||
final response = await CRUD().post(
|
||||
link: '${AppLink.server}/auth/otp/request.php',
|
||||
payload: {
|
||||
'receiver': phone,
|
||||
'user_type': 'service'
|
||||
},
|
||||
);
|
||||
return response is Map && response['status'] == 'success';
|
||||
} catch (e) {
|
||||
Log.print('OTP SEND ERROR: $e');
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
void _showOtpDialog(String phone, String pass, String fingerprint, dynamic loginData) {
|
||||
String otpCode = '';
|
||||
Get.defaultDialog(
|
||||
title: 'رمز التحقق'.tr,
|
||||
content: Column(
|
||||
children: [
|
||||
Text('تم إرسال رمز التحقق إلى رقمك ($phone)'.tr),
|
||||
const SizedBox(height: 16),
|
||||
TextField(
|
||||
onChanged: (val) => otpCode = val,
|
||||
keyboardType: TextInputType.number,
|
||||
decoration: InputDecoration(
|
||||
hintText: 'أدخل الرمز هنا'.tr,
|
||||
border: OutlineInputBorder(),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
textConfirm: 'تحقق'.tr,
|
||||
confirmTextColor: Colors.white,
|
||||
onConfirm: () async {
|
||||
if (otpCode.length >= 3) {
|
||||
Get.back(); // close dialog
|
||||
await _verifyOtpAndFinalize(phone, otpCode, pass, loginData);
|
||||
} else {
|
||||
mySnackbarError('الرجاء إدخال رمز صحيح'.tr);
|
||||
}
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _verifyOtpAndFinalize(String phone, String otp, String pass, dynamic loginData) async {
|
||||
Get.dialog(const Center(child: CircularProgressIndicator()), barrierDismissible: false);
|
||||
try {
|
||||
final response = await CRUD().post(
|
||||
link: '${AppLink.server}/auth/otp/verify.php',
|
||||
payload: {
|
||||
'phone_number': phone,
|
||||
'token_code': otp,
|
||||
'user_type': 'service',
|
||||
},
|
||||
);
|
||||
Get.back(); // close loading
|
||||
|
||||
if (response != 'failure' && response['status'] == 'success') {
|
||||
await _finalizeLogin(pass, loginData);
|
||||
} else {
|
||||
mySnackbarError('Invalid OTP'.tr);
|
||||
}
|
||||
} catch (e) {
|
||||
Get.back();
|
||||
Log.print('OTP VERIFY ERROR: $e');
|
||||
mySnackbarError(e.toString());
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _finalizeLogin(String pass, dynamic loginData) async {
|
||||
final jwt = loginData['jwt'];
|
||||
final hmac = loginData['hmac'];
|
||||
await box.write(BoxName.jwt, c(jwt));
|
||||
await storage.write(key: BoxName.jwt, value: c(jwt));
|
||||
if (hmac != null) {
|
||||
await box.write(BoxName.hmac, hmac);
|
||||
}
|
||||
|
||||
var userData = loginData['data'];
|
||||
await storage.write(key: 'name', value: userData['first_name']);
|
||||
await storage.write(key: 'driverID', value: userData['id'].toString());
|
||||
await storage.write(key: 'password', value: pass);
|
||||
await box.write(BoxName.employeename, userData['first_name']);
|
||||
await box.write(BoxName.password, pass);
|
||||
if (userData['country'] != null) {
|
||||
await box.write(BoxName.countryCode, userData['country']);
|
||||
}
|
||||
|
||||
Get.offAll(() => Main());
|
||||
}
|
||||
|
||||
@override
|
||||
void onInit() async {
|
||||
if (box.read(BoxName.countryCode) == null) {
|
||||
await box.write(BoxName.countryCode, 'Jordan');
|
||||
}
|
||||
selectedCountry.value = box.read(BoxName.countryCode) ?? 'Jordan';
|
||||
await EncryptionHelper.initialize();
|
||||
await DeviceHelper.getDeviceFingerprint();
|
||||
|
||||
// If stored JWT is still valid, skip login and go straight to Main
|
||||
String? storedJwt = await storage.read(key: BoxName.jwt);
|
||||
if (storedJwt != null && CRUD.isJwtValid(r(storedJwt))) {
|
||||
String? storedPass = await storage.read(key: 'password');
|
||||
if (storedPass != null) {
|
||||
await box.write(BoxName.password, storedPass);
|
||||
}
|
||||
Get.offAll(() => Main());
|
||||
return;
|
||||
}
|
||||
|
||||
// Auto login if credentials exist
|
||||
String? storedPassword = await storage.read(key: 'password');
|
||||
if (storedPassword != null) {
|
||||
login();
|
||||
}
|
||||
|
||||
super.onInit();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user