diff --git a/lib/interceptor/http_interceptor.dart b/lib/interceptor/http_interceptor.dart index 997a8c47..1ad980c7 100644 --- a/lib/interceptor/http_interceptor.dart +++ b/lib/interceptor/http_interceptor.dart @@ -1,14 +1,39 @@ +import 'package:doctor_app_flutter/providers/auth_provider.dart'; +import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:http_interceptor/http_interceptor.dart'; +DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); +List publicUrls = [LOGIN_URL,SELECT_DEVICE_IMEI,]; + class HttpInterceptor extends InterceptorContract { Future interceptRequest({RequestData data}) async { // print('RequestData ${data.body}'); try { - // data.params['appid'] = OPEN_WEATHER_API_KEY; - // data.params['units'] = 'metric'; data.headers["Content-Type"] = "application/json"; data.headers["Accept"] = "application/json"; + if (!publicUrls.contains(data.url)) { + var loggedUserInfo = await sharedPref.getObj('loggedUser'); + print('loggedUserInfo$loggedUserInfo'); + // the sevices handel the token in differat name so I ask to be change + // we must change the implementaion once the name are changed + if(data.body['LogInTokenID']){ + data.body['LogInTokenID'] = loggedUserInfo['LogInTokenID']; + } + if(data.body['TokenID']){ + data.body['TokenID'] = loggedUserInfo['LogInTokenID']; + } + + print('data.body${data.body}'); + } + else { + if(data.body['LogInTokenID']){ + data.body['LogInTokenID'] = ''; + } + if(data.body['TokenID']){ + data.body['TokenID'] = ''; + } + } } catch (e) { print(e); } @@ -19,5 +44,5 @@ class HttpInterceptor extends InterceptorContract { Future interceptResponse({ResponseData data}) async { // print('ResponseData ${data.body}'); return data; - } -} \ No newline at end of file + } +} diff --git a/lib/screens/auth/login_screen.dart b/lib/screens/auth/login_screen.dart index 22bf76fd..ce0ce6ff 100644 --- a/lib/screens/auth/login_screen.dart +++ b/lib/screens/auth/login_screen.dart @@ -1,14 +1,14 @@ import 'dart:async'; -import 'package:doctor_app_flutter/lookups/auth_lookup.dart'; -import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; -import 'package:doctor_app_flutter/widgets/auth/known_user_login.dart'; -import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart'; import 'package:flutter/material.dart'; import 'package:shared_preferences/shared_preferences.dart'; +import '../../lookups/auth_lookup.dart'; +import '../../util/dr_app_shared_pref.dart'; import '../../widgets/auth/auth_header.dart'; +import '../../widgets/auth/known_user_login.dart'; import '../../widgets/auth/login_form.dart'; +import '../../widgets/shared/dr_app_circular_progress_Indeicator.dart'; DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); class Loginsreen extends StatefulWidget { diff --git a/lib/util/dr_app_shared_pref.dart b/lib/util/dr_app_shared_pref.dart index b8a330bd..f75c171e 100644 --- a/lib/util/dr_app_shared_pref.dart +++ b/lib/util/dr_app_shared_pref.dart @@ -80,6 +80,6 @@ class DrAppSharedPreferances { if (string == null ){ return null; } - return json.decode(prefs.getString(key)); + return json.decode(string); } } diff --git a/lib/widgets/auth/known_user_login.dart b/lib/widgets/auth/known_user_login.dart index 9e7f26de..b39b9c1b 100644 --- a/lib/widgets/auth/known_user_login.dart +++ b/lib/widgets/auth/known_user_login.dart @@ -6,7 +6,6 @@ import 'package:local_auth/local_auth.dart'; import 'package:provider/provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import '../../config/config.dart'; import '../../config/size_config.dart'; import '../../providers/auth_provider.dart'; import '../../routes.dart';