finally the new login is completely working with refresh token as well
This commit is contained in:
@@ -341,59 +341,60 @@ class LoginScreenState extends State<LoginScreen> {
|
||||
);
|
||||
}
|
||||
|
||||
void _loginAPI({required BuildContext context}) {
|
||||
String username = usernameController.text;
|
||||
String password = passwordController.text;
|
||||
// void _loginAPI({required BuildContext context}) {
|
||||
// String username = usernameController.text;
|
||||
// String password = passwordController.text;
|
||||
|
||||
tempUsername = username;
|
||||
// tempUsername = username;
|
||||
|
||||
if (username == "" ||
|
||||
password == "" ||
|
||||
schoolController.selectedSchool == null) {
|
||||
return setState(() => _loginState = LoginState.missingFields);
|
||||
}
|
||||
// if (username == "" ||
|
||||
// password == "" ||
|
||||
// schoolController.selectedSchool == null) {
|
||||
// return setState(() => _loginState = LoginState.missingFields);
|
||||
// }
|
||||
|
||||
// ignore: no_leading_underscores_for_local_identifiers
|
||||
void _callAPI() {
|
||||
loginAPI(
|
||||
username: username,
|
||||
password: password,
|
||||
instituteCode: schoolController.selectedSchool!.instituteCode,
|
||||
context: context,
|
||||
onLogin: (user) {
|
||||
ScaffoldMessenger.of(context).showSnackBar(CustomSnackBar(
|
||||
context: context,
|
||||
brightness: Brightness.light,
|
||||
content: Text("welcome".i18n.fill([user.name]),
|
||||
overflow: TextOverflow.ellipsis),
|
||||
));
|
||||
},
|
||||
onSuccess: () {
|
||||
ScaffoldMessenger.of(context).hideCurrentSnackBar();
|
||||
setSystemChrome(context);
|
||||
Navigator.of(context).pushReplacementNamed("login_to_navigation");
|
||||
}).then(
|
||||
(res) => setState(() {
|
||||
// if (res == LoginState.invalidGrant &&
|
||||
// tempUsername.replaceAll(username, '').length <= 3) {
|
||||
// tempUsername = username + ' ';
|
||||
// Timer(
|
||||
// const Duration(milliseconds: 500),
|
||||
// () => _loginAPI(context: context),
|
||||
// );
|
||||
// // _loginAPI(context: context);
|
||||
// } else {
|
||||
_loginState = res;
|
||||
// }
|
||||
}),
|
||||
);
|
||||
}
|
||||
// // ignore: no_leading_underscores_for_local_identifiers
|
||||
// void _callAPI() {
|
||||
// loginAPI(
|
||||
// username: username,
|
||||
// password: password,
|
||||
// instituteCode: schoolController.selectedSchool!.instituteCode,
|
||||
// context: context,
|
||||
// onLogin: (user) {
|
||||
// ScaffoldMessenger.of(context).showSnackBar(CustomSnackBar(
|
||||
// context: context,
|
||||
// brightness: Brightness.light,
|
||||
// content: Text("welcome".i18n.fill([user.name]),
|
||||
// overflow: TextOverflow.ellipsis),
|
||||
// ));
|
||||
// },
|
||||
// onSuccess: () {
|
||||
// ScaffoldMessenger.of(context).hideCurrentSnackBar();
|
||||
// setSystemChrome(context);
|
||||
// Navigator.of(context).pushReplacementNamed("login_to_navigation");
|
||||
// }).then(
|
||||
// (res) => setState(() {
|
||||
// // if (res == LoginState.invalidGrant &&
|
||||
// // tempUsername.replaceAll(username, '').length <= 3) {
|
||||
// // tempUsername = username + ' ';
|
||||
// // Timer(
|
||||
// // const Duration(milliseconds: 500),
|
||||
// // () => _loginAPI(context: context),
|
||||
// // );
|
||||
// // // _loginAPI(context: context);
|
||||
// // } else {
|
||||
// _loginState = res;
|
||||
// // }
|
||||
// }),
|
||||
// );
|
||||
// }
|
||||
|
||||
setState(() => _loginState = LoginState.inProgress);
|
||||
_callAPI();
|
||||
}
|
||||
// setState(() => _loginState = LoginState.inProgress);
|
||||
// _callAPI();
|
||||
// }
|
||||
|
||||
// new login api
|
||||
// ignore: non_constant_identifier_names
|
||||
void _NewLoginAPI({required BuildContext context}) {
|
||||
String code = codeController.text;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user