Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'hussam' into 'development'

Browse Source 
LogIn function refactoring

See merge request Cloud_Solution/doctor_app_flutter!152
merge-requests/153/head
Elham 4 years ago
parent ba98afcde3 d3bb85129c
commit 2fe33bd57d
8 changed files with 78 additions and 45 deletions
Show Stats Download Patch File Download Diff File

1
lib/config/shared_pref_kay.dart
Unescape Escape View File

@ -7,3 +7,4 @@ final SLECTED_PATIENT_TYPE = 'slectedPatientType';
final APP_Language = 'language';
final DOCTOR_PROFILE = 'doctorProfile';
final LIVE_CARE_PATIENT = 'livecare-patient-profile';
final LOGGED_IN_USER = 'loggedUser';

2
lib/interceptor/http_interceptor.dart
Unescape Escape View File

@ -30,7 +30,7 @@ class HttpInterceptor extends InterceptorContract {
data.headers["Content-Type"] = "application/json";
data.headers["Accept"] = "application/json";
// if (publicUrls.contains(data.url)) {
// var loggedUserInfo = await sharedPref.getObj('loggedUser');
// var loggedUserInfo = await sharedPref.getObj(LOGGED_IN_USER);
// var token = await sharedPref.getString(TOKEN);
// // print("token"+token);
// // print('loggedUserInfo${loggedUserInfo["LogInTokenID"]}');

72
lib/models/doctor/user_model.dart
Unescape Escape View File

@ -1,20 +1,60 @@
class UserModel {
String UserID;
String Password;
int ProjectID;
int LanguageID;
String IPAdress;
double VersionID;
int Channel;
String SessionID;
String userID;
String password;
int projectID;
int languageID;
String iPAdress;
double versionID;
int channel;
String sessionID;
String tokenID;
String stamp;
bool isLoginForDoctorApp;
int patientOutSA;
UserModel(
{this.UserID,
this.Password,
this.ProjectID,
this.LanguageID,
this.IPAdress,
this.VersionID,
this.Channel,
this.SessionID});
{this.userID,
this.password,
this.projectID,
this.languageID,
this.iPAdress,
this.versionID,
this.channel,
this.sessionID,
this.tokenID,
this.stamp,
this.isLoginForDoctorApp,
this.patientOutSA});
UserModel.fromJson(Map<String, dynamic> json) {
userID = json['UserID'];
password = json['Password'];
projectID = json['ProjectID'];
languageID = json['LanguageID'];
iPAdress = json['IPAdress'];
versionID = json['VersionID'];
channel = json['Channel'];
sessionID = json['SessionID'];
tokenID = json['TokenID'];
stamp = json['stamp'];
isLoginForDoctorApp = json['IsLoginForDoctorApp'];
patientOutSA = json['PatientOutSA'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['UserID'] = this.userID;
data['Password'] = this.password;
data['ProjectID'] = this.projectID;
data['LanguageID'] = this.languageID;
data['IPAdress'] = this.iPAdress;
data['VersionID'] = this.versionID;
data['Channel'] = this.channel;
data['SessionID'] = this.sessionID;
data['TokenID'] = this.tokenID;
data['stamp'] = this.stamp;
data['IsLoginForDoctorApp'] = this.isLoginForDoctorApp;
data['PatientOutSA'] = this.patientOutSA;
return data;
}
}

12
lib/providers/auth_provider.dart
Unescape Escape View File

@ -4,7 +4,6 @@ import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart';
import 'package:flutter/cupertino.dart';
import 'package:doctor_app_flutter/config/config.dart';
import '../models/doctor/user_model.dart';
DrAppSharedPreferances sharedPref = new DrAppSharedPreferances();
@ -52,16 +51,7 @@ class AuthProvider with ChangeNotifier {
localRes = response;
}, onFailure: (String error, int statusCode) {
throw error;
}, body: {
"UserID": userInfo.UserID,
"Password": userInfo.Password,
"ProjectID": userInfo.ProjectID,
"LanguageID": userInfo.LanguageID,
"IPAdress": userInfo.IPAdress,
"VersionID": userInfo.VersionID,
"Channel": userInfo.Channel,
"SessionID": userInfo.SessionID
});
}, body: userInfo.toJson());
return Future.value(localRes);
} catch (error) {

3
lib/widgets/auth/known_user_login.dart
Unescape Escape View File

@ -1,3 +1,4 @@
import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:hexcolor/hexcolor.dart';
@ -52,7 +53,7 @@ class _KnownUserLoginState extends State<KnownUserLogin> {
};
Future<void> getSharedPref() async {
sharedPref.getObj('loggedUser').then((userInfo) {
sharedPref.getObj(LOGGED_IN_USER).then((userInfo) {
_loggedUser = userInfo;
});
sharedPref.getString('platformImei').then((imei) {

28
lib/widgets/auth/login_form.dart
Unescape Escape View File

@ -42,14 +42,14 @@ class _LoginFormState extends State<LoginForm> {
FocusNode focusProject = FocusNode();
var userInfo = UserModel(
UserID: '',
Password: '',
ProjectID: 15,
LanguageID: 2,
IPAdress: "11.11.11.11",
VersionID: 1.2,
Channel: 9,
SessionID: "i1UJwCTSqt");
userID: '',
password: '',
projectID: 15,
languageID: 2,
iPAdress: "11.11.11.11",
versionID: 1.2,
channel: 9,
sessionID: "i1UJwCTSqt");
AuthProvider authProv;
@override
@ -95,7 +95,7 @@ class _LoginFormState extends State<LoginForm> {
return null;
},
onSaved: (value) {
userInfo.UserID = value.trim();
userInfo.userID = value.trim();
},
onFieldSubmitted: (_) {
focusPass.nextFocus();
@ -118,7 +118,7 @@ class _LoginFormState extends State<LoginForm> {
return null;
},
onSaved: (value) {
userInfo.Password = value;
userInfo.password = value;
},
onFieldSubmitted: (_) {
focusPass.nextFocus();
@ -231,13 +231,13 @@ class _LoginFormState extends State<LoginForm> {
changeLoadingStata(true);
if (loginFormKey.currentState.validate()) {
loginFormKey.currentState.save();
sharedPref.setInt(PROJECT_ID, userInfo.ProjectID);
sharedPref.setInt(PROJECT_ID, userInfo.projectID);
authProv.login(userInfo).then((res) {
changeLoadingStata(false);
if (res['MessageStatus'] == 1) {
// insertDeviceImei(res, authProv);
saveObjToString('loggedUser', res);
saveObjToString(LOGGED_IN_USER, res);
sharedPref.setString(TOKEN, res['LogInTokenID']);
print("token" + res['LogInTokenID']);
@ -278,7 +278,7 @@ class _LoginFormState extends State<LoginForm> {
authProv.insertDeviceImei(imeiInfo).then((res) {
if (res['MessageStatus'] == 1) {
setSharedPref('platformImei', _platformImei);
saveObjToString('loggedUser', preRes);
saveObjToString(LOGGED_IN_USER, preRes);
Navigator.of(context).pushNamed(VERIFICATION_METHODS);
// save imei on shared preferance
} else {
@ -349,7 +349,7 @@ class _LoginFormState extends State<LoginForm> {
onSelectProject(index) {
setState(() {
userInfo.ProjectID = projectsList[index]["ID"];
userInfo.projectID = projectsList[index]["ID"];
projectIdController.text = projectsList[index]['Name'];
});

2
lib/widgets/auth/verfiy_account.dart
Unescape Escape View File

@ -50,7 +50,7 @@ class _VerifyAccountState extends State<VerifyAccount> {
}
Future<void> getSharedPref() async {
sharedPref.getObj('loggedUser').then((userInfo) {
sharedPref.getObj(LOGGED_IN_USER).then((userInfo) {
_loggedUser = userInfo;
});
}

3
lib/widgets/auth/verification_methods.dart
Unescape Escape View File

@ -1,5 +1,6 @@
import 'dart:io' show Platform;
import 'package:doctor_app_flutter/config/shared_pref_kay.dart';
import 'package:flutter/material.dart';
import 'package:hexcolor/hexcolor.dart';
import 'package:provider/provider.dart';
@ -41,7 +42,7 @@ class _VerificationMethodsState extends State<VerificationMethods> {
}
Future<void> getSharedPref() async {
sharedPref.getObj('loggedUser').then((userInfo) {
sharedPref.getObj(LOGGED_IN_USER).then((userInfo) {
_loggedUser = userInfo;
});
}

Write Preview
Loading…
Cancel
Save