7/5/1

lib/controller/auth/login_controller.dart

@@ -1,16 +1,15 @@
 import 'dart:convert';
-import 'dart:math';
 
+import 'package:SEFER/constant/info.dart';
 import 'package:SEFER/controller/firebase/firbase_messge.dart';
+import 'package:SEFER/views/auth/login_page.dart';
 import 'package:SEFER/views/auth/sms_verfy_page.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:SEFER/constant/box_name.dart';
 import 'package:SEFER/constant/links.dart';
 import 'package:SEFER/controller/functions/crud.dart';
-import 'package:SEFER/controller/functions/secure_storage.dart';
 import 'package:SEFER/main.dart';
-import 'package:SEFER/views/auth/verify_email_page.dart';
 import 'package:SEFER/views/home/map_page_passenger.dart';
 import 'package:location/location.dart';
 
@@ -24,12 +23,30 @@ class LoginController extends GetxController {
   TextEditingController adminNameController = TextEditingController();
   bool isAgreeTerms = false;
   bool isloading = false;
-
+  late int isTest = 1;
   void changeAgreeTerm() {
     isAgreeTerms = !isAgreeTerms;
     update();
   }
 
+  getAppTester(String appPlatform) async {
+    var res = await CRUD()
+        .get(link: AppLink.getTesterApp, payload: {'appPlatform': appPlatform});
+    if (res != 'failure') {
+      var d = jsonDecode(res);
+
+      isTest = d['message'][0]['isTest'];
+      update();
+    } else {
+      return false;
+    }
+  }
+
+  updateAppTester(String appPlatform) async {
+    await CRUD().post(
+        link: AppLink.updateTesterApp, payload: {'appPlatform': appPlatform});
+  }
+
   void saveAgreementTerms() {
     box.write(BoxName.agreeTerms, 'agreed');
     update();
@@ -49,7 +66,6 @@ class LoginController extends GetxController {
       'id': passengerID,
     });
     if (res == 'Failure') {
-      //Failure
       Get.offAll(SmsSignupEgypt());
       isloading = false;
       update();
@@ -142,57 +158,41 @@ class LoginController extends GetxController {
   void login() async {
     isloading = true;
     update();
-    var res = await CRUD().get(link: AppLink.login, payload: {
-      'email': emailController.text,
-      'phone': phoneController.text,
-      'password': passwordController.text
-    });
+    var res = await CRUD().get(
+        link: AppLink.loginFromGooglePassenger,
+        payload: {
+          'email': emailController.text,
+          'id': passwordController.text
+        });
+
     isloading = false;
     update();
     if (res == 'Failure') {
-      Get.snackbar('Failure', '', backgroundColor: Colors.red);
+      //Failure
+      Get.offAll(() => LoginPage());
+      isloading = false;
+      update();
+      // Get.snackbar("User does not exist.".tr, '', backgroundColor: Colors.red);
     } else {
       var jsonDecoeded = jsonDecode(res);
       if (jsonDecoeded.isNotEmpty) {
-        if (jsonDecoeded['status'] == 'success') {
-          if (jsonDecoeded['data'][0]['verified'] == 1) {
-            box.write(BoxName.passengerID, jsonDecoeded['data'][0]['id']);
-            box.write(BoxName.email, jsonDecoeded['data'][0]['email']);
-            box.write(
-                BoxName.name,
-                jsonDecoeded['data'][0]['first_name'] +
-                    ' ' +
-                    jsonDecoeded['data'][0]['last_name']);
-            box.write(BoxName.phone, jsonDecoeded['data'][0]['phone']);
-            SecureStorage().saveData(BoxName.password, passwordController.text);
-            Get.offAll(() => const MapPagePassenger());
-            isloading = false;
-            update();
+        if (jsonDecoeded['status'] == 'success' &&
+            jsonDecoeded['data'][0]['verified'] == 1) {
+          //
+          box.write(BoxName.isVerified, '1');
+          box.write(BoxName.email, jsonDecoeded['data'][0]['email']);
+          box.write(BoxName.phone, jsonDecoeded['data'][0]['phone']);
+          box.write(BoxName.passengerID, passwordController.text);
+          // var token = await CRUD().get(link: AppLink.getTokens, payload: {
+          //   'passengerID': box.read(BoxName.passengerID).toString()
+          // });
+          await updateAppTester(AppInformation.appName);
 
-            await CRUD().post(link: AppLink.addTokens, payload: {
-              'token': box.read(BoxName.tokenFCM),
-              'passengerID': box.read(BoxName.passengerID).toString()
-            });
-          } else {
-            isloading = false;
-            update();
-            Get.defaultDialog(
-              title: 'You must Verify email !.'.tr,
-              middleText: '',
-              backgroundColor: Colors.yellow[300],
-              onConfirm: () async {
-                int randomNumber = Random().nextInt(100000) + 1;
-                await CRUD().post(link: AppLink.sendVerifyEmail, payload: {
-                  'email': emailController.text,
-                  'token': randomNumber.toString(),
-                });
-                Get.to(() => const VerifyEmailPage());
-              },
-            );
-          }
-        } else if (jsonDecoeded['status'] == 'Failure') {
-          Get.snackbar(jsonDecoeded['status'], jsonDecoeded['data'],
-              backgroundColor: Colors.redAccent);
+          Get.offAll(() => const MapPagePassenger());
+        } else {
+          // Get.offAll(() => SmsSignupEgypt());
+          // Get.snackbar(jsonDecoeded['status'], jsonDecoeded['data'],
+          //     backgroundColor: Colors.redAccent);
           isloading = false;
           update();
         }
@@ -245,7 +245,11 @@ class LoginController extends GetxController {
   @override
   void onInit() async {
     // permissionLocation = await Permission.locationWhenInUse.isGranted;
-
+    await getAppTester(AppInformation.appName);
+    if (isTest == 0 && box.read(BoxName.passengerID) != null) {
+      await loginUsingCredentials(
+          box.read(BoxName.passengerID), box.read(BoxName.email));
+    }
     super.onInit();
   }
 }

lib/controller/auth/register_controller.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:math';
 
+import 'package:SEFER/constant/colors.dart';
 import 'package:SEFER/views/home/map_page_passenger.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
@@ -88,18 +89,33 @@ class RegisterController extends GetxController {
     update();
     if (formKey3.currentState!.validate()) {
       if (box.read(BoxName.countryCode) == 'Egypt') {
-        await CRUD().post(link: AppLink.sendVerifyOtpMessage, payload: {
+        var responseCheker = await CRUD()
+            .post(link: AppLink.checkPhoneNumberISVerfiedPassenger, payload: {
           'phone_number': '+2${phoneController.text}',
-          'token': randomNumber.toString(),
         });
+        if (responseCheker != 'failure') {
+          var d = jsonDecode(responseCheker);
+          if (d['message'][0]['verified'] == 1) {
+            Get.snackbar('Phone number is verified before'.tr, '',
+                backgroundColor: AppColor.greenColor);
+            box.write(BoxName.isVerified, '1');
+            box.write(BoxName.phone, '+2${phoneController.text}');
+            Get.offAll(const MapPagePassenger());
+          }
+        } else {
+          await CRUD().post(link: AppLink.sendVerifyOtpMessage, payload: {
+            'phone_number': '+2${phoneController.text}',
+            'token': randomNumber.toString(),
+          });
 
-        await smsEgyptController.sendSmsEgypt(
-            phoneController.text.toString(), randomNumber.toString());
-        isSent = true;
-        remainingTime = 300; // Reset to 5 minutes
-        startTimer();
-        isLoading = false;
-        update();
+          await smsEgyptController.sendSmsEgypt(
+              phoneController.text.toString(), randomNumber.toString());
+          isSent = true;
+          remainingTime = 300; // Reset to 5 minutes
+          startTimer();
+          isLoading = false;
+          update();
+        }
       }
     }
   }
@@ -129,7 +145,7 @@ class RegisterController extends GetxController {
           link: AppLink.signUp,
           payload: payload,
         );
-        if (jsonDecode(res1)['status'] == 'success') {
+        if (res1 != 'failure') {
           box.write(BoxName.isVerified, '1');
           box.write(BoxName.phone, '+2${phoneController.text}');
           Get.offAll(const MapPagePassenger());