11/20/2
This commit is contained in:
@@ -4,20 +4,20 @@ import 'package:firebase_messaging/firebase_messaging.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:http/http.dart' as http;
|
||||
import 'package:ride/constant/colors.dart';
|
||||
import 'package:ride/constant/style.dart';
|
||||
import 'package:ride/controller/functions/crud.dart';
|
||||
import 'package:ride/controller/functions/launch.dart';
|
||||
import 'package:ride/controller/home/captin/map_driver_controller.dart';
|
||||
import 'package:ride/controller/home/map_passenger_controller.dart';
|
||||
import 'package:ride/views/home/profile/promos_passenger_page.dart';
|
||||
import 'package:ride/views/widgets/elevated_btn.dart';
|
||||
|
||||
import '../../constant/box_name.dart';
|
||||
import '../../constant/credential.dart';
|
||||
import '../../constant/colors.dart';
|
||||
import '../../constant/links.dart';
|
||||
import '../../constant/style.dart';
|
||||
import '../../env/env.dart';
|
||||
import '../../main.dart';
|
||||
import '../../views/home/profile/promos_passenger_page.dart';
|
||||
import '../../views/orderCaptin/order_request_page.dart';
|
||||
import '../../views/widgets/elevated_btn.dart';
|
||||
import '../functions/crud.dart';
|
||||
import '../functions/launch.dart';
|
||||
import '../home/captin/map_driver_controller.dart';
|
||||
import '../home/map_passenger_controller.dart';
|
||||
|
||||
class FirebaseMessagesController extends GetxController {
|
||||
final fcmToken = FirebaseMessaging.instance;
|
||||
@@ -406,7 +406,7 @@ class FirebaseMessagesController extends GetxController {
|
||||
.post(Uri.parse('https://fcm.googleapis.com/fcm/send'),
|
||||
headers: <String, String>{
|
||||
'Content-Type': 'application/json',
|
||||
'Authorization': 'key=${storage.read(key: BoxName.serverAPI)}'
|
||||
'Authorization': 'key=${Env.serverAPI}'
|
||||
},
|
||||
body: jsonEncode({
|
||||
'notification': <String, dynamic>{
|
||||
@@ -464,7 +464,7 @@ class FirebaseMessagesController extends GetxController {
|
||||
Uri.parse('https://fcm.googleapis.com/fcm/send'),
|
||||
headers: <String, String>{
|
||||
'Content-Type': 'application/json',
|
||||
'Authorization': 'key=${storage.read(key: BoxName.serverAPI)}'
|
||||
'Authorization': 'key=${Env.serverAPI}'
|
||||
},
|
||||
body: jsonEncode({
|
||||
'notification': <String, dynamic>{
|
||||
@@ -501,7 +501,7 @@ class FirebaseMessagesController extends GetxController {
|
||||
Uri.parse('https://fcm.googleapis.com/fcm/send'),
|
||||
headers: <String, String>{
|
||||
'Content-Type': 'application/json',
|
||||
'Authorization': 'key=${storage.read(key: BoxName.serverAPI)}'
|
||||
'Authorization': 'key=${Env.serverAPI}'
|
||||
},
|
||||
body: jsonEncode({
|
||||
'notification': <String, dynamic>{
|
||||
@@ -540,7 +540,7 @@ class FirebaseMessagesController extends GetxController {
|
||||
Uri.parse('https://fcm.googleapis.com/fcm/send'),
|
||||
headers: <String, String>{
|
||||
'Content-Type': 'application/json',
|
||||
'Authorization': 'key=${storage.read(key: BoxName.serverAPI)}'
|
||||
'Authorization': 'key=${Env.serverAPI}'
|
||||
},
|
||||
body: jsonEncode({
|
||||
'notification': <String, dynamic>{
|
||||
|
||||
@@ -3,7 +3,9 @@ import 'package:get/get.dart';
|
||||
import 'package:http/http.dart' as http;
|
||||
|
||||
import '../../constant/box_name.dart';
|
||||
import '../../constant/char_map.dart';
|
||||
import '../../constant/credential.dart';
|
||||
import '../../env/env.dart';
|
||||
import '../../main.dart';
|
||||
|
||||
class CRUD {
|
||||
@@ -22,7 +24,8 @@ class CRUD {
|
||||
headers: {
|
||||
"Content-Type": "application/x-www-form-urlencoded",
|
||||
'Authorization':
|
||||
'Basic ${base64Encode(utf8.encode(basicAuthCredentials.toString()))}',
|
||||
'Basic ${base64Encode(utf8.encode(AC().r(Env.basicAuthCredentials, charMap)))}',
|
||||
// 'Basic ${base64Encode(utf8.encode(basicAuthCredentials.toString()))}',
|
||||
},
|
||||
);
|
||||
print("--------------" + response.request.toString());
|
||||
@@ -52,7 +55,7 @@ class CRUD {
|
||||
body: payload,
|
||||
headers: {
|
||||
"Content-Type": "application/x-www-form-urlencoded",
|
||||
'Authorization': 'Bearer ${secretKey.toString()}',
|
||||
'Authorization': 'Bearer ${AC().r(Env.secretKey, charMap)}',
|
||||
},
|
||||
);
|
||||
|
||||
@@ -74,7 +77,7 @@ class CRUD {
|
||||
headers: {
|
||||
"Content-Type": "application/x-www-form-urlencoded",
|
||||
'Authorization':
|
||||
'Basic ${base64Encode(utf8.encode(basicAuthCredentials.toString()))}',
|
||||
'Basic ${base64Encode(utf8.encode(AC().r(Env.basicAuthCredentials, charMap)))}',
|
||||
},
|
||||
);
|
||||
print(response.request);
|
||||
@@ -109,7 +112,7 @@ class CRUD {
|
||||
headers: {
|
||||
"Content-Type": "application/x-www-form-urlencoded",
|
||||
'Authorization':
|
||||
'Basic ${base64Encode(utf8.encode(basicAuthCredentials.toString()))}',
|
||||
'Basic ${base64Encode(utf8.encode(AC().r(Env.basicAuthCredentials, charMap)))}',
|
||||
},
|
||||
);
|
||||
print(response.request);
|
||||
@@ -166,7 +169,7 @@ class CRUD {
|
||||
body: json.encode(data),
|
||||
headers: {
|
||||
'Authorization':
|
||||
'Basic ${base64Encode(utf8.encode(basicAuthCredentials.toString()))}',
|
||||
'Basic ${base64Encode(utf8.encode(AC().r(Env.basicAuthCredentials, charMap)))}',
|
||||
},
|
||||
);
|
||||
return json.decode(response.body);
|
||||
@@ -183,7 +186,7 @@ class CRUD {
|
||||
url,
|
||||
headers: {
|
||||
'Authorization':
|
||||
'Basic ${base64Encode(utf8.encode(basicAuthCredentials.toString()))}',
|
||||
'Basic ${base64Encode(utf8.encode(AC().r(Env.basicAuthCredentials, charMap)))}',
|
||||
},
|
||||
);
|
||||
return json.decode(response.body);
|
||||
|
||||
Reference in New Issue
Block a user