petegregoryy/mileograph_flutter
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects 1 Releases 55 Wiki Activity

add refresh token support

Browse Source
This commit is contained in:
petegregoryy
2026-01-23 17:55:55 +00:00
parent 9896b6f1f8
commit f3fcf07b05
5 changed files with 245 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

186
lib/services/api_service.dart
View File

@@ -2,7 +2,7 @@ import 'dart:convert';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
typedef TokenProvider = String? Function(); typedef TokenProvider = String? Function();
typedef UnauthorizedHandler = Future<void> Function(); typedef UnauthorizedHandler = Future<bool> Function();
class ApiService { class ApiService {
String _baseUrl; String _baseUrl;
@@ -36,35 +36,47 @@ class ApiService {
_client.close(); _client.close();
} }
Map<String, String> _buildHeaders(Map<String, String>? extra) { Map<String, String> _buildHeaders(
Map<String, String>? extra, {
bool includeAuth = true,
}) {
final token = _getToken?.call(); final token = _getToken?.call();
final headers = {'accept': 'application/json', ...?extra}; final headers = {'accept': 'application/json', ...?extra};
if (token != null && token.isNotEmpty) { if (includeAuth && token != null && token.isNotEmpty) {
headers['Authorization'] = 'Bearer $token'; headers['Authorization'] = 'Bearer $token';
} }
return headers; return headers;
} }
Future<dynamic> get(String endpoint, {Map<String, String>? headers}) async { Future<dynamic> get(
final response = await _client String endpoint, {
.get( Map<String, String>? headers,
Uri.parse('$baseUrl$endpoint'), bool includeAuth = true,
headers: _buildHeaders(headers), bool allowRetry = true,
) }) async {
.timeout(timeout); final response = await _sendWithRetry(
() => _client.get(
Uri.parse('$baseUrl$endpoint'),
headers: _buildHeaders(headers, includeAuth: includeAuth),
),
allowRetry: allowRetry,
);
return _processResponse(response); return _processResponse(response);
} }
Future<ApiBinaryResponse> getBytes( Future<ApiBinaryResponse> getBytes(
String endpoint, { String endpoint, {
Map<String, String>? headers, Map<String, String>? headers,
bool includeAuth = true,
bool allowRetry = true,
}) async { }) async {
final response = await _client final response = await _sendWithRetry(
.get( () => _client.get(
Uri.parse('$baseUrl$endpoint'), Uri.parse('$baseUrl$endpoint'),
headers: _buildHeaders(headers), headers: _buildHeaders(headers, includeAuth: includeAuth),
) ),
.timeout(timeout); allowRetry: allowRetry,
);
if (response.statusCode >= 200 && response.statusCode < 300) { if (response.statusCode >= 200 && response.statusCode < 300) {
final contentDisposition = response.headers['content-disposition']; final contentDisposition = response.headers['content-disposition'];
@@ -76,10 +88,6 @@ class ApiService {
); );
} }
if (response.statusCode == 401 && _onUnauthorized != null) {
await _onUnauthorized!();
}
final body = _decodeBody(response); final body = _decodeBody(response);
final message = _extractErrorMessage(body); final message = _extractErrorMessage(body);
throw ApiException( throw ApiException(
@@ -93,15 +101,21 @@ class ApiService {
String endpoint, String endpoint,
dynamic data, { dynamic data, {
Map<String, String>? headers, Map<String, String>? headers,
bool includeAuth = true,
bool allowRetry = true,
}) async { }) async {
final hasBody = data != null; final hasBody = data != null;
final response = await _client final response = await _sendWithRetry(
.post( () => _client.post(
Uri.parse('$baseUrl$endpoint'), Uri.parse('$baseUrl$endpoint'),
headers: _buildHeaders(hasBody ? _jsonHeaders(headers) : headers), headers: _buildHeaders(
body: hasBody ? jsonEncode(data) : null, hasBody ? _jsonHeaders(headers) : headers,
) includeAuth: includeAuth,
.timeout(timeout); ),
body: hasBody ? jsonEncode(data) : null,
),
allowRetry: allowRetry,
);
return _processResponse(response); return _processResponse(response);
} }
@@ -112,38 +126,53 @@ class ApiService {
String fieldName = 'file', String fieldName = 'file',
Map<String, String>? fields, Map<String, String>? fields,
Map<String, String>? headers, Map<String, String>? headers,
bool includeAuth = true,
bool allowRetry = true,
}) async { }) async {
final request = http.MultipartRequest( Future<http.Response> send() async {
'POST', final request = http.MultipartRequest(
Uri.parse('$baseUrl$endpoint'), 'POST',
); Uri.parse('$baseUrl$endpoint'),
request.headers.addAll(_buildHeaders(headers)); );
if (fields != null && fields.isNotEmpty) { request.headers.addAll(_buildHeaders(headers, includeAuth: includeAuth));
request.fields.addAll(fields); if (fields != null && fields.isNotEmpty) {
request.fields.addAll(fields);
}
request.files.add(
http.MultipartFile.fromBytes(
fieldName,
bytes,
filename: filename,
),
);
final streamed = await _client.send(request);
return http.Response.fromStream(streamed);
} }
request.files.add(
http.MultipartFile.fromBytes( final response = await _sendWithRetry(send, allowRetry: allowRetry);
fieldName,
bytes,
filename: filename,
),
);
final streamed = await _client.send(request).timeout(timeout);
final response = await http.Response.fromStream(streamed);
return _processResponse(response); return _processResponse(response);
} }
Future<dynamic> postForm(String endpoint, Map<String, String> data) async { Future<dynamic> postForm(
final response = await _client String endpoint,
.post( Map<String, String> data, {
Uri.parse('$baseUrl$endpoint'), bool includeAuth = true,
headers: _buildHeaders({ bool allowRetry = true,
}) async {
final response = await _sendWithRetry(
() => _client.post(
Uri.parse('$baseUrl$endpoint'),
headers: _buildHeaders(
{
'Content-Type': 'application/x-www-form-urlencoded', 'Content-Type': 'application/x-www-form-urlencoded',
'accept': 'application/json', 'accept': 'application/json',
}), },
body: data, // http package handles form-encoding for Map<String, String> includeAuth: includeAuth,
) ),
.timeout(timeout); body: data, // http package handles form-encoding for Map<String, String>
),
allowRetry: allowRetry,
);
return _processResponse(response); return _processResponse(response);
} }
@@ -151,28 +180,37 @@ class ApiService {
String endpoint, String endpoint,
dynamic data, { dynamic data, {
Map<String, String>? headers, Map<String, String>? headers,
bool includeAuth = true,
bool allowRetry = true,
}) async { }) async {
final hasBody = data != null; final hasBody = data != null;
final response = await _client final response = await _sendWithRetry(
.put( () => _client.put(
Uri.parse('$baseUrl$endpoint'), Uri.parse('$baseUrl$endpoint'),
headers: _buildHeaders(hasBody ? _jsonHeaders(headers) : headers), headers: _buildHeaders(
body: hasBody ? jsonEncode(data) : null, hasBody ? _jsonHeaders(headers) : headers,
) includeAuth: includeAuth,
.timeout(timeout); ),
body: hasBody ? jsonEncode(data) : null,
),
allowRetry: allowRetry,
);
return _processResponse(response); return _processResponse(response);
} }
Future<dynamic> delete( Future<dynamic> delete(
String endpoint, { String endpoint, {
Map<String, String>? headers, Map<String, String>? headers,
bool includeAuth = true,
bool allowRetry = true,
}) async { }) async {
final response = await _client final response = await _sendWithRetry(
.delete( () => _client.delete(
Uri.parse('$baseUrl$endpoint'), Uri.parse('$baseUrl$endpoint'),
headers: _buildHeaders(headers), headers: _buildHeaders(headers, includeAuth: includeAuth),
) ),
.timeout(timeout); allowRetry: allowRetry,
);
return _processResponse(response); return _processResponse(response);
} }
@@ -186,10 +224,6 @@ class ApiService {
return body; return body;
} }
if (res.statusCode == 401 && _onUnauthorized != null) {
await _onUnauthorized!();
}
final message = _extractErrorMessage(body); final message = _extractErrorMessage(body);
throw ApiException( throw ApiException(
statusCode: res.statusCode, statusCode: res.statusCode,
@@ -239,6 +273,20 @@ class ApiService {
return body.toString(); return body.toString();
} }
Future<http.Response> _sendWithRetry(
Future<http.Response> Function() send, {
required bool allowRetry,
}) async {
var response = await send().timeout(timeout);
if (response.statusCode == 401 && allowRetry && _onUnauthorized != null) {
final refreshed = await _onUnauthorized!();
if (refreshed) {
response = await send().timeout(timeout);
}
}
return response;
}
String? _extractFilename(String? contentDisposition) { String? _extractFilename(String? contentDisposition) {
if (contentDisposition == null || contentDisposition.isEmpty) return null; if (contentDisposition == null || contentDisposition.isEmpty) return null;
final utf8Match = final utf8Match =

124
lib/services/authservice.dart
View File

@@ -6,18 +6,20 @@ import 'package:mileograph_flutter/services/token_storage_service.dart';
class AuthService extends ChangeNotifier { class AuthService extends ChangeNotifier {
final ApiService api; final ApiService api;
bool _restoring = false; bool _restoring = false;
String? _accessToken;
Future<bool>? _refreshFuture;
final TokenStorageService _tokenStorage = TokenStorageService(); final TokenStorageService _tokenStorage = TokenStorageService();
AuthService({required this.api}) { AuthService({required this.api}) {
api.setTokenProvider(() => token); api.setTokenProvider(() => token);
api.setUnauthorizedHandler(handleTokenExpired); api.setUnauthorizedHandler(_handleUnauthorized);
} }
AuthenticatedUserData? _user; AuthenticatedUserData? _user;
bool get isLoggedIn => _user != null; bool get isLoggedIn => _user != null;
String? get token => _user?.accessToken; String? get token => _accessToken;
String? get userId => _user?.userId; String? get userId => _user?.userId;
String? get username => _user?.username; String? get username => _user?.username;
String? get fullName => _user?.fullName; String? get fullName => _user?.fullName;
@@ -33,11 +35,13 @@ class AuthService extends ChangeNotifier {
required String fullName, required String fullName,
required String accessToken, required String accessToken,
required String email, required String email,
String? refreshToken,
String entriesVisibility = 'private', String entriesVisibility = 'private',
String mileageVisibility = 'private', String mileageVisibility = 'private',
bool isElevated = false, bool isElevated = false,
bool isDisabled = false, bool isDisabled = false,
}) { }) {
_accessToken = accessToken;
_user = AuthenticatedUserData( _user = AuthenticatedUserData(
userId: userId, userId: userId,
username: username, username: username,
@@ -49,7 +53,7 @@ class AuthService extends ChangeNotifier {
isElevated: isElevated, isElevated: isElevated,
disabled: isDisabled, disabled: isDisabled,
); );
_persistToken(accessToken); _persistTokens(accessToken, refreshToken);
notifyListeners(); notifyListeners();
} }
@@ -64,8 +68,9 @@ class AuthService extends ChangeNotifier {
}; };
// 1. Get token // 1. Get token
final tokenResponse = await api.postForm('/token', formData); final tokenResponse = await api.postForm('/token', formData, includeAuth: false);
final accessToken = tokenResponse['access_token']; final accessToken = tokenResponse['access_token'];
final refreshToken = tokenResponse['refresh_token'];
// 2. Get user details // 2. Get user details
final userResponse = await api.get( final userResponse = await api.get(
@@ -83,6 +88,7 @@ class AuthService extends ChangeNotifier {
fullName: userResponse['full_name'], fullName: userResponse['full_name'],
accessToken: accessToken, accessToken: accessToken,
email: userResponse['email'], email: userResponse['email'],
refreshToken: refreshToken,
entriesVisibility: _parseVisibility( entriesVisibility: _parseVisibility(
userResponse['user_entries_visibility'] ?? userResponse['entries_visibility'], userResponse['user_entries_visibility'] ?? userResponse['entries_visibility'],
'private', 'private',
@@ -103,33 +109,31 @@ class AuthService extends ChangeNotifier {
// read token from secure storage (with fallback) // read token from secure storage (with fallback)
final token = await _tokenStorage.getToken(); final token = await _tokenStorage.getToken();
if (token == null || token.isEmpty) return; if (token == null || token.isEmpty) return;
_accessToken = token;
final userResponse = await api.get( final userResponse = await api.get(
'/users/me', '/users/me',
headers: {
'Authorization': 'Bearer $token',
'accept': 'application/json',
},
); );
setLoginData( final restoredAccessToken = _accessToken ?? token;
userId: userResponse['user_id'], setLoginData(
username: userResponse['username'], userId: userResponse['user_id'],
fullName: userResponse['full_name'], username: userResponse['username'],
accessToken: token, fullName: userResponse['full_name'],
email: userResponse['email'], accessToken: restoredAccessToken,
entriesVisibility: _parseVisibility( email: userResponse['email'],
userResponse['user_entries_visibility'] ?? userResponse['entries_visibility'], entriesVisibility: _parseVisibility(
'private', userResponse['user_entries_visibility'] ?? userResponse['entries_visibility'],
), 'private',
mileageVisibility: _parseVisibility( ),
userResponse['user_mileage_visibility'] ?? userResponse['mileage_visibility'], mileageVisibility: _parseVisibility(
'private', userResponse['user_mileage_visibility'] ?? userResponse['mileage_visibility'],
), 'private',
isElevated: _parseIsElevated(userResponse), ),
isDisabled: _parseIsDisabled(userResponse), isElevated: _parseIsElevated(userResponse),
); isDisabled: _parseIsDisabled(userResponse),
} catch (_) { );
} catch (_) {
await _clearToken(); await _clearToken();
} finally { } finally {
_restoring = false; _restoring = false;
@@ -140,12 +144,9 @@ class AuthService extends ChangeNotifier {
final token = await _tokenStorage.getToken(); final token = await _tokenStorage.getToken();
if (token == null || token.isEmpty) return false; if (token == null || token.isEmpty) return false;
try { try {
_accessToken = token;
await api.get( await api.get(
'/validate', '/validate',
headers: {
'Authorization': 'Bearer $token',
'accept': 'application/json',
},
); );
return true; return true;
} catch (_) { } catch (_) {
@@ -154,11 +155,15 @@ class AuthService extends ChangeNotifier {
} }
} }
Future<void> _persistToken(String token) async { Future<void> _persistTokens(String accessToken, String? refreshToken) async {
await _tokenStorage.setToken(token); await _tokenStorage.setToken(accessToken);
if (refreshToken != null && refreshToken.isNotEmpty) {
await _tokenStorage.setRefreshToken(refreshToken);
}
} }
Future<void> _clearToken() async { Future<void> _clearToken() async {
_accessToken = null;
await _tokenStorage.clearToken(); await _tokenStorage.clearToken();
} }
@@ -181,6 +186,61 @@ class AuthService extends ChangeNotifier {
await api.postForm('/register', formData); await api.postForm('/register', formData);
} }
Future<bool> _handleUnauthorized() async {
if (_refreshFuture != null) {
return _refreshFuture!;
}
_refreshFuture = _refreshTokens();
final refreshed = await _refreshFuture!;
_refreshFuture = null;
return refreshed;
}
Future<bool> _refreshTokens() async {
final refreshToken = await _tokenStorage.getRefreshToken();
if (refreshToken == null || refreshToken.isEmpty) {
await handleTokenExpired();
return false;
}
try {
final response = await api.post(
'/token/refresh',
{'refresh_token': refreshToken},
includeAuth: false,
allowRetry: false,
);
final accessToken = response['access_token'];
final newRefreshToken = response['refresh_token'];
if (accessToken is! String ||
accessToken.isEmpty ||
newRefreshToken is! String ||
newRefreshToken.isEmpty) {
await handleTokenExpired();
return false;
}
_accessToken = accessToken;
await _persistTokens(accessToken, newRefreshToken);
if (_user != null) {
_user = AuthenticatedUserData(
userId: _user!.userId,
username: _user!.username,
fullName: _user!.fullName,
accessToken: accessToken,
email: _user!.email,
entriesVisibility: _user!.entriesVisibility,
mileageVisibility: _user!.mileageVisibility,
isElevated: _user!.isElevated,
isDisabled: _user!.disabled,
);
}
notifyListeners();
return true;
} catch (_) {
await handleTokenExpired();
return false;
}
}
Future<void> handleTokenExpired() async { Future<void> handleTokenExpired() async {
_user = null; _user = null;
await _clearToken(); await _clearToken();

41
lib/services/token_storage_service.dart
View File

@@ -10,7 +10,8 @@ class TokenStorageService {
factory TokenStorageService() => _instance; factory TokenStorageService() => _instance;
static const _tokenKey = 'auth_token'; static const _accessTokenKey = 'auth_token';
static const _refreshTokenKey = 'refresh_token';
final FlutterSecureStorage _secureStorage = const FlutterSecureStorage(); final FlutterSecureStorage _secureStorage = const FlutterSecureStorage();
Future<SharedPreferences> get _prefs async => Future<SharedPreferences> get _prefs async =>
@@ -18,17 +19,17 @@ class TokenStorageService {
Future<void> setToken(String token) async { Future<void> setToken(String token) async {
try { try {
await _secureStorage.write(key: _tokenKey, value: token); await _secureStorage.write(key: _accessTokenKey, value: token);
} catch (_) { } catch (_) {
// ignore secure storage failures in debug/unsupported environments // ignore secure storage failures in debug/unsupported environments
} }
final prefs = await _prefs; final prefs = await _prefs;
await prefs.setString(_tokenKey, token); await prefs.setString(_accessTokenKey, token);
} }
Future<String?> getToken() async { Future<String?> getToken() async {
try { try {
final secured = await _secureStorage.read(key: _tokenKey); final secured = await _secureStorage.read(key: _accessTokenKey);
if (secured != null && secured.isNotEmpty) { if (secured != null && secured.isNotEmpty) {
return secured; return secured;
} }
@@ -36,22 +37,48 @@ class TokenStorageService {
// ignore and fall back // ignore and fall back
} }
final prefs = await _prefs; final prefs = await _prefs;
final token = prefs.getString(_tokenKey); final token = prefs.getString(_accessTokenKey);
return (token == null || token.isEmpty) ? null : token; return (token == null || token.isEmpty) ? null : token;
} }
Future<void> clearToken() async { Future<void> clearToken() async {
try { try {
await _secureStorage.delete(key: _tokenKey); await _secureStorage.delete(key: _accessTokenKey);
await _secureStorage.delete(key: _refreshTokenKey);
} catch (_) { } catch (_) {
// ignore // ignore
} }
final prefs = await _prefs; final prefs = await _prefs;
await prefs.remove(_tokenKey); await prefs.remove(_accessTokenKey);
await prefs.remove(_refreshTokenKey);
} }
Future<bool> hasToken() async { Future<bool> hasToken() async {
final token = await getToken(); final token = await getToken();
return token != null && token.isNotEmpty; return token != null && token.isNotEmpty;
} }
Future<void> setRefreshToken(String token) async {
try {
await _secureStorage.write(key: _refreshTokenKey, value: token);
} catch (_) {
// ignore secure storage failures in debug/unsupported environments
}
final prefs = await _prefs;
await prefs.setString(_refreshTokenKey, token);
}
Future<String?> getRefreshToken() async {
try {
final secured = await _secureStorage.read(key: _refreshTokenKey);
if (secured != null && secured.isNotEmpty) {
return secured;
}
} catch (_) {
// ignore and fall back
}
final prefs = await _prefs;
final token = prefs.getString(_refreshTokenKey);
return (token == null || token.isEmpty) ? null : token;
}
} }

2
pubspec.yaml
View File

@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts # In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix. # of the product and file versions while build-number is used as the build suffix.
version: 0.7.6+14 version: 0.7.7+15
environment: environment:
sdk: ^3.8.1 sdk: ^3.8.1

1
test/pages/dashboard_page_test.dart
View File

@@ -1,3 +1,4 @@
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';