Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/login speedup #962

Merged
merged 1 commit into from
Sep 25, 2023
Merged

Fix/login speedup #962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 25 additions & 35 deletions uni/lib/controller/networking/network_router.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ class NetworkRouter {

final url =
'${NetworkRouter.getBaseUrls(faculties)[0]}mob_val_geral.autentica';

final response = await http.post(
url.toUri(),
body: {'pv_login': username, 'pv_password': password},
Expand Down Expand Up @@ -100,8 +99,6 @@ class NetworkRouter {
final faculties = session.faculties;
final persistentSession = session.persistentSession;

Logger().d('Re-login from session: $username, $faculties');

return login(
username,
password,
Expand All @@ -117,17 +114,13 @@ class NetworkRouter {
String pass,
List<String> faculties,
) async {
return _loginLock.synchronized(() async {
final url =
'${NetworkRouter.getBaseUrls(faculties)[0]}vld_validacao.validacao';

final response = await http.post(
url.toUri(),
body: {'p_user': user, 'p_pass': pass},
).timeout(_requestTimeout);

return response.body;
});
final url =
'${NetworkRouter.getBaseUrls(faculties)[0]}vld_validacao.validacao';
final response = await http.post(
url.toUri(),
body: {'p_user': user, 'p_pass': pass},
).timeout(_requestTimeout);
return response.body;
}

/// Extracts the cookies present in [headers].
Expand Down Expand Up @@ -192,6 +185,7 @@ class NetworkRouter {
NavigationService.logoutAndPopHistory(null);
return Future.error('Login failed');
}

session
..username = newSession.username
..cookies = newSession.cookies;
Expand All @@ -218,20 +212,18 @@ class NetworkRouter {
/// Check if the user is still logged in,
/// performing a health check on the user's personal page.
static Future<bool> userLoggedIn(Session session) async {
return _loginLock.synchronized(() async {
Logger().d('Checking if user is still logged in');
Logger().d('Checking if user is still logged in');

final url = '${getBaseUrl(session.faculties[0])}'
'fest_geral.cursos_list?pv_num_unico=${session.username}';
final headers = <String, String>{};
headers['cookie'] = session.cookies;
final url = '${getBaseUrl(session.faculties[0])}'
'fest_geral.cursos_list?pv_num_unico=${session.username}';
final headers = <String, String>{};
headers['cookie'] = session.cookies;

final response = await (httpClient != null
? httpClient!.get(url.toUri(), headers: headers)
: http.get(url.toUri(), headers: headers));
final response = await (httpClient != null
? httpClient!.get(url.toUri(), headers: headers)
: http.get(url.toUri(), headers: headers));

return response.statusCode == 200;
});
return response.statusCode == 200;
}

/// Returns the base url of the user's faculties.
Expand All @@ -253,17 +245,15 @@ class NetworkRouter {
static Future<Response> killSigarraAuthentication(
List<String> faculties,
) async {
return _loginLock.synchronized(() async {
final url = '${NetworkRouter.getBaseUrl(faculties[0])}vld_validacao.sair';
final response = await http.get(url.toUri()).timeout(_requestTimeout);
final url = '${NetworkRouter.getBaseUrl(faculties[0])}vld_validacao.sair';
final response = await http.get(url.toUri()).timeout(_requestTimeout);

if (response.statusCode == 200) {
Logger().i('Logout Successful');
} else {
Logger().i('Logout Failed');
}
if (response.statusCode == 200) {
Logger().i('Logout Successful');
} else {
Logger().i('Logout Failed');
}

return response;
});
return response;
}
}
10 changes: 0 additions & 10 deletions uni/lib/model/providers/state_provider_notifier.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,6 @@ abstract class StateProviderNotifier extends ChangeNotifier {

Future<void> forceRefresh(BuildContext context) async {
await _lock.synchronized(() async {
if (_lastUpdateTime != null &&
DateTime.now().difference(_lastUpdateTime!) <
const Duration(minutes: 1)) {
Logger().w(
'Last update for $runtimeType was less than a minute ago; '
'skipping refresh',
);
return;
}

final session =
Provider.of<SessionProvider>(context, listen: false).session;
final profile =
Expand Down
Loading