commit f18de114be250093990e6ae56c36d8d6c69acc3f · bretton.dev/coves-mobile

+153

lib/services/auth_interceptor.dart

···

       1
       1
       +
       import 'package:dio/dio.dart';

     

       2
       2
       +
       import 'package:flutter/foundation.dart';

     

       3
       3
       +
       

     

       4
       4
       +
       import '../models/coves_session.dart';

     

       5
       5
       +
       

     

       6
       6
       +
       /// Creates a Dio interceptor that handles authentication and automatic

     

       7
       7
       +
       /// token refresh on 401 errors.

     

       8
       8
       +
       ///

     

       9
       9
       +
       /// This shared utility eliminates duplication between VoteService and

     

       10
       10
       +
       /// CommentService by providing a single implementation of:

     

       11
       11
       +
       /// - Adding Authorization headers with fresh tokens on each request

     

       12
       12
       +
       /// - Automatic retry with token refresh on 401 responses

     

       13
       13
       +
       /// - Sign-out handling when refresh fails

     

       14
       14
       +
       ///

     

       15
       15
       +
       /// Usage:

     

       16
       16
       +
       /// ```dart

     

       17
       17
       +
       /// _dio.interceptors.add(

     

       18
       18
       +
       ///   createAuthInterceptor(

     

       19
       19
       +
       ///     sessionGetter: () async => authProvider.session,

     

       20
       20
       +
       ///     tokenRefresher: authProvider.refreshToken,

     

       21
       21
       +
       ///     signOutHandler: authProvider.signOut,

     

       22
       22
       +
       ///     serviceName: 'MyService',

     

       23
       23
       +
       ///   ),

     

       24
       24
       +
       /// );

     

       25
       25
       +
       /// ```

     

       26
       26
       +
       InterceptorsWrapper createAuthInterceptor({

     

       27
       27
       +
         required Future<CovesSession?> Function()? sessionGetter,

     

       28
       28
       +
         required Future<bool> Function()? tokenRefresher,

     

       29
       29
       +
         required Future<void> Function()? signOutHandler,

     

       30
       30
       +
         required String serviceName,

     

       31
       31
       +
         required Dio dio,

     

       32
       32
       +
       }) {

     

       33
       33
       +
         return InterceptorsWrapper(

     

       34
       34
       +
           onRequest: (options, handler) async {

     

       35
       35
       +
             // Fetch fresh token before each request

     

       36
       36
       +
             final session = await sessionGetter?.call();

     

       37
       37
       +
             if (session != null) {

     

       38
       38
       +
               options.headers['Authorization'] = 'Bearer ${session.token}';

     

       39
       39
       +
               if (kDebugMode) {

     

       40
       40
       +
                 debugPrint('🔐 $serviceName: Adding fresh Authorization header');

     

       41
       41
       +
               }

     

       42
       42
       +
             } else {

     

       43
       43
       +
               if (kDebugMode) {

     

       44
       44
       +
                 debugPrint(

     

       45
       45
       +
                   '⚠️ $serviceName: Session getter returned null - '

     

       46
       46
       +
                   'making unauthenticated request',

     

       47
       47
       +
                 );

     

       48
       48
       +
               }

     

       49
       49
       +
             }

     

       50
       50
       +
             return handler.next(options);

     

       51
       51
       +
           },

     

       52
       52
       +
           onError: (error, handler) async {

     

       53
       53
       +
             // Handle 401 errors with automatic token refresh

     

       54
       54
       +
             if (error.response?.statusCode == 401 && tokenRefresher != null) {

     

       55
       55
       +
               if (kDebugMode) {

     

       56
       56
       +
                 debugPrint(

     

       57
       57
       +
                   '🔄 $serviceName: 401 detected, attempting token refresh...',

     

       58
       58
       +
                 );

     

       59
       59
       +
               }

     

       60
       60
       +
       

     

       61
       61
       +
               // Check if we already retried this request (prevent infinite loop)

     

       62
       62
       +
               if (error.requestOptions.extra['retried'] == true) {

     

       63
       63
       +
                 if (kDebugMode) {

     

       64
       64
       +
                   debugPrint(

     

       65
       65
       +
                     '⚠️ $serviceName: Request already retried after token refresh, '

     

       66
       66
       +
                     'signing out user',

     

       67
       67
       +
                   );

     

       68
       68
       +
                 }

     

       69
       69
       +
                 // Already retried once, don't retry again

     

       70
       70
       +
                 if (signOutHandler != null) {

     

       71
       71
       +
                   await signOutHandler();

     

       72
       72
       +
                 }

     

       73
       73
       +
                 return handler.next(error);

     

       74
       74
       +
               }

     

       75
       75
       +
       

     

       76
       76
       +
               try {

     

       77
       77
       +
                 // Attempt to refresh the token

     

       78
       78
       +
                 final refreshSucceeded = await tokenRefresher();

     

       79
       79
       +
       

     

       80
       80
       +
                 if (refreshSucceeded) {

     

       81
       81
       +
                   if (kDebugMode) {

     

       82
       82
       +
                     debugPrint(

     

       83
       83
       +
                       '✅ $serviceName: Token refresh successful, retrying request',

     

       84
       84
       +
                     );

     

       85
       85
       +
                   }

     

       86
       86
       +
       

     

       87
       87
       +
                   // Get the new session

     

       88
       88
       +
                   final newSession = await sessionGetter?.call();

     

       89
       89
       +
       

     

       90
       90
       +
                   if (newSession != null) {

     

       91
       91
       +
                     // Mark this request as retried to prevent infinite loops

     

       92
       92
       +
                     error.requestOptions.extra['retried'] = true;

     

       93
       93
       +
       

     

       94
       94
       +
                     // Update the Authorization header with the new token

     

       95
       95
       +
                     error.requestOptions.headers['Authorization'] =

     

       96
       96
       +
                         'Bearer ${newSession.token}';

     

       97
       97
       +
       

     

       98
       98
       +
                     // Retry the original request with the new token

     

       99
       99
       +
                     try {

     

       100
       100
       +
                       final response = await dio.fetch(error.requestOptions);

     

       101
       101
       +
                       return handler.resolve(response);

     

       102
       102
       +
                     } on DioException catch (retryError) {

     

       103
       103
       +
                       // If retry failed with 401 and already retried, we already

     

       104
       104
       +
                       // signed out in the retry limit check above, so just pass

     

       105
       105
       +
                       // the error through without signing out again

     

       106
       106
       +
                       if (retryError.response?.statusCode == 401 &&

     

       107
       107
       +
                           retryError.requestOptions.extra['retried'] == true) {

     

       108
       108
       +
                         return handler.next(retryError);

     

       109
       109
       +
                       }

     

       110
       110
       +
                       // For other errors during retry, rethrow to outer catch

     

       111
       111
       +
                       rethrow;

     

       112
       112
       +
                     }

     

       113
       113
       +
                   }

     

       114
       114
       +
                 }

     

       115
       115
       +
       

     

       116
       116
       +
                 // Refresh failed, sign out the user

     

       117
       117
       +
                 if (kDebugMode) {

     

       118
       118
       +
                   debugPrint(

     

       119
       119
       +
                     '❌ $serviceName: Token refresh failed, signing out user',

     

       120
       120
       +
                   );

     

       121
       121
       +
                 }

     

       122
       122
       +
                 if (signOutHandler != null) {

     

       123
       123
       +
                   await signOutHandler();

     

       124
       124
       +
                 }

     

       125
       125
       +
               } on Exception catch (e) {

     

       126
       126
       +
                 if (kDebugMode) {

     

       127
       127
       +
                   debugPrint('❌ $serviceName: Error during token refresh: $e');

     

       128
       128
       +
                 }

     

       129
       129
       +
                 // Only sign out if we haven't already (avoid double sign-out)

     

       130
       130
       +
                 // Check if this is a DioException from a retried request

     

       131
       131
       +
                 final isRetriedRequest =

     

       132
       132
       +
                     e is DioException &&

     

       133
       133
       +
                     e.response?.statusCode == 401 &&

     

       134
       134
       +
                     e.requestOptions.extra['retried'] == true;

     

       135
       135
       +
       

     

       136
       136
       +
                 if (!isRetriedRequest && signOutHandler != null) {

     

       137
       137
       +
                   await signOutHandler();

     

       138
       138
       +
                 }

     

       139
       139
       +
               }

     

       140
       140
       +
             }

     

       141
       141
       +
       

     

       142
       142
       +
             // Log the error for debugging

     

       143
       143
       +
             if (kDebugMode) {

     

       144
       144
       +
               debugPrint('❌ $serviceName API Error: ${error.message}');

     

       145
       145
       +
               if (error.response != null) {

     

       146
       146
       +
                 debugPrint('   Status: ${error.response?.statusCode}');

     

       147
       147
       +
                 debugPrint('   Data: ${error.response?.data}');

     

       148
       148
       +
               }

     

       149
       149
       +
             }

     

       150
       150
       +
             return handler.next(error);

     

       151
       151
       +
           },

     

       152
       152
       +
         );

     

       153
       153
       +
       }

+13 -126

lib/services/vote_service.dart

···

       5
       5
        
       import '../models/coves_session.dart';

     

       6
       6
        
       import '../providers/vote_provider.dart' show VoteState;

     

       7
       7
        
       import 'api_exceptions.dart';

     

       8
       8
       +
       import 'auth_interceptor.dart';

     

       8
       9
        
       

     

       9
       10
        
       /// Vote Service

     

       10
       11
        
       ///

     
···

       23
       24
        
       /// 4. Handles toggle logic (creating, deleting, or switching vote direction)

     

       24
       25
        
       ///

     

       25
       26
        
       /// **Backend Endpoints**:

     

       26
       26
       -
       /// - POST /xrpc/social.coves.feed.vote.create - Creates, toggles, or switches votes

     

       27
       27
       +
       /// - POST /xrpc/social.coves.feed.vote.create - Creates, toggles, or switches

     

       28
       28
       +
       ///   votes

     

       27
       29
        
       class VoteService {

     

       28
       30
        
         VoteService({

     

       29
       31
        
           Future<CovesSession?> Function()? sessionGetter,

     
···

       32
       34
        
           Future<void> Function()? signOutHandler,

     

       33
       35
        
           Dio? dio,

     

       34
       36
        
         }) : _sessionGetter = sessionGetter,

     

       35
       35
       -
              _didGetter = didGetter,

     

       36
       36
       -
              _tokenRefresher = tokenRefresher,

     

       37
       37
       -
              _signOutHandler = signOutHandler {

     

       37
       37
       +
              _didGetter = didGetter {

     

       38
       38
        
           _dio =

     

       39
       39
        
               dio ??

     

       40
       40
        
               Dio(

     
···

       46
       46
        
                 ),

     

       47
       47
        
               );

     

       48
       48
        
       

     

       49
       49
       -
           // Add 401 retry interceptor (same pattern as CovesApiService)

     

       49
       49
       +
           // Add shared 401 retry interceptor

     

       50
       50
        
           _dio.interceptors.add(

     

       51
       51
       -
             InterceptorsWrapper(

     

       52
       52
       -
               onRequest: (options, handler) async {

     

       53
       53
       -
                 // Fetch fresh token before each request

     

       54
       54
       -
                 final session = await _sessionGetter?.call();

     

       55
       55
       -
                 if (session != null) {

     

       56
       56
       -
                   options.headers['Authorization'] = 'Bearer ${session.token}';

     

       57
       57
       -
                   if (kDebugMode) {

     

       58
       58
       -
                     debugPrint('🔐 VoteService: Adding fresh Authorization header');

     

       59
       59
       -
                   }

     

       60
       60
       -
                 } else {

     

       61
       61
       -
                   if (kDebugMode) {

     

       62
       62
       -
                     debugPrint(

     

       63
       63
       -
                       '⚠️ VoteService: Session getter returned null - '

     

       64
       64
       -
                       'making unauthenticated request',

     

       65
       65
       -
                     );

     

       66
       66
       -
                   }

     

       67
       67
       -
                 }

     

       68
       68
       -
                 return handler.next(options);

     

       69
       69
       -
               },

     

       70
       70
       -
               onError: (error, handler) async {

     

       71
       71
       -
                 // Handle 401 errors with automatic token refresh

     

       72
       72
       -
                 if (error.response?.statusCode == 401 && _tokenRefresher != null) {

     

       73
       73
       -
                   if (kDebugMode) {

     

       74
       74
       -
                     debugPrint(

     

       75
       75
       -
                       '🔄 VoteService: 401 detected, attempting token refresh...',

     

       76
       76
       -
                     );

     

       77
       77
       -
                   }

     

       78
       78
       -
       

     

       79
       79
       -
                   // Check if we already retried this request (prevent infinite loop)

     

       80
       80
       -
                   if (error.requestOptions.extra['retried'] == true) {

     

       81
       81
       -
                     if (kDebugMode) {

     

       82
       82
       -
                       debugPrint(

     

       83
       83
       -
                         '⚠️ VoteService: Request already retried after token refresh, '

     

       84
       84
       -
                         'signing out user',

     

       85
       85
       -
                       );

     

       86
       86
       -
                     }

     

       87
       87
       -
                     // Already retried once, don't retry again

     

       88
       88
       -
                     if (_signOutHandler != null) {

     

       89
       89
       -
                       await _signOutHandler();

     

       90
       90
       -
                     }

     

       91
       91
       -
                     return handler.next(error);

     

       92
       92
       -
                   }

     

       93
       93
       -
       

     

       94
       94
       -
                   try {

     

       95
       95
       -
                     // Attempt to refresh the token

     

       96
       96
       -
                     final refreshSucceeded = await _tokenRefresher();

     

       97
       97
       -
       

     

       98
       98
       -
                     if (refreshSucceeded) {

     

       99
       99
       -
                       if (kDebugMode) {

     

       100
       100
       -
                         debugPrint(

     

       101
       101
       -
                           '✅ VoteService: Token refresh successful, retrying request',

     

       102
       102
       -
                         );

     

       103
       103
       -
                       }

     

       104
       104
       -
       

     

       105
       105
       -
                       // Get the new session

     

       106
       106
       -
                       final newSession = await _sessionGetter?.call();

     

       107
       107
       -
       

     

       108
       108
       -
                       if (newSession != null) {

     

       109
       109
       -
                         // Mark this request as retried to prevent infinite loops

     

       110
       110
       -
                         error.requestOptions.extra['retried'] = true;

     

       111
       111
       -
       

     

       112
       112
       -
                         // Update the Authorization header with the new token

     

       113
       113
       -
                         error.requestOptions.headers['Authorization'] =

     

       114
       114
       -
                             'Bearer ${newSession.token}';

     

       115
       115
       -
       

     

       116
       116
       -
                         // Retry the original request with the new token

     

       117
       117
       -
                         try {

     

       118
       118
       -
                           final response = await _dio.fetch(error.requestOptions);

     

       119
       119
       -
                           return handler.resolve(response);

     

       120
       120
       -
                         } on DioException catch (retryError) {

     

       121
       121
       -
                           // If retry failed with 401 and already retried, we already

     

       122
       122
       -
                           // signed out in the retry limit check above, so just pass

     

       123
       123
       -
                           // the error through without signing out again

     

       124
       124
       -
                           if (retryError.response?.statusCode == 401 &&

     

       125
       125
       -
                               retryError.requestOptions.extra['retried'] == true) {

     

       126
       126
       -
                             return handler.next(retryError);

     

       127
       127
       -
                           }

     

       128
       128
       -
                           // For other errors during retry, rethrow to outer catch

     

       129
       129
       -
                           rethrow;

     

       130
       130
       -
                         }

     

       131
       131
       -
                       }

     

       132
       132
       -
                     }

     

       133
       133
       -
       

     

       134
       134
       -
                     // Refresh failed, sign out the user

     

       135
       135
       -
                     if (kDebugMode) {

     

       136
       136
       -
                       debugPrint(

     

       137
       137
       -
                         '❌ VoteService: Token refresh failed, signing out user',

     

       138
       138
       -
                       );

     

       139
       139
       -
                     }

     

       140
       140
       -
                     if (_signOutHandler != null) {

     

       141
       141
       -
                       await _signOutHandler();

     

       142
       142
       -
                     }

     

       143
       143
       -
                   } catch (e) {

     

       144
       144
       -
                     if (kDebugMode) {

     

       145
       145
       -
                       debugPrint('❌ VoteService: Error during token refresh: $e');

     

       146
       146
       -
                     }

     

       147
       147
       -
                     // Only sign out if we haven't already (avoid double sign-out)

     

       148
       148
       -
                     // Check if this is a DioException from a retried request

     

       149
       149
       -
                     final isRetriedRequest =

     

       150
       150
       -
                         e is DioException &&

     

       151
       151
       -
                         e.response?.statusCode == 401 &&

     

       152
       152
       -
                         e.requestOptions.extra['retried'] == true;

     

       153
       153
       -
       

     

       154
       154
       -
                     if (!isRetriedRequest && _signOutHandler != null) {

     

       155
       155
       -
                       await _signOutHandler();

     

       156
       156
       -
                     }

     

       157
       157
       -
                   }

     

       158
       158
       -
                 }

     

       159
       159
       -
       

     

       160
       160
       -
                 // Log the error for debugging

     

       161
       161
       -
                 if (kDebugMode) {

     

       162
       162
       -
                   debugPrint('❌ VoteService API Error: ${error.message}');

     

       163
       163
       -
                   if (error.response != null) {

     

       164
       164
       -
                     debugPrint('   Status: ${error.response?.statusCode}');

     

       165
       165
       -
                     debugPrint('   Data: ${error.response?.data}');

     

       166
       166
       -
                   }

     

       167
       167
       -
                 }

     

       168
       168
       -
                 return handler.next(error);

     

       169
       169
       -
               },

     

       51
       51
       +
             createAuthInterceptor(

     

       52
       52
       +
               sessionGetter: sessionGetter,

     

       53
       53
       +
               tokenRefresher: tokenRefresher,

     

       54
       54
       +
               signOutHandler: signOutHandler,

     

       55
       55
       +
               serviceName: 'VoteService',

     

       56
       56
       +
               dio: _dio,

     

       170
       57
        
             ),

     

       171
       58
        
           );

     

       172
       59
        
         }

     

       173
       60
        
       

     

       174
       61
        
         final Future<CovesSession?> Function()? _sessionGetter;

     

       175
       62
        
         final String? Function()? _didGetter;

     

       176
       176
       -
         final Future<bool> Function()? _tokenRefresher;

     

       177
       177
       -
         final Future<void> Function()? _signOutHandler;

     

       178
       63
        
         late final Dio _dio;

     

       179
       64
        
       

     

       180
       65
        
         /// Collection name for vote records

     
···

       273
       158
        
               statusCode: e.response?.statusCode,

     

       274
       159
        
               originalError: e,

     

       275
       160
        
             );

     

       161
       161
       +
           } on ApiException {

     

       162
       162
       +
             rethrow;

     

       276
       163
        
           } on Exception catch (e) {

     

       277
       164
        
             throw ApiException('Failed to create vote: $e');

     

       278
       165
        
           }