25-5-30/1
This commit is contained in:
Hamza-Ayed
@@ -32,7 +32,7 @@ class RegisterController extends GetxController {
|
||||
TextEditingController phoneController = TextEditingController();
|
||||
TextEditingController passwordController = TextEditingController();
|
||||
TextEditingController siteController = TextEditingController();
|
||||
TextEditingController verfyCode = TextEditingController();
|
||||
// TextEditingController verfyCode = TextEditingController();
|
||||
TextEditingController verifyCode = TextEditingController();
|
||||
int remainingTime = 300; // 5 minutes in seconds
|
||||
bool isSent = false;
|
||||
@@ -125,9 +125,6 @@ class RegisterController extends GetxController {
|
||||
// Initialize SmsEgyptController
|
||||
smsEgyptController = Get.put(SmsEgyptController());
|
||||
|
||||
// Generate a random OTP
|
||||
int randomNumber = Random().nextInt(100000) + 1;
|
||||
|
||||
isLoading = true;
|
||||
update();
|
||||
|
||||
@@ -143,8 +140,7 @@ class RegisterController extends GetxController {
|
||||
var responseChecker = await CRUD().post(
|
||||
link: AppLink.checkPhoneNumberISVerfiedPassenger,
|
||||
payload: {
|
||||
'phone_number':
|
||||
EncryptionHelper.instance.encryptData(phoneNumber),
|
||||
'phone_number': (phoneNumber),
|
||||
'email': box.read(BoxName.email),
|
||||
},
|
||||
);
|
||||
@@ -157,20 +153,16 @@ class RegisterController extends GetxController {
|
||||
Get.snackbar('Phone number is verified before'.tr, '',
|
||||
backgroundColor: AppColor.greenColor);
|
||||
box.write(BoxName.isVerified, '1');
|
||||
box.write(BoxName.phone,
|
||||
EncryptionHelper.instance.encryptData(phoneNumber));
|
||||
box.write(BoxName.phone, (phoneNumber));
|
||||
Get.offAll(const MapPagePassenger());
|
||||
} else {
|
||||
await sendOtp(phoneNumber, randomNumber, isEgyptianNumber,
|
||||
smsEgyptController);
|
||||
await sendOtp(phoneNumber, isEgyptianNumber, smsEgyptController);
|
||||
}
|
||||
} else {
|
||||
await sendOtp(phoneNumber, randomNumber, isEgyptianNumber,
|
||||
smsEgyptController);
|
||||
await sendOtp(phoneNumber, isEgyptianNumber, smsEgyptController);
|
||||
}
|
||||
} else if (phoneNumber.length > 9) {
|
||||
sendOtp(
|
||||
phoneNumber, randomNumber, isEgyptianNumber, smsEgyptController);
|
||||
sendOtp(phoneNumber, isEgyptianNumber, smsEgyptController);
|
||||
}
|
||||
} else {
|
||||
MyDialog().getDialog(
|
||||
@@ -189,44 +181,38 @@ class RegisterController extends GetxController {
|
||||
}
|
||||
|
||||
// Helper function to send OTP or WhatsApp message based on phone number location
|
||||
Future<void> sendOtp(String phoneNumber, int otp, bool isEgyptian,
|
||||
Future<void> sendOtp(String phoneNumber, bool isEgyptian,
|
||||
SmsEgyptController controller) async {
|
||||
// Trim any leading or trailing whitespace from the phone number
|
||||
phoneNumber = phoneNumber.trim();
|
||||
var dd = await CRUD().post(link: AppLink.sendVerifyOtpMessage, payload: {
|
||||
'phone_number': EncryptionHelper.instance.encryptData(phoneNumber),
|
||||
'token': EncryptionHelper.instance.encryptData(otp.toString()),
|
||||
'phone_number': (phoneNumber),
|
||||
});
|
||||
Log.print('dd: ${dd}');
|
||||
|
||||
// Common Registration Logic (extracted for reuse)
|
||||
Future<void> registerUser() async {
|
||||
await CRUD().post(link: AppLink.updatePhoneInvalidSMSPassenger, payload: {
|
||||
"phone_number": EncryptionHelper.instance
|
||||
.encryptData(Get.find<RegisterController>().phoneController.text)
|
||||
"phone_number": (Get.find<RegisterController>().phoneController.text)
|
||||
});
|
||||
|
||||
box.write(BoxName.phone,
|
||||
EncryptionHelper.instance.encryptData(phoneController.text));
|
||||
box.write(BoxName.phone, (phoneController.text));
|
||||
|
||||
var nameParts = EncryptionHelper.instance
|
||||
.decryptData(box.read(BoxName.name))
|
||||
.toString()
|
||||
.split(' ');
|
||||
var nameParts = (box.read(BoxName.name)).toString().split(' ');
|
||||
var firstName = nameParts.isNotEmpty ? nameParts[0] : 'unknown';
|
||||
var lastName = nameParts.length > 1 ? nameParts[1] : 'unknown';
|
||||
|
||||
var payload = {
|
||||
'id': box.read(BoxName.passengerID),
|
||||
'phone': EncryptionHelper.instance.encryptData(phoneController.text),
|
||||
'phone': (phoneController.text),
|
||||
'email': box.read(BoxName.email),
|
||||
'password': EncryptionHelper.instance.encryptData(
|
||||
'unknown'), //Consider if you *really* want to store 'unknown' passwords
|
||||
'gender': EncryptionHelper.instance.encryptData('unknown'),
|
||||
'birthdate': EncryptionHelper.instance.encryptData('2002-01-01'),
|
||||
'password':
|
||||
('unknown'), //Consider if you *really* want to store 'unknown' passwords
|
||||
'gender': ('unknown'),
|
||||
'birthdate': ('2002-01-01'),
|
||||
'site': box.read(BoxName.passengerPhotoUrl) ?? 'unknown',
|
||||
'first_name': EncryptionHelper.instance.encryptData(firstName),
|
||||
'last_name': EncryptionHelper.instance.encryptData(lastName),
|
||||
'first_name': (firstName),
|
||||
'last_name': (lastName),
|
||||
};
|
||||
|
||||
var res1 = await CRUD().post(
|
||||
@@ -253,8 +239,7 @@ class RegisterController extends GetxController {
|
||||
box.write(BoxName.isVerified, '1');
|
||||
box.write(
|
||||
BoxName.isFirstTime, '0'); //Double-check the logic for isFirstTime
|
||||
box.write(BoxName.phone,
|
||||
EncryptionHelper.instance.encryptData(phoneController.text));
|
||||
box.write(BoxName.phone, (phoneController.text));
|
||||
|
||||
Get.put(LoginController()).loginUsingCredentials(
|
||||
box.read(BoxName.passengerID).toString(),
|
||||
@@ -264,7 +249,8 @@ class RegisterController extends GetxController {
|
||||
}
|
||||
|
||||
if (isEgyptian) {
|
||||
await registerUser(); // Use the common registration logic
|
||||
// verifySMSCode();
|
||||
// await registerUser(); // Use the common registration logic
|
||||
// await controller.sendSmsEgypt(phoneNumber, otp.toString()); // Optional: Send SMS if Egyptian
|
||||
} else if (phoneController.text.toString().length >= 10) {
|
||||
await registerUser(); // Use the common registration logic for non-Egyptian users as well.
|
||||
@@ -283,24 +269,19 @@ class RegisterController extends GetxController {
|
||||
try {
|
||||
if (formKey3.currentState!.validate()) {
|
||||
var res = await CRUD().post(link: AppLink.verifyOtpPassenger, payload: {
|
||||
'phone_number': "201023248456",
|
||||
'token': ("74787"),
|
||||
'phone_number': phoneController.text,
|
||||
'token': verifyCode.text,
|
||||
});
|
||||
|
||||
if (res != 'failure') {
|
||||
box.write(BoxName.phone,
|
||||
EncryptionHelper.instance.encryptData(phoneController.text));
|
||||
var nameParts = EncryptionHelper.instance
|
||||
.decryptData(box.read(BoxName.name))
|
||||
.toString()
|
||||
.split(' ');
|
||||
box.write(BoxName.phone, (phoneController.text));
|
||||
var nameParts = (box.read(BoxName.name)).toString().split(' ');
|
||||
var firstName = nameParts.isNotEmpty ? nameParts[0] : 'unknown';
|
||||
var lastName = nameParts.length > 1 ? nameParts[1] : 'unknown';
|
||||
|
||||
var payload = {
|
||||
'id': box.read(BoxName.passengerID),
|
||||
'phone':
|
||||
EncryptionHelper.instance.decryptData(phoneController.text),
|
||||
'phone': (phoneController.text),
|
||||
'email': box.read(BoxName.email),
|
||||
'password': 'unknown',
|
||||
'gender': 'unknown',
|
||||
@@ -332,8 +313,7 @@ class RegisterController extends GetxController {
|
||||
|
||||
box.write(BoxName.isVerified, '1');
|
||||
box.write(BoxName.isFirstTime, '0');
|
||||
box.write(BoxName.phone,
|
||||
EncryptionHelper.instance.decryptData(phoneController.text));
|
||||
box.write(BoxName.phone, (phoneController.text));
|
||||
|
||||
Get.put(LoginController()).loginUsingCredentials(
|
||||
box.read(BoxName.passengerID).toString(),
|
||||
@@ -362,7 +342,7 @@ class RegisterController extends GetxController {
|
||||
sendVerifications() async {
|
||||
var res = await CRUD().post(link: AppLink.verifyEmail, payload: {
|
||||
'email': emailController.text,
|
||||
'token': verfyCode.text,
|
||||
'token': verifyCode.text,
|
||||
});
|
||||
var dec = jsonDecode(res);
|
||||
if (dec['status'] == 'success') {
|
||||
|
||||
Reference in New Issue
Block a user