diff --git a/lib/controllers/api_routes/api_manager.dart b/lib/controllers/api_routes/api_manager.dart index 41728339..ece2395a 100644 --- a/lib/controllers/api_routes/api_manager.dart +++ b/lib/controllers/api_routes/api_manager.dart @@ -5,20 +5,30 @@ import 'package:flutter/cupertino.dart'; import 'package:fluttertoast/fluttertoast.dart'; import 'package:http/http.dart' as http; import 'package:http/http.dart'; +import 'package:test_sa/models/user.dart'; class ApiManager { ApiManager._(); - final Map _headers = {'Content-Type': 'application/json',}; + Map get _headers => { + 'Content-Type': 'application/json', + if(user != null) 'Authorization': 'Bearer ${user.token}', + }; static ApiManager instance = ApiManager._(); + User user; + Future get( String url, {Map headers,} ) async{ + headers ??= {}; + + headers.addAll(_headers); + Uri _url = Uri.parse(url); // print(_url); http.Response response = await http.get(_url,headers: headers); diff --git a/lib/controllers/providers/api/user_provider.dart b/lib/controllers/providers/api/user_provider.dart index 565408d5..8adcd357 100644 --- a/lib/controllers/providers/api/user_provider.dart +++ b/lib/controllers/providers/api/user_provider.dart @@ -11,6 +11,7 @@ class UserProvider extends ChangeNotifier{ //reset provider data void reset(){ _user = null; + ApiManager.instance.user = user; _loading = false; } @@ -20,6 +21,7 @@ class UserProvider extends ChangeNotifier{ User get user => _user; set user(User user) { _user = user; + ApiManager.instance.user = user; notifyListeners(); } diff --git a/lib/views/pages/user/land_page.dart b/lib/views/pages/user/land_page.dart index e5b612e9..6982b955 100644 --- a/lib/views/pages/user/land_page.dart +++ b/lib/views/pages/user/land_page.dart @@ -238,6 +238,7 @@ class _LandPageState extends State { _regularVisitsProvider.reset(); _preventiveMaintenanceVisitsProvider.reset(); _settingProvider.resetSettings(); + _userProvider.reset(); Navigator.of(context).pop(); } },