QoL changes
All checks were successful
All checks were successful
This commit is contained in:
@@ -1,15 +1,13 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
|
||||
import 'package:mileograph_flutter/objects/objects.dart';
|
||||
import 'package:mileograph_flutter/services/apiService.dart';
|
||||
import 'package:mileograph_flutter/services/tokenStorageService.dart';
|
||||
|
||||
class AuthService extends ChangeNotifier {
|
||||
final ApiService api;
|
||||
static const _tokenKey = 'auth_token';
|
||||
bool _restoring = false;
|
||||
|
||||
// secure storage instance
|
||||
final FlutterSecureStorage _storage = const FlutterSecureStorage();
|
||||
final TokenStorageService _tokenStorage = TokenStorageService();
|
||||
|
||||
AuthService({required this.api});
|
||||
|
||||
@@ -74,10 +72,10 @@ class AuthService extends ChangeNotifier {
|
||||
|
||||
Future<void> tryRestoreSession() async {
|
||||
if (_restoring || _user != null) return;
|
||||
_restoring = true;
|
||||
try {
|
||||
// read token from secure storage
|
||||
final token = await _storage.read(key: _tokenKey);
|
||||
_restoring = true;
|
||||
try {
|
||||
// read token from secure storage (with fallback)
|
||||
final token = await _tokenStorage.getToken();
|
||||
if (token == null || token.isEmpty) return;
|
||||
|
||||
final userResponse = await api.get(
|
||||
@@ -103,11 +101,11 @@ class AuthService extends ChangeNotifier {
|
||||
}
|
||||
|
||||
Future<void> _persistToken(String token) async {
|
||||
await _storage.write(key: _tokenKey, value: token);
|
||||
await _tokenStorage.setToken(token);
|
||||
}
|
||||
|
||||
Future<void> _clearToken() async {
|
||||
await _storage.delete(key: _tokenKey);
|
||||
await _tokenStorage.clearToken();
|
||||
}
|
||||
|
||||
Future<void> register({
|
||||
|
||||
Reference in New Issue
Block a user