fix: refresh token issue (#353)

gsainfoteam · Sep 15, 2024 · a0eeff1 · a0eeff1
1 parent 376dc4b
commit a0eeff1
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 30 deletions.
diff --git a/lib/app/modules/user/data/data_sources/remote/authorize_interceptor.dart b/lib/app/modules/user/data/data_sources/remote/authorize_interceptor.dart
@@ -1,5 +1,6 @@
 import 'package:dio/dio.dart';
 import 'package:injectable/injectable.dart';
+import 'package:mutex/mutex.dart';
 import 'package:ziggle/app/di/locator.dart';
 import 'package:ziggle/app/modules/user/data/data_sources/remote/user_api.dart';
 import 'package:ziggle/app/modules/user/domain/repositories/token_repository.dart';
@@ -8,6 +9,7 @@ import 'package:ziggle/app/modules/user/domain/repositories/token_repository.dar
 class AuthorizeInterceptor extends Interceptor {
   final TokenRepository _repository;
   static const retriedKey = '_retried';
+  final mutex = ReadWriteMutex();
 
   AuthorizeInterceptor(this._repository);
 
@@ -19,22 +21,11 @@ class AuthorizeInterceptor extends Interceptor {
     if (statusCode != 401) return handler.next(err);
     final token = await _repository.token.first;
     if (token == null) return handler.next(err);
-    final retried = err.requestOptions.extra.containsKey(retriedKey);
-    if (retried) return handler.next(err);
-    err.requestOptions.extra[retriedKey] = true;
+    if (err.requestOptions.retried) return handler.next(err);
+    err.requestOptions.retried = true;
+
     try {
-      final userApi = sl<UserApi>();
-      try {
-        userApi.testTokenInfo();
-      } catch (e) {
-        try {
-          final token = await userApi.refresh();
-          await _repository.saveToken(token.accessToken);
-        } catch (e) {
-          await _repository.deleteToken();
-          return handler.next(err);
-        }
-      }
+      if (!(await _refresh())) return handler.next(err);
       final retriedResponse = await dio.fetch(err.requestOptions);
       return handler.resolve(retriedResponse);
     } on DioException {
@@ -47,19 +38,47 @@ class AuthorizeInterceptor extends Interceptor {
     RequestOptions options,
     RequestInterceptorHandler handler,
   ) async {
+    if (options.retried) return handler.next(options);
     if (_repository.tokenExpiration != null) {
       if (DateTime.now().isAfter(_repository.tokenExpiration!)) {
-        try {
-          final userApi = sl<UserApi>();
-          final token = await userApi.refresh();
-          await _repository.saveToken(token.accessToken);
-        } catch (_) {}
+        await _refresh();
       }
     }
-    final token = await _repository.token.first;
-    if (token != null) {
-      options.headers['Authorization'] = 'Bearer $token';
+
+    try {
+      await mutex.acquireRead();
+      final token = await _repository.token.first;
+      if (token != null) {
+        options.headers['Authorization'] = 'Bearer $token';
+      }
+      handler.next(options);
+    } finally {
+      mutex.release();
     }
-    handler.next(options);
   }
+
+  Future<bool> _refresh() async {
+    if (mutex.isWriteLocked) {
+      await mutex.acquireRead();
+      mutex.release();
+      return true;
+    }
+    await mutex.acquireWrite();
+    final userApi = sl<UserApi>();
+    try {
+      final token = await userApi.refresh();
+      await _repository.saveToken(token.accessToken);
+      return true;
+    } catch (e) {
+      await _repository.deleteToken();
+      return false;
+    } finally {
+      mutex.release();
+    }
+  }
+}
+
+extension _RequestOptionsX on RequestOptions {
+  bool get retried => extra.containsKey(AuthorizeInterceptor.retriedKey);
+  set retried(bool value) => extra[AuthorizeInterceptor.retriedKey] = value;
 }
diff --git a/lib/app/modules/user/data/data_sources/remote/user_api.dart b/lib/app/modules/user/data/data_sources/remote/user_api.dart
@@ -23,10 +23,6 @@ abstract class UserApi {
   @Extra({AuthorizeInterceptor.retriedKey: true})
   Future<TokenModel> refresh();
 
-  @GET('info')
-  @Extra({AuthorizeInterceptor.retriedKey: true})
-  Future testTokenInfo();
-
   @GET('info')
   Future<UserModel> info();
 }
diff --git a/lib/app/modules/user/data/repositories/rest_auth_repository.dart b/lib/app/modules/user/data/repositories/rest_auth_repository.dart
@@ -31,7 +31,7 @@ class RestAuthRepository implements AuthRepository {
   Stream<bool> get isSignedIn => _tokenRepository.token.asyncMap(
         (_) async {
           try {
-            await _api.testTokenInfo();
+            await _api.info();
             return true;
           } catch (_) {
             return false;

diff --git a/lib/app/modules/user/presentation/bloc/auth_bloc.dart b/lib/app/modules/user/presentation/bloc/auth_bloc.dart
@@ -54,4 +54,5 @@ sealed class AuthState with _$AuthState {
 
   bool get hasUser => this is _Authenticated;
   bool get isLoading => this is _Loading;
+  bool get hasError => this is _Error;
 }
diff --git a/lib/app/modules/user/presentation/pages/profile_page.dart b/lib/app/modules/user/presentation/pages/profile_page.dart
@@ -44,7 +44,7 @@ class _Layout extends StatelessWidget {
               _Profile(user: state.user!)
             else
               BlocBuilder<AuthBloc, AuthState>(
-                buildWhen: (c, p) => p.isLoading,
+                buildWhen: (c, p) => p.isLoading || p.hasError,
                 builder: (context, authState) => Stack(
                   alignment: Alignment.center,
                   children: [

diff --git a/pubspec.lock b/pubspec.lock
@@ -1018,6 +1018,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.6"
+  mutex:
+    dependency: "direct main"
+    description:
+      name: mutex
+      sha256: "8827da25de792088eb33e572115a5eb0d61d61a3c01acbc8bcbe76ed78f1a1f2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.0"
   nested:
     dependency: transitive
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -41,6 +41,7 @@ dependencies:
   collection: ^1.18.0
   flutter_inappwebview: ^5.8.0
   url_launcher: ^6.3.0
+  mutex: ^3.1.0
 
 dev_dependencies:
   flutter_test: