Skip to content

Ignore a silent refresh that finishes after the user signed out #30

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aniklavida merged 1 commit into from
Sep 30, 2026
Merged

Ignore a silent refresh that finishes after the user signed out #30

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
12 changes: 10 additions & 2 deletions mobile/flutter/lib/shared/auth/session_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ class SessionController extends ChangeNotifier implements SessionPort {
final TokenStore _tokenStore;
Timer? _refreshTimer;
bool _bootstrapped = false;
// Bumped whenever the session is cleared so a refresh that was already in
// flight cannot sign the user back in after they signed out.
int _generation = 0;

AuthStatus status = AuthStatus.loading;
User? user;
Expand Down Expand Up @@ -72,11 +75,12 @@ class SessionController extends ChangeNotifier implements SessionPort {
@override
Future<User> adoptSession(TokenPair tokens) => _adopt(tokens);

Future<User> _adopt(TokenPair tokens) async {
Future<User> _adopt(TokenPair tokens, {int? generation}) async {
final userResponse = await _apiClient.authApi.getCurrentUser(
headers: {'Authorization': 'Bearer ${tokens.accessToken}'},
);
final resolvedUser = userResponse.data!;
if (generation != null && generation != _generation) return resolvedUser;

_accessToken = tokens.accessToken;
_expiresAt = tokens.expiresAt;
Expand All @@ -91,6 +95,7 @@ class SessionController extends ChangeNotifier implements SessionPort {

@override
Future<void> clearSession() async {
_generation++;
_refreshTimer?.cancel();
_refreshTimer = null;
_accessToken = null;
Expand Down Expand Up @@ -118,12 +123,15 @@ class SessionController extends ChangeNotifier implements SessionPort {
await clearSession();
return;
}
final generation = _generation;
try {
final response = await _apiClient.authApi.refreshToken(
refreshRequest: RefreshRequest(refreshToken: refreshToken),
);
await _adopt(response.data!);
if (generation != _generation) return;
await _adopt(response.data!, generation: generation);
} catch (_) {
if (generation != _generation) return;
await clearSession();
}
}
Expand Down