9/1/1

2024-09-01 17:45:48 +03:00
parent 63cdd871a8
commit 9022941e18
10 changed files with 383 additions and 92 deletions
--- a/lib/constant/links.dart
+++ b/lib/constant/links.dart
@@ -1,15 +1,14 @@
 import '../env/env.dart';
-import '../main.dart';
-import 'box_name.dart';

 class AppLink {
-  // static final String seferPaymentServer = Env.seferPaymentServer;
-  static final String seferPaymentServer = '${Env.seferCairoServer}/ride';
+  static final String seferPaymentServer0 = Env.seferPaymentServer;
+  static final String seferPaymentServer = '${Env.seferPaymentServer}/ride';
  static final String seferAlexandriaServer = Env.seferAlexandriaServer;
  static final String seferCairoServer = Env.seferCairoServer;
-  static final String seferGizaServer = Env.seferGizaServer;
-  static final String endPoint = box.read(BoxName.serverChosen);
+  // static final String seferGizaServer = Env.seferGizaServer;
+  // static final String endPoint = box.read(BoxName.serverChosen);
  static final String server = Env.seferCairoServer;
+  // static const String server = 'https://api.sefer.live/sefer';

  static String googleMapsLink = 'https://maps.googleapis.com/maps/api/';
  static String llama = 'https://api.llama-api.com/chat/completions';
@@ -28,13 +27,14 @@ class AppLink {

  //=======================Wallet===================
  static String addPaymentTokenDriver =
-      "$ride/driverWallet/addPaymentToken.php";
-  static String addSeferWallet = "$ride/seferWallet/add.php";
-  static String getSeferWallet = "$ride/seferWallet/get.php";
-  static String addDrivePayment = "$ride/payment/add.php";
-  static String updatePaymetToPaid = "$ride/payment/updatePaymetToPaid.php";
-  static String wallet = '$server/ride/passengerWallet';
-  static String walletDriver = '$server/ride/driverWallet';
+      "$seferPaymentServer/driverWallet/addPaymentToken.php";
+  static String addSeferWallet = "$seferPaymentServer/seferWallet/add.php";
+  static String getSeferWallet = "$seferPaymentServer/seferWallet/get.php";
+  static String addDrivePayment = "$seferPaymentServer/payment/add.php";
+  static String updatePaymetToPaid =
+      "$seferPaymentServer/payment/updatePaymetToPaid.php";
+  static String wallet = '$seferPaymentServer/passengerWallet';
+  static String walletDriver = '$seferPaymentServer/driverWallet';
  static String getAllPassengerTransaction =
      "$wallet/getAllPassengerTransaction.php";
  static String getWalletByPassenger = "$wallet/getWalletByPassenger.php";
@@ -84,13 +84,17 @@ class AppLink {
  static String addKazanPercent = "$ride/kazan/add.php";

 ////-----------------DriverPayment------------------
-  static String addDriverpayment = "$ride/payment/add.php";
-  static String addDriverPaymentPoints = "$ride/driverPayment/add.php";
-  static String getDriverPaymentPoints = "$ride/driverWallet/get.php";
-  static String getDriverpaymentToday = "$ride/payment/get.php";
-  static String getCountRide = "$ride/payment/getCountRide.php";
-  static String getAllPaymentFromRide = "$ride/payment/getAllPayment.php";
-  static String getAllPaymentVisa = "$ride/payment/getAllPaymentVisa.php";
+  static String addDriverpayment = "$seferPaymentServer/payment/add.php";
+  static String addDriverPaymentPoints =
+      "$seferPaymentServer/driverPayment/add.php";
+  static String getDriverPaymentPoints =
+      "$seferPaymentServer/driverWallet/get.php";
+  static String getDriverpaymentToday = "$seferPaymentServer/payment/get.php";
+  static String getCountRide = "$seferPaymentServer/payment/getCountRide.php";
+  static String getAllPaymentFromRide =
+      "$seferPaymentServer/payment/getAllPayment.php";
+  static String getAllPaymentVisa =
+      "$seferPaymentServer/payment/getAllPaymentVisa.php";

 //-----------------Passenger NotificationCaptain------------------
  static String addNotificationPassenger =
@@ -223,6 +227,7 @@ class AppLink {
  static String getPassengerbyEmail = "$server/Admin/getPassengerbyEmail.php";
  static String addAdminUser = "$server/Admin/adminUser/add.php";
  static String getdashbord = "$server/Admin/dashbord.php";
+  static String getdashbordPayment = "$server/Admin/dashbordPayment.php";
  static String getAdminUser = "$server/Admin/adminUser/get.php";
  static String getCaptainDetailsByEmailOrIDOrPhone =
      "$server/Admin/AdminCaptain/getCaptainDetailsByEmailOrIDOrPhone.php";
--- a/lib/controller/admin/dashboard_controller.dart
+++ b/lib/controller/admin/dashboard_controller.dart
@@ -5,11 +5,12 @@ import 'package:sefer_admin1/constant/links.dart';
 import 'package:sefer_admin1/controller/functions/crud.dart';

 import '../../constant/api_key.dart';
+import '../../print.dart';

 class DashboardController extends GetxController {
  bool isLoading = false;
  List dashbord = [];
-  int creditSMS = 0;
+  String creditSMS = '0';

  Future getDashBoard() async {
    isLoading = true;
@@ -17,16 +18,20 @@ class DashboardController extends GetxController {
    var res = await CRUD().get(link: AppLink.getdashbord, payload: {});
    if (res != 'failure') {
      var d = jsonDecode(res);
+      Log.print('d: ${d}');
      dashbord = d['message'];
      isLoading = false;
      update();
    }
+
    var res2 = await CRUD().kazumiSMS(
      link: 'https://sms.kazumi.me/api/sms/check-credit',
      payload: {"username": "Sefer", "password": AK.smsPasswordEgypt},
    );

    creditSMS = res2['credit'];
+    Log.print(' res2[credit]: ${res2['credit']}');
+    Log.print('creditSMS: ${creditSMS}');

    update();
  }
--- a/lib/controller/firebase/firbase_messge.dart
+++ b/lib/controller/firebase/firbase_messge.dart
@@ -14,6 +14,7 @@ import '../../main.dart';
 import '../../views/widgets/elevated_btn.dart';
 import '../notification_controller.dart';
 import 'local_notification.dart';
+import 'token_access.dart';

 class FirebaseMessagesController extends GetxController {
  final fcmToken = FirebaseMessaging.instance;
@@ -359,25 +360,49 @@ class FirebaseMessagesController extends GetxController {
  void sendNotificationAll(String title, body) async {
    // Get the token you want to subtract.
    String token = box.read(BoxName.tokenFCM);
-    tokens = box.read(BoxName.tokensDrivers);
+    tokens = box.read(BoxName.tokens);
    // Subtract the token from the list of tokens.
    tokens.remove(token);

    // Save the list of tokens back to the box.
    // box.write(BoxName.tokens, tokens);
-    // tokens = box.read(BoxName.tokens);
+    tokens = box.read(BoxName.tokens);
    for (var i = 0; i < tokens.length; i++) {
-      http
-          .post(Uri.parse('https://fcm.googleapis.com/fcm/send'),
+      String serviceAccountKeyJson = '''{
+  "type": "service_account",
+  "project_id": "ride-b1bd8",
+  "private_key_id": "75e817c0b902db2ef35edf2c2bd159dec1f13249",
+  "private_key": "-----BEGIN PRIVATE KEY-----\\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQD0zH9TQGDQHUv3\\na3/JAD1UKPwAp3wNKT0a6fxiIzjI3JxQWI30QvZCcfl6CdMhIcydX1ncSaYTcEeC\\n/AdPVCPkqyJx1YIGGg6P/mRzCWeaN8fsp6z250m5vcObDCZc3dbJEkepbep+6FPY\\n21m3KO+AHh1glgsTGZOTm5xiU8NGXpdk2QEh8wpiIIlR/HuKwVw9g8urNe3Sno+U\\nDm3z37iFqvZdmpqO8aWTJu6beb3hsREK9XK2I9JqC2JUwiGQRo3idOvPP6hkqrWx\\nKSX96vglQFYfakvJdDp2ZATOlpBYPMtS/IWhJ985u58TSS+Kl8qpnpaZBSxgJirf\\nhWzhnKLfAgMBAAECggEAJP785SePGhS7ZN6ltspm+l+hSjYFrPWFCxq+rlQ1YkHZ\\nC9l+RqKSFhOkiPmQI2s4wbXl3kFxLHHlFNoi/q2wKQBmGb8TQfnRJpjjNHGA61Ev\\n0Ue7/6qPvVb9B2MsLw/FxKiTFPuMG3bgKR9pbSFuJLYoaW7zqITOhVnYphGTqwAY\\nBVVcvISSLvELDmH9VZcv/9DVqVlqbbESHWh1Z4W6XGPoEqeDH/upNTyQQ/46Msgm\\nTGE6VqLHpWuSf6SqHp+r0Y0lI3vIPM1vz5FAJDJbOE/enHa0fSup0OHSMxl0HVMn\\nnO1yrGF3vsIPOej5HKr5d71bEIckzk73/yjNC1/mDQKBgQD7RtUvc9omsSsFMJ6e\\nBASAn6Dktx/QY/XNJjFzHQj69cywLDe5t5AL2gUi3phQ2oqB5XJdwnd5bTIEPEPZ\\nDOuOai2802p6FJk6kjmZAMVGx5JtXBH+vs6jrmQQSMiKbjwN1TT6xIWakvLOonUi\\nX6ZvjYYjU/E0YJU3jSiXWEr76wKBgQD5Zn4SouJ6BCDZMbausJVMBkk3qxsYooip\\np89WakC6e7AZinpkRcqjGGV9GOvc8crJs6fyXAA9ORepGP47Mc0ZrDssOkstznsM\\npr8R0S6MKwEZaT9ixOHdOcLZ47ps+JzA2Wr4KN2OvFHksUkB/46ATD1j9WZVgB8M\\namsYp/Y73QKBgHOo+PvsoZ9psVmkNX6abtAdqdtdB0HOoRea2uwXk0ig12TIFaZg\\nfedWpUKVnxqoXVTJHklV99RmlL0qWDiSH+LfsMnXro0e6iDxqZ1po2Se/CFmXcoa\\nXdctsFVmixhdATuExewfhTfPKABA+xWlXWC/jdy5CK+JPWXijaqMM4edAoGAE5Bj\\nsWiPpYyvWvpYX0nA3G7dzX0hqgQN/mkIjbnWDArp3IcNZNJIvBSM2Yxb7EAXbU0n\\njo6DAkp5Pa2VO+WDNlFZbvW/sf8xjeOCt44WPa6d7nVgIIpbQXRngZoopKW3/jTP\\n/FmQT8McFXmGxZ5belsAsdetSGW9icbLUerTGQ0CgYEAmf/G8Ag3XxmqTXvvHuv2\\n14OP7WnrVqkEMnydrftEwn4peXd/Lz+/GYX5Zc4ZoNgbN8IvZ5z0+OmRsallsbiW\\nBw0/tc68CjzxXOvReWxDluUopqWVGj5tlGqE5xUDku9SWJSxbkiQ3rqutzBdPXpr\\noqHwPyDrmK/Zgqn+uiIm4Ck=\\n-----END PRIVATE KEY-----\\n",
+  "client_email": "firebase-adminsdk-o2wqi@ride-b1bd8.iam.gserviceaccount.com",
+  "client_id": "111210077025005706623",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://oauth2.googleapis.com/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-o2wqi%40ride-b1bd8.iam.gserviceaccount.com",
+  "universe_domain": "googleapis.com"
+}
+'''; // As defined above
+
+      // Initialize AccessTokenManager
+      final accessTokenManager = AccessTokenManager(serviceAccountKeyJson);
+
+      // Obtain an OAuth 2.0 access token
+      final accessToken = await accessTokenManager.getAccessToken();
+
+      // Send the notification
+      final response = await http
+          .post(
+              Uri.parse(
+                  'https://fcm.googleapis.com/v1/projects/ride-b1bd8/messages:send'),
              headers: <String, String>{
                'Content-Type': 'application/json',
-                'Authorization': 'key=${AK.serverAPI}'
+                'Authorization': 'Bearer $accessToken',
              },
              body: jsonEncode({
                'notification': <String, dynamic>{
                  'title': title,
                  'body': body,
-                  'sound': 'start.wav'
+                  'sound': 'ding.wav'
                },
                'priority': 'high',
                'data': <String, dynamic>{
@@ -418,21 +443,44 @@ class FirebaseMessagesController extends GetxController {
  //     });
  //   }
  // }
-
+//android/app/src/main/res/raw/iphone_ringtone.wav
  void sendNotificationToPassengerToken(
-      String title, body, token, List<String> map) async {
+      String title, body, token, List<String> map, String tone) async {
    try {
+      String serviceAccountKeyJson = '''{
+  "type": "service_account",
+  "project_id": "ride-b1bd8",
+  "private_key_id": "75e817c0b902db2ef35edf2c2bd159dec1f13249",
+  "private_key": "-----BEGIN PRIVATE KEY-----\\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQD0zH9TQGDQHUv3\\na3/JAD1UKPwAp3wNKT0a6fxiIzjI3JxQWI30QvZCcfl6CdMhIcydX1ncSaYTcEeC\\n/AdPVCPkqyJx1YIGGg6P/mRzCWeaN8fsp6z250m5vcObDCZc3dbJEkepbep+6FPY\\n21m3KO+AHh1glgsTGZOTm5xiU8NGXpdk2QEh8wpiIIlR/HuKwVw9g8urNe3Sno+U\\nDm3z37iFqvZdmpqO8aWTJu6beb3hsREK9XK2I9JqC2JUwiGQRo3idOvPP6hkqrWx\\nKSX96vglQFYfakvJdDp2ZATOlpBYPMtS/IWhJ985u58TSS+Kl8qpnpaZBSxgJirf\\nhWzhnKLfAgMBAAECggEAJP785SePGhS7ZN6ltspm+l+hSjYFrPWFCxq+rlQ1YkHZ\\nC9l+RqKSFhOkiPmQI2s4wbXl3kFxLHHlFNoi/q2wKQBmGb8TQfnRJpjjNHGA61Ev\\n0Ue7/6qPvVb9B2MsLw/FxKiTFPuMG3bgKR9pbSFuJLYoaW7zqITOhVnYphGTqwAY\\nBVVcvISSLvELDmH9VZcv/9DVqVlqbbESHWh1Z4W6XGPoEqeDH/upNTyQQ/46Msgm\\nTGE6VqLHpWuSf6SqHp+r0Y0lI3vIPM1vz5FAJDJbOE/enHa0fSup0OHSMxl0HVMn\\nnO1yrGF3vsIPOej5HKr5d71bEIckzk73/yjNC1/mDQKBgQD7RtUvc9omsSsFMJ6e\\nBASAn6Dktx/QY/XNJjFzHQj69cywLDe5t5AL2gUi3phQ2oqB5XJdwnd5bTIEPEPZ\\nDOuOai2802p6FJk6kjmZAMVGx5JtXBH+vs6jrmQQSMiKbjwN1TT6xIWakvLOonUi\\nX6ZvjYYjU/E0YJU3jSiXWEr76wKBgQD5Zn4SouJ6BCDZMbausJVMBkk3qxsYooip\\np89WakC6e7AZinpkRcqjGGV9GOvc8crJs6fyXAA9ORepGP47Mc0ZrDssOkstznsM\\npr8R0S6MKwEZaT9ixOHdOcLZ47ps+JzA2Wr4KN2OvFHksUkB/46ATD1j9WZVgB8M\\namsYp/Y73QKBgHOo+PvsoZ9psVmkNX6abtAdqdtdB0HOoRea2uwXk0ig12TIFaZg\\nfedWpUKVnxqoXVTJHklV99RmlL0qWDiSH+LfsMnXro0e6iDxqZ1po2Se/CFmXcoa\\nXdctsFVmixhdATuExewfhTfPKABA+xWlXWC/jdy5CK+JPWXijaqMM4edAoGAE5Bj\\nsWiPpYyvWvpYX0nA3G7dzX0hqgQN/mkIjbnWDArp3IcNZNJIvBSM2Yxb7EAXbU0n\\njo6DAkp5Pa2VO+WDNlFZbvW/sf8xjeOCt44WPa6d7nVgIIpbQXRngZoopKW3/jTP\\n/FmQT8McFXmGxZ5belsAsdetSGW9icbLUerTGQ0CgYEAmf/G8Ag3XxmqTXvvHuv2\\n14OP7WnrVqkEMnydrftEwn4peXd/Lz+/GYX5Zc4ZoNgbN8IvZ5z0+OmRsallsbiW\\nBw0/tc68CjzxXOvReWxDluUopqWVGj5tlGqE5xUDku9SWJSxbkiQ3rqutzBdPXpr\\noqHwPyDrmK/Zgqn+uiIm4Ck=\\n-----END PRIVATE KEY-----\\n",
+  "client_email": "firebase-adminsdk-o2wqi@ride-b1bd8.iam.gserviceaccount.com",
+  "client_id": "111210077025005706623",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://oauth2.googleapis.com/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-o2wqi%40ride-b1bd8.iam.gserviceaccount.com",
+  "universe_domain": "googleapis.com"
+}
+'''; // As defined above
+
+      // Initialize AccessTokenManager
+      final accessTokenManager = AccessTokenManager(serviceAccountKeyJson);
+
+      // Obtain an OAuth 2.0 access token
+      final accessToken = await accessTokenManager.getAccessToken();
+
+      // Send the notification
      final response = await http.post(
-        Uri.parse('https://fcm.googleapis.com/fcm/send'),
+        Uri.parse(
+            'https://fcm.googleapis.com/v1/projects/ride-b1bd8/messages:send'),
        headers: <String, String>{
          'Content-Type': 'application/json',
-          'Authorization': 'key=${AK.serverAPI}'
+          'Authorization': 'Bearer $accessToken',
        },
        body: jsonEncode({
          'notification': <String, dynamic>{
            'title': title,
            'body': body,
-            'sound': 'tone2.wav'
+            'sound': tone
          },
          'data': {
            'passengerList': map,
@@ -453,85 +501,253 @@ class FirebaseMessagesController extends GetxController {
    }
  }

-  void sendNotificationToAnyWithoutData(
-      String title, String body, String token) async {
+  void sendNotificationToPassengerTokenCALL(
+      String title, body, token, List<String> map) async {
    try {
+      String serviceAccountKeyJson = '''{
+  "type": "service_account",
+  "project_id": "ride-b1bd8",
+  "private_key_id": "75e817c0b902db2ef35edf2c2bd159dec1f13249",
+  "private_key": "-----BEGIN PRIVATE KEY-----\\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQD0zH9TQGDQHUv3\\na3/JAD1UKPwAp3wNKT0a6fxiIzjI3JxQWI30QvZCcfl6CdMhIcydX1ncSaYTcEeC\\n/AdPVCPkqyJx1YIGGg6P/mRzCWeaN8fsp6z250m5vcObDCZc3dbJEkepbep+6FPY\\n21m3KO+AHh1glgsTGZOTm5xiU8NGXpdk2QEh8wpiIIlR/HuKwVw9g8urNe3Sno+U\\nDm3z37iFqvZdmpqO8aWTJu6beb3hsREK9XK2I9JqC2JUwiGQRo3idOvPP6hkqrWx\\nKSX96vglQFYfakvJdDp2ZATOlpBYPMtS/IWhJ985u58TSS+Kl8qpnpaZBSxgJirf\\nhWzhnKLfAgMBAAECggEAJP785SePGhS7ZN6ltspm+l+hSjYFrPWFCxq+rlQ1YkHZ\\nC9l+RqKSFhOkiPmQI2s4wbXl3kFxLHHlFNoi/q2wKQBmGb8TQfnRJpjjNHGA61Ev\\n0Ue7/6qPvVb9B2MsLw/FxKiTFPuMG3bgKR9pbSFuJLYoaW7zqITOhVnYphGTqwAY\\nBVVcvISSLvELDmH9VZcv/9DVqVlqbbESHWh1Z4W6XGPoEqeDH/upNTyQQ/46Msgm\\nTGE6VqLHpWuSf6SqHp+r0Y0lI3vIPM1vz5FAJDJbOE/enHa0fSup0OHSMxl0HVMn\\nnO1yrGF3vsIPOej5HKr5d71bEIckzk73/yjNC1/mDQKBgQD7RtUvc9omsSsFMJ6e\\nBASAn6Dktx/QY/XNJjFzHQj69cywLDe5t5AL2gUi3phQ2oqB5XJdwnd5bTIEPEPZ\\nDOuOai2802p6FJk6kjmZAMVGx5JtXBH+vs6jrmQQSMiKbjwN1TT6xIWakvLOonUi\\nX6ZvjYYjU/E0YJU3jSiXWEr76wKBgQD5Zn4SouJ6BCDZMbausJVMBkk3qxsYooip\\np89WakC6e7AZinpkRcqjGGV9GOvc8crJs6fyXAA9ORepGP47Mc0ZrDssOkstznsM\\npr8R0S6MKwEZaT9ixOHdOcLZ47ps+JzA2Wr4KN2OvFHksUkB/46ATD1j9WZVgB8M\\namsYp/Y73QKBgHOo+PvsoZ9psVmkNX6abtAdqdtdB0HOoRea2uwXk0ig12TIFaZg\\nfedWpUKVnxqoXVTJHklV99RmlL0qWDiSH+LfsMnXro0e6iDxqZ1po2Se/CFmXcoa\\nXdctsFVmixhdATuExewfhTfPKABA+xWlXWC/jdy5CK+JPWXijaqMM4edAoGAE5Bj\\nsWiPpYyvWvpYX0nA3G7dzX0hqgQN/mkIjbnWDArp3IcNZNJIvBSM2Yxb7EAXbU0n\\njo6DAkp5Pa2VO+WDNlFZbvW/sf8xjeOCt44WPa6d7nVgIIpbQXRngZoopKW3/jTP\\n/FmQT8McFXmGxZ5belsAsdetSGW9icbLUerTGQ0CgYEAmf/G8Ag3XxmqTXvvHuv2\\n14OP7WnrVqkEMnydrftEwn4peXd/Lz+/GYX5Zc4ZoNgbN8IvZ5z0+OmRsallsbiW\\nBw0/tc68CjzxXOvReWxDluUopqWVGj5tlGqE5xUDku9SWJSxbkiQ3rqutzBdPXpr\\noqHwPyDrmK/Zgqn+uiIm4Ck=\\n-----END PRIVATE KEY-----\\n",
+  "client_email": "firebase-adminsdk-o2wqi@ride-b1bd8.iam.gserviceaccount.com",
+  "client_id": "111210077025005706623",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://oauth2.googleapis.com/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-o2wqi%40ride-b1bd8.iam.gserviceaccount.com",
+  "universe_domain": "googleapis.com"
+}
+'''; // As defined above
+
+      // Initialize AccessTokenManager
+      final accessTokenManager = AccessTokenManager(serviceAccountKeyJson);
+
+      // Obtain an OAuth 2.0 access token
+      final accessToken = await accessTokenManager.getAccessToken();
+
+      // Send the notification
      final response = await http.post(
-        Uri.parse('https://fcm.googleapis.com/fcm/send'),
+        Uri.parse(
+            'https://fcm.googleapis.com/v1/projects/ride-b1bd8/messages:send'),
        headers: <String, String>{
          'Content-Type': 'application/json',
-          'Authorization': 'key=${AK.serverAPI}'
+          'Authorization': 'Bearer $accessToken',
        },
        body: jsonEncode({
-          'notification': <String, dynamic>{
-            'title': title,
-            'body': body,
-            'sound': 'notify.wav'
+          'message': {
+            'token': token,
+            'notification': {
+              'title': title,
+              'body': body,
+            },
+            'data': {
+              'passengerList': jsonEncode(map),
+            },
+            'android': {
+              'notification': {
+                'sound': 'iphone_ringtone.wav',
+              },
+            },
+            'apns': {
+              'payload': {
+                'aps': {
+                  'sound': 'iphone_ringtone.wav',
+                },
+              },
+            },
          },
-          'data': <String, dynamic>{
-            'click_action': 'FLUTTER_NOTIFICATION_CLICK',
-            'id': '1',
-            'status': 'done'
-          },
-          'priority': 'high',
-          'to': token,
        }),
      );

      if (response.statusCode == 200) {
-        // Notification sent successfully
+        print(
+            'Notification sent successfully. Status code: ${response.statusCode}');
+        print('Response body: ${response.body}');
      } else {
-        // Handle error response
-        'Failed to send notification. Status code: ${response.statusCode}';
+        print(
+            'Failed to send notification. Status code: ${response.statusCode}');
+        print('Response body: ${response.body}');
      }
    } catch (e) {
-      // Handle other exceptions
+      print('Error sending notification: $e');
    }
  }

-  void sendNotificationToDriverMAP(
-      String title, String body, String token, List<String> data) async {
+  void sendNotificationToAnyWithoutData(
+      String title, String body, String token, String tone) async {
    try {
+      String serviceAccountKeyJson = '''{
+  "type": "service_account",
+  "project_id": "ride-b1bd8",
+  "private_key_id": "75e817c0b902db2ef35edf2c2bd159dec1f13249",
+  "private_key": "-----BEGIN PRIVATE KEY-----\\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQD0zH9TQGDQHUv3\\na3/JAD1UKPwAp3wNKT0a6fxiIzjI3JxQWI30QvZCcfl6CdMhIcydX1ncSaYTcEeC\\n/AdPVCPkqyJx1YIGGg6P/mRzCWeaN8fsp6z250m5vcObDCZc3dbJEkepbep+6FPY\\n21m3KO+AHh1glgsTGZOTm5xiU8NGXpdk2QEh8wpiIIlR/HuKwVw9g8urNe3Sno+U\\nDm3z37iFqvZdmpqO8aWTJu6beb3hsREK9XK2I9JqC2JUwiGQRo3idOvPP6hkqrWx\\nKSX96vglQFYfakvJdDp2ZATOlpBYPMtS/IWhJ985u58TSS+Kl8qpnpaZBSxgJirf\\nhWzhnKLfAgMBAAECggEAJP785SePGhS7ZN6ltspm+l+hSjYFrPWFCxq+rlQ1YkHZ\\nC9l+RqKSFhOkiPmQI2s4wbXl3kFxLHHlFNoi/q2wKQBmGb8TQfnRJpjjNHGA61Ev\\n0Ue7/6qPvVb9B2MsLw/FxKiTFPuMG3bgKR9pbSFuJLYoaW7zqITOhVnYphGTqwAY\\nBVVcvISSLvELDmH9VZcv/9DVqVlqbbESHWh1Z4W6XGPoEqeDH/upNTyQQ/46Msgm\\nTGE6VqLHpWuSf6SqHp+r0Y0lI3vIPM1vz5FAJDJbOE/enHa0fSup0OHSMxl0HVMn\\nnO1yrGF3vsIPOej5HKr5d71bEIckzk73/yjNC1/mDQKBgQD7RtUvc9omsSsFMJ6e\\nBASAn6Dktx/QY/XNJjFzHQj69cywLDe5t5AL2gUi3phQ2oqB5XJdwnd5bTIEPEPZ\\nDOuOai2802p6FJk6kjmZAMVGx5JtXBH+vs6jrmQQSMiKbjwN1TT6xIWakvLOonUi\\nX6ZvjYYjU/E0YJU3jSiXWEr76wKBgQD5Zn4SouJ6BCDZMbausJVMBkk3qxsYooip\\np89WakC6e7AZinpkRcqjGGV9GOvc8crJs6fyXAA9ORepGP47Mc0ZrDssOkstznsM\\npr8R0S6MKwEZaT9ixOHdOcLZ47ps+JzA2Wr4KN2OvFHksUkB/46ATD1j9WZVgB8M\\namsYp/Y73QKBgHOo+PvsoZ9psVmkNX6abtAdqdtdB0HOoRea2uwXk0ig12TIFaZg\\nfedWpUKVnxqoXVTJHklV99RmlL0qWDiSH+LfsMnXro0e6iDxqZ1po2Se/CFmXcoa\\nXdctsFVmixhdATuExewfhTfPKABA+xWlXWC/jdy5CK+JPWXijaqMM4edAoGAE5Bj\\nsWiPpYyvWvpYX0nA3G7dzX0hqgQN/mkIjbnWDArp3IcNZNJIvBSM2Yxb7EAXbU0n\\njo6DAkp5Pa2VO+WDNlFZbvW/sf8xjeOCt44WPa6d7nVgIIpbQXRngZoopKW3/jTP\\n/FmQT8McFXmGxZ5belsAsdetSGW9icbLUerTGQ0CgYEAmf/G8Ag3XxmqTXvvHuv2\\n14OP7WnrVqkEMnydrftEwn4peXd/Lz+/GYX5Zc4ZoNgbN8IvZ5z0+OmRsallsbiW\\nBw0/tc68CjzxXOvReWxDluUopqWVGj5tlGqE5xUDku9SWJSxbkiQ3rqutzBdPXpr\\noqHwPyDrmK/Zgqn+uiIm4Ck=\\n-----END PRIVATE KEY-----\\n",
+  "client_email": "firebase-adminsdk-o2wqi@ride-b1bd8.iam.gserviceaccount.com",
+  "client_id": "111210077025005706623",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://oauth2.googleapis.com/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-o2wqi%40ride-b1bd8.iam.gserviceaccount.com",
+  "universe_domain": "googleapis.com"
+}
+'''; // As defined above
+
+      // Initialize AccessTokenManager
+      final accessTokenManager = AccessTokenManager(serviceAccountKeyJson);
+
+      // Obtain an OAuth 2.0 access token
+      final accessToken = await accessTokenManager.getAccessToken();
+
+      // Send the notification
      final response = await http.post(
-        Uri.parse('https://fcm.googleapis.com/fcm/send'),
+        Uri.parse(
+            'https://fcm.googleapis.com/v1/projects/ride-b1bd8/messages:send'),
        headers: <String, String>{
          'Content-Type': 'application/json',
-          'Authorization': 'key=${AK.serverAPI}'
+          'Authorization': 'Bearer $accessToken',
        },
        body: jsonEncode({
-          'notification': <String, dynamic>{
-            'title': title,
-            'body': body,
-            // 'sound': 'tone2.wav',
-            'sound': 'order.wav'
+          'message': {
+            'token': token,
+            'notification': {
+              'title': title,
+              'body': body,
+            },
+            'data': {
+              'DriverList': jsonEncode([]),
+            },
+            'android': {
+              'notification': {
+                'sound': tone,
+              },
+            },
+            'apns': {
+              'payload': {
+                'aps': {
+                  'sound': tone,
+                },
+              },
+            },
          },
-          'data': {
-            'DriverList': data,
-          },
-          'priority': 'high',
-          'to': token,
        }),
      );

      if (response.statusCode == 200) {
-        // Notification sent successfully
+        print(
+            'Notification sent successfully. Status code: ${response.statusCode}');
+        print('Response body: ${response.body}');
      } else {
-        // Handle error response
-        'Failed to send notification. Status code: ${response.statusCode}';
+        print(
+            'Failed to send notification. Status code: ${response.statusCode}');
+        print('Response body: ${response.body}');
      }
    } catch (e) {
-      // Handle other exceptions
+      print('Error sending notification: $e');
+    }
+  }
+
+  void sendNotificationToDriverMAP(String title, String body, String token,
+      List<String> data, String tone) async {
+    try {
+      String serviceAccountKeyJson = '''{
+  "type": "service_account",
+  "project_id": "ride-b1bd8",
+  "private_key_id": "75e817c0b902db2ef35edf2c2bd159dec1f13249",
+  "private_key": "-----BEGIN PRIVATE KEY-----\\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQD0zH9TQGDQHUv3\\na3/JAD1UKPwAp3wNKT0a6fxiIzjI3JxQWI30QvZCcfl6CdMhIcydX1ncSaYTcEeC\\n/AdPVCPkqyJx1YIGGg6P/mRzCWeaN8fsp6z250m5vcObDCZc3dbJEkepbep+6FPY\\n21m3KO+AHh1glgsTGZOTm5xiU8NGXpdk2QEh8wpiIIlR/HuKwVw9g8urNe3Sno+U\\nDm3z37iFqvZdmpqO8aWTJu6beb3hsREK9XK2I9JqC2JUwiGQRo3idOvPP6hkqrWx\\nKSX96vglQFYfakvJdDp2ZATOlpBYPMtS/IWhJ985u58TSS+Kl8qpnpaZBSxgJirf\\nhWzhnKLfAgMBAAECggEAJP785SePGhS7ZN6ltspm+l+hSjYFrPWFCxq+rlQ1YkHZ\\nC9l+RqKSFhOkiPmQI2s4wbXl3kFxLHHlFNoi/q2wKQBmGb8TQfnRJpjjNHGA61Ev\\n0Ue7/6qPvVb9B2MsLw/FxKiTFPuMG3bgKR9pbSFuJLYoaW7zqITOhVnYphGTqwAY\\nBVVcvISSLvELDmH9VZcv/9DVqVlqbbESHWh1Z4W6XGPoEqeDH/upNTyQQ/46Msgm\\nTGE6VqLHpWuSf6SqHp+r0Y0lI3vIPM1vz5FAJDJbOE/enHa0fSup0OHSMxl0HVMn\\nnO1yrGF3vsIPOej5HKr5d71bEIckzk73/yjNC1/mDQKBgQD7RtUvc9omsSsFMJ6e\\nBASAn6Dktx/QY/XNJjFzHQj69cywLDe5t5AL2gUi3phQ2oqB5XJdwnd5bTIEPEPZ\\nDOuOai2802p6FJk6kjmZAMVGx5JtXBH+vs6jrmQQSMiKbjwN1TT6xIWakvLOonUi\\nX6ZvjYYjU/E0YJU3jSiXWEr76wKBgQD5Zn4SouJ6BCDZMbausJVMBkk3qxsYooip\\np89WakC6e7AZinpkRcqjGGV9GOvc8crJs6fyXAA9ORepGP47Mc0ZrDssOkstznsM\\npr8R0S6MKwEZaT9ixOHdOcLZ47ps+JzA2Wr4KN2OvFHksUkB/46ATD1j9WZVgB8M\\namsYp/Y73QKBgHOo+PvsoZ9psVmkNX6abtAdqdtdB0HOoRea2uwXk0ig12TIFaZg\\nfedWpUKVnxqoXVTJHklV99RmlL0qWDiSH+LfsMnXro0e6iDxqZ1po2Se/CFmXcoa\\nXdctsFVmixhdATuExewfhTfPKABA+xWlXWC/jdy5CK+JPWXijaqMM4edAoGAE5Bj\\nsWiPpYyvWvpYX0nA3G7dzX0hqgQN/mkIjbnWDArp3IcNZNJIvBSM2Yxb7EAXbU0n\\njo6DAkp5Pa2VO+WDNlFZbvW/sf8xjeOCt44WPa6d7nVgIIpbQXRngZoopKW3/jTP\\n/FmQT8McFXmGxZ5belsAsdetSGW9icbLUerTGQ0CgYEAmf/G8Ag3XxmqTXvvHuv2\\n14OP7WnrVqkEMnydrftEwn4peXd/Lz+/GYX5Zc4ZoNgbN8IvZ5z0+OmRsallsbiW\\nBw0/tc68CjzxXOvReWxDluUopqWVGj5tlGqE5xUDku9SWJSxbkiQ3rqutzBdPXpr\\noqHwPyDrmK/Zgqn+uiIm4Ck=\\n-----END PRIVATE KEY-----\\n",
+  "client_email": "firebase-adminsdk-o2wqi@ride-b1bd8.iam.gserviceaccount.com",
+  "client_id": "111210077025005706623",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://oauth2.googleapis.com/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-o2wqi%40ride-b1bd8.iam.gserviceaccount.com",
+  "universe_domain": "googleapis.com"
+}
+'''; // As defined above
+
+      // Initialize AccessTokenManager
+      final accessTokenManager = AccessTokenManager(serviceAccountKeyJson);
+
+      // Obtain an OAuth 2.0 access token
+      final accessToken = await accessTokenManager.getAccessToken();
+
+      // Send the notification
+      final response = await http.post(
+        Uri.parse(
+            'https://fcm.googleapis.com/v1/projects/ride-b1bd8/messages:send'),
+        headers: <String, String>{
+          'Content-Type': 'application/json',
+          'Authorization': 'Bearer $accessToken',
+        },
+        body: jsonEncode({
+          'message': {
+            'token': token,
+            'notification': {
+              'title': title,
+              'body': body,
+            },
+            'data': {
+              'DriverList': jsonEncode(data),
+            },
+            'android': {
+              'notification': {
+                'sound': tone,
+              },
+            },
+            'apns': {
+              'payload': {
+                'aps': {
+                  'sound': tone,
+                },
+              },
+            },
+          },
+        }),
+      );
+
+      if (response.statusCode == 200) {
+        print(
+            'Notification sent successfully. Status code: ${response.statusCode}');
+        print('Response body: ${response.body}');
+      } else {
+        print(
+            'Failed to send notification. Status code: ${response.statusCode}');
+        print('Response body: ${response.body}');
+      }
+    } catch (e) {
+      print('Error sending notification: $e');
    }
  }

  void sendNotificationToDriverMapPolyline(String title, String body,
      String token, List<String> data, String polylineJson) async {
    try {
+      String serviceAccountKeyJson = '''{
+  "type": "service_account",
+  "project_id": "ride-b1bd8",
+  "private_key_id": "75e817c0b902db2ef35edf2c2bd159dec1f13249",
+  "private_key": "-----BEGIN PRIVATE KEY-----\\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQD0zH9TQGDQHUv3\\na3/JAD1UKPwAp3wNKT0a6fxiIzjI3JxQWI30QvZCcfl6CdMhIcydX1ncSaYTcEeC\\n/AdPVCPkqyJx1YIGGg6P/mRzCWeaN8fsp6z250m5vcObDCZc3dbJEkepbep+6FPY\\n21m3KO+AHh1glgsTGZOTm5xiU8NGXpdk2QEh8wpiIIlR/HuKwVw9g8urNe3Sno+U\\nDm3z37iFqvZdmpqO8aWTJu6beb3hsREK9XK2I9JqC2JUwiGQRo3idOvPP6hkqrWx\\nKSX96vglQFYfakvJdDp2ZATOlpBYPMtS/IWhJ985u58TSS+Kl8qpnpaZBSxgJirf\\nhWzhnKLfAgMBAAECggEAJP785SePGhS7ZN6ltspm+l+hSjYFrPWFCxq+rlQ1YkHZ\\nC9l+RqKSFhOkiPmQI2s4wbXl3kFxLHHlFNoi/q2wKQBmGb8TQfnRJpjjNHGA61Ev\\n0Ue7/6qPvVb9B2MsLw/FxKiTFPuMG3bgKR9pbSFuJLYoaW7zqITOhVnYphGTqwAY\\nBVVcvISSLvELDmH9VZcv/9DVqVlqbbESHWh1Z4W6XGPoEqeDH/upNTyQQ/46Msgm\\nTGE6VqLHpWuSf6SqHp+r0Y0lI3vIPM1vz5FAJDJbOE/enHa0fSup0OHSMxl0HVMn\\nnO1yrGF3vsIPOej5HKr5d71bEIckzk73/yjNC1/mDQKBgQD7RtUvc9omsSsFMJ6e\\nBASAn6Dktx/QY/XNJjFzHQj69cywLDe5t5AL2gUi3phQ2oqB5XJdwnd5bTIEPEPZ\\nDOuOai2802p6FJk6kjmZAMVGx5JtXBH+vs6jrmQQSMiKbjwN1TT6xIWakvLOonUi\\nX6ZvjYYjU/E0YJU3jSiXWEr76wKBgQD5Zn4SouJ6BCDZMbausJVMBkk3qxsYooip\\np89WakC6e7AZinpkRcqjGGV9GOvc8crJs6fyXAA9ORepGP47Mc0ZrDssOkstznsM\\npr8R0S6MKwEZaT9ixOHdOcLZ47ps+JzA2Wr4KN2OvFHksUkB/46ATD1j9WZVgB8M\\namsYp/Y73QKBgHOo+PvsoZ9psVmkNX6abtAdqdtdB0HOoRea2uwXk0ig12TIFaZg\\nfedWpUKVnxqoXVTJHklV99RmlL0qWDiSH+LfsMnXro0e6iDxqZ1po2Se/CFmXcoa\\nXdctsFVmixhdATuExewfhTfPKABA+xWlXWC/jdy5CK+JPWXijaqMM4edAoGAE5Bj\\nsWiPpYyvWvpYX0nA3G7dzX0hqgQN/mkIjbnWDArp3IcNZNJIvBSM2Yxb7EAXbU0n\\njo6DAkp5Pa2VO+WDNlFZbvW/sf8xjeOCt44WPa6d7nVgIIpbQXRngZoopKW3/jTP\\n/FmQT8McFXmGxZ5belsAsdetSGW9icbLUerTGQ0CgYEAmf/G8Ag3XxmqTXvvHuv2\\n14OP7WnrVqkEMnydrftEwn4peXd/Lz+/GYX5Zc4ZoNgbN8IvZ5z0+OmRsallsbiW\\nBw0/tc68CjzxXOvReWxDluUopqWVGj5tlGqE5xUDku9SWJSxbkiQ3rqutzBdPXpr\\noqHwPyDrmK/Zgqn+uiIm4Ck=\\n-----END PRIVATE KEY-----\\n",
+  "client_email": "firebase-adminsdk-o2wqi@ride-b1bd8.iam.gserviceaccount.com",
+  "client_id": "111210077025005706623",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://oauth2.googleapis.com/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-o2wqi%40ride-b1bd8.iam.gserviceaccount.com",
+  "universe_domain": "googleapis.com"
+}
+'''; // As defined above
+
+      // Initialize AccessTokenManager
+      final accessTokenManager = AccessTokenManager(serviceAccountKeyJson);
+
+      // Obtain an OAuth 2.0 access token
+      final accessToken = await accessTokenManager.getAccessToken();
+
+      // Send the notification
      final response = await http.post(
-        Uri.parse('https://fcm.googleapis.com/fcm/send'),
+        Uri.parse(
+            'https://fcm.googleapis.com/v1/projects/ride-b1bd8/messages:send'),
        headers: <String, String>{
          'Content-Type': 'application/json',
-          'Authorization': 'key=${AK.serverAPI}'
+          'Authorization': 'Bearer $accessToken',
        },
        body: jsonEncode({
          'notification': <String, dynamic>{
--- a/lib/controller/firebase/token_access.dart
+++ b/lib/controller/firebase/token_access.dart
@@ -0,0 +1,53 @@
+import 'dart:convert';
+import 'package:googleapis_auth/auth_io.dart';
+
+import '../../print.dart';
+
+class AccessTokenManager {
+  static final AccessTokenManager _instance = AccessTokenManager._internal();
+  late final String serviceAccountJsonKey;
+  AccessToken? _accessToken;
+  DateTime? _expiryDate;
+
+  AccessTokenManager._internal();
+
+  factory AccessTokenManager(String jsonKey) {
+    if (_instance._isServiceAccountKeyInitialized()) {
+      // Prevent re-initialization
+      return _instance;
+    }
+    _instance.serviceAccountJsonKey = jsonKey;
+    return _instance;
+  }
+
+  bool _isServiceAccountKeyInitialized() {
+    try {
+      serviceAccountJsonKey; // Access to check if initialized
+      return true;
+    } catch (e) {
+      return false;
+    }
+  }
+
+  Future<String> getAccessToken() async {
+    if (_accessToken != null && DateTime.now().isBefore(_expiryDate!)) {
+      return _accessToken!.data;
+    }
+    try {
+      final serviceAccountCredentials = ServiceAccountCredentials.fromJson(
+          json.decode(serviceAccountJsonKey));
+      final client = await clientViaServiceAccount(
+        serviceAccountCredentials,
+        ['https://www.googleapis.com/auth/firebase.messaging'],
+      );
+
+      _accessToken = client.credentials.accessToken;
+      _expiryDate = client.credentials.accessToken.expiry;
+      client.close();
+      Log.print('_accessToken!.data: ${_accessToken!.data}');
+      return _accessToken!.data;
+    } catch (e) {
+      throw Exception('Failed to obtain access token');
+    }
+  }
+}
--- a/lib/controller/functions/crud.dart
+++ b/lib/controller/functions/crud.dart
@@ -27,8 +27,10 @@ class CRUD {
            'Basic ${base64Encode(utf8.encode(AK.basicAuthCredentials.toString()))}',
      },
    );
+    Log.print('response: ${response.request}');
    // if (response.statusCode == 200) {
    var jsonData = jsonDecode(response.body);
+
    if (jsonData['status'] == 'success') {
      return response.body;
    }
@@ -296,6 +298,7 @@ class CRUD {
    if (response.statusCode == 200) {
      var responseBody = await response.stream.bytesToString();
      var data = json.decode(responseBody);
+      Log.print('data: ${data}');
      return data;
    } else {}
  }
--- a/lib/controller/notification_controller.dart
+++ b/lib/controller/notification_controller.dart
@@ -104,7 +104,7 @@ class NotificationController extends GetxController {
              for (var i = 0; i < tokensPassengers.length; i++) {
                if (formKey.currentState!.validate()) {
                  FirebaseMessagesController().sendNotificationToAnyWithoutData(
-                      title.text, body.text, tokensPassengers[i]);
+                      title.text, body.text, tokensPassengers[i], 'order.wav');
                }
              }
            }),
--- a/lib/views/admin/captain/captain_details.dart
+++ b/lib/views/admin/captain/captain_details.dart
@@ -143,10 +143,10 @@ class CaptainsDetailsPage extends StatelessWidget {
                              if (key.currentState!.validate()) {
                                FirebaseMessagesController()
                                    .sendNotificationToAnyWithoutData(
-                                  titleNotify.text,
-                                  bodyNotify.text,
-                                  data['passengerToken'],
-                                );
+                                        titleNotify.text,
+                                        bodyNotify.text,
+                                        data['passengerToken'],
+                                        'order.wav');
                                Get.back();
                              }
                            }));
--- a/lib/views/admin/passenger/passenger_details_page.dart
+++ b/lib/views/admin/passenger/passenger_details_page.dart
@@ -143,10 +143,10 @@ class PassengerDetailsPage extends StatelessWidget {
                              if (key.currentState!.validate()) {
                                FirebaseMessagesController()
                                    .sendNotificationToAnyWithoutData(
-                                  titleNotify.text,
-                                  bodyNotify.text,
-                                  data['passengerToken'],
-                                );
+                                        titleNotify.text,
+                                        bodyNotify.text,
+                                        data['passengerToken'],
+                                        'order.wav');
                                Get.back();
                              }
                            }));
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -476,10 +476,10 @@ packages:
    dependency: "direct main"
    description:
      name: google_fonts
-      sha256: "6b6f10f0ce3c42f6552d1c70d2c28d764cf22bb487f50f66cca31dcd5194f4d6"
+      sha256: "2776c66b3e97c6cdd58d1bd3281548b074b64f1fd5c8f82391f7456e38849567"
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.4"
+    version: "4.0.5"
  google_identity_services_web:
    dependency: transitive
    description:
@@ -528,6 +528,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "0.12.4+1"
+  googleapis_auth:
+    dependency: "direct main"
+    description:
+      name: googleapis_auth
+      sha256: befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.6.0"
  graphs:
    dependency: transitive
    description:
@@ -540,10 +548,10 @@ packages:
    dependency: "direct main"
    description:
      name: http
-      sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2"
+      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
      url: "https://pub.dev"
    source: hosted
-    version: "0.13.6"
+    version: "1.2.2"
  http_multi_server:
    dependency: transitive
    description:
@@ -572,26 +580,26 @@ packages:
    dependency: "direct main"
    description:
      name: image_cropper
-      sha256: "542c3453109d16bcc388e43ae2276044d2cd6a6d20c68bdcff2c94ab9363ea15"
+      sha256: fe37d9a129411486e0d93089b61bd326d05b89e78ad4981de54b560725bf5bd5
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.1"
+    version: "8.0.2"
  image_cropper_for_web:
    dependency: transitive
    description:
      name: image_cropper_for_web
-      sha256: "89c936aa772a35b69ca67b78049ae9fa163a4fb8da2f6dee3893db8883fb49d2"
+      sha256: "34256c8fb7fcb233251787c876bb37271744459b593a948a2db73caa323034d0"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.0"
+    version: "6.0.2"
  image_cropper_platform_interface:
    dependency: transitive
    description:
      name: image_cropper_platform_interface
-      sha256: b232175c132b2f7ede3e1f101652bcd635cb4079a77c6dded8e6d32e6578d685
+      sha256: e8e9d2ca36360387aee39295ce49029362ae4df3071f23e8e71f2b81e40b7531
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.0"
+    version: "7.0.0"
  image_picker:
    dependency: "direct main"
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -49,9 +49,9 @@ dependencies:
  google_fonts: ^4.0.4
  # google_maps_flutter: ^2.6.1
  google_sign_in: ^6.2.1
-  http: ^0.13.6
+  http: ^1.0.0
  # image: ^4.1.7
-  image_cropper: ^4.0.1
+  image_cropper: ^8.0.2
  image_picker: ^1.1.1
  intl: ^0.19.0
  local_auth: ^2.2.0
@@ -60,6 +60,7 @@ dependencies:
  sqflite: ^2.3.3+1
  url_launcher: ^6.2.6
  # webview_flutter: ^4.7.0
+  googleapis_auth: ^1.6.0

 dev_dependencies:
  flutter_test: