Skip to content

Commit 6b93476

Browse files
Update gotrue_client.dart
1 parent 6fa82cf commit 6b93476

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

packages/gotrue/lib/src/gotrue_client.dart

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class GoTrueClient {
5555
int _refreshTokenRetryCount = 0;
5656

5757
/// Completer to combine multiple simultaneous token refresh requests.
58-
Completer<AuthResponse>? _refreshTokenCompleter;
58+
Completer<AuthResponse?>? _refreshTokenCompleter;
5959

6060
final _onAuthStateChangeController = BehaviorSubject<AuthState>();
6161
final _onAuthStateChangeControllerSync =
@@ -1065,7 +1065,7 @@ class GoTrueClient {
10651065
print("🦁 CALLING REFRESH TOKEN 🦁");
10661066
if (_refreshTokenCompleter?.isCompleted ?? true) {
10671067
print("🦁 CREATING NEW FUTURE 🦁");
1068-
_refreshTokenCompleter = Completer<AuthResponse>();
1068+
_refreshTokenCompleter = Completer<AuthResponse?>();
10691069
// Catch any error in case nobody awaits the future
10701070
_refreshTokenCompleter!.future.then(
10711071
(value) => null,
@@ -1074,14 +1074,14 @@ class GoTrueClient {
10741074
try {
10751075
(_refreshTokenCompleter!.future as Future<void>).timeout(const Duration(seconds: 10), onTimeout: () {
10761076
if (!_refreshTokenCompleter!.isCompleted) {
1077-
_refreshTokenCompleter!.completeError(TimeoutException("Timeout"), StackTrace.current);
1077+
_refreshTokenCompleter!.complete(null);
10781078
}
10791079

10801080
throw TimeoutException("Timeout");
10811081
});
10821082
} catch (error, stackTrace) {
10831083
print("🦁 TIMED OUT SELF FUTURE 🦁");
1084-
return Future.error(error, stackTrace);
1084+
return null;
10851085
}
10861086
} else if (!ignorePendingRequest) {
10871087
print("🦁 RETURNING EXISTING FUTURE 🦁");
@@ -1128,8 +1128,9 @@ class GoTrueClient {
11281128
accessToken: accessToken,
11291129
);
11301130
if (!_refreshTokenCompleter!.isCompleted) {
1131-
_refreshTokenCompleter!.completeError(e, stack);
1131+
_refreshTokenCompleter!.complete(null);
11321132
}
1133+
return null;
11331134
} catch (error, stack) {
11341135
print("🦁 OTHER EXCEPTION 🦁: $error $stack");
11351136

0 commit comments

Comments
 (0)