refactor: auth

This commit is contained in:
cogwheel0
2025-08-29 12:58:56 +05:30
parent abc40b3958
commit f0b9e8e2b0
6 changed files with 73 additions and 34 deletions

View File

@@ -86,6 +86,8 @@ class AuthStateManager extends StateNotifier<AuthState> {
final Ref _ref;
final AuthCacheManager _cacheManager = AuthCacheManager();
// Prevent overlapping silent-login attempts from multiple triggers
Future<bool>? _silentLoginFuture;
/// Initialize auth state from storage
Future<void> _initialize() async {
@@ -330,6 +332,22 @@ class AuthStateManager extends StateNotifier<AuthState> {
/// Perform silent auto-login with saved credentials
Future<bool> silentLogin() async {
// Coalesce concurrent calls (e.g., UI + interceptor retry)
if (_silentLoginFuture != null) {
return await _silentLoginFuture!;
}
final thisAttempt = _performSilentLogin();
_silentLoginFuture = thisAttempt;
try {
return await thisAttempt;
} finally {
if (identical(_silentLoginFuture, thisAttempt)) {
_silentLoginFuture = null;
}
}
}
Future<bool> _performSilentLogin() async {
state = state.copyWith(
status: AuthStatus.loading,
isLoading: true,
@@ -401,7 +419,11 @@ class AuthStateManager extends StateNotifier<AuthState> {
/// Handle token invalidation (called by API service)
Future<void> onTokenInvalidated() async {
// Avoid spamming logs if multiple requests invalidate at once
final reloginInProgress = _silentLoginFuture != null;
if (!reloginInProgress) {
DebugLogger.auth('Auth token invalidated');
}
// Clear token from storage
final storage = _ref.read(optimizedStorageServiceProvider);
@@ -418,7 +440,9 @@ class AuthStateManager extends StateNotifier<AuthState> {
// Attempt silent re-login if credentials are available
final hasCredentials = await storage.getSavedCredentials() != null;
if (hasCredentials) {
if (!reloginInProgress) {
DebugLogger.auth('Attempting silent re-login after token invalidation');
}
await silentLogin();
}
}

View File

@@ -233,7 +233,7 @@ final currentUserProvider = FutureProvider<User?>((ref) async {
// Helper provider to force refresh auth state - now using unified system
final refreshAuthStateProvider = Provider<void>((ref) {
// This provider can be invalidated to force refresh the unified auth system
ref.read(refreshAuthProvider)();
Future.microtask(() => ref.read(authActionsProvider).refresh());
return;
});

View File

@@ -5,35 +5,53 @@ import '../../../core/providers/app_providers.dart';
/// Unified auth providers using the new auth state manager
/// These replace the old auth providers for better efficiency
/// Login action provider (schedules side-effect outside provider build)
final loginActionProvider = Provider.family<Future<bool>, Map<String, String>>(
(ref, credentials) async {
final authManager = ref.read(authStateManagerProvider.notifier);
/// Imperative auth actions wrapper to avoid side-effects during provider build
class AuthActions {
final Ref _ref;
AuthActions(this._ref);
final username = credentials['username']!;
final password = credentials['password']!;
final rememberCredentials = credentials['remember'] == 'true';
AuthStateManager get _auth =>
_ref.read(authStateManagerProvider.notifier);
// Defer the mutation to avoid changing other providers during build
return Future(() => authManager.login(
Future<bool> login(
String username,
String password, {
bool rememberCredentials = false,
}) {
// Defer mutation to a microtask to avoid provider-build side-effects
return Future(() => _auth.login(
username,
password,
rememberCredentials: rememberCredentials,
));
},
);
}
/// Silent login action provider - returns a callback to run later
final silentLoginActionProvider = Provider<Future<bool> Function()>((ref) {
final authManager = ref.read(authStateManagerProvider.notifier);
return () => authManager.silentLogin();
});
Future<bool> loginWithApiKey(
String apiKey, {
bool rememberCredentials = false,
}) {
return Future(() => _auth.loginWithApiKey(
apiKey,
rememberCredentials: rememberCredentials,
));
}
/// Logout action provider - returns a callback to run later
final logoutActionProvider = Provider<Future<void> Function()>((ref) {
final authManager = ref.read(authStateManagerProvider.notifier);
return () => authManager.logout();
});
Future<bool> silentLogin() {
return Future(() => _auth.silentLogin());
}
Future<void> logout() {
return Future(() => _auth.logout());
}
Future<void> refresh() {
return Future(() => _auth.refresh());
}
}
final authActionsProvider = Provider<AuthActions>((ref) => AuthActions(ref));
// Legacy action providers have been replaced by `authActionsProvider`
/// Check if saved credentials exist
final hasSavedCredentialsProvider2 = FutureProvider<bool>((ref) async {
@@ -70,11 +88,7 @@ final authStatusProvider = Provider<AuthStatus>((ref) {
return ref.watch(authStateManagerProvider.select((state) => state.status));
});
/// Helper provider to trigger auth refresh - returns a callback
final refreshAuthProvider = Provider<Future<void> Function()>((ref) {
final authManager = ref.read(authStateManagerProvider.notifier);
return () => authManager.refresh();
});
// Use `ref.read(authActionsProvider).refresh()` instead of refresh providers
/// Provider to watch for auth state changes and update API service
final authApiIntegrationProvider = Provider<void>((ref) {

View File

@@ -16,6 +16,7 @@ import '../../../shared/widgets/conduit_components.dart';
import '../../../core/auth/auth_state_manager.dart';
import '../../../core/utils/debug_logger.dart';
import 'package:conduit/l10n/app_localizations.dart';
import '../providers/unified_auth_providers.dart';
class AuthenticationPage extends ConsumerStatefulWidget {
final ServerConfig serverConfig;
@@ -71,16 +72,16 @@ class _AuthenticationPageState extends ConsumerState<AuthenticationPage> {
});
try {
final authManager = ref.read(authStateManagerProvider.notifier);
final actions = ref.read(authActionsProvider);
bool success;
if (_useApiKey) {
success = await authManager.loginWithApiKey(
success = await actions.loginWithApiKey(
_apiKeyController.text.trim(),
rememberCredentials: true, // Consistent with credentials method
);
} else {
success = await authManager.login(
success = await actions.login(
_usernameController.text.trim(),
_passwordController.text,
rememberCredentials: true,

View File

@@ -762,7 +762,7 @@ class ProfilePage extends ConsumerWidget {
);
if (confirm) {
await ref.read(logoutActionProvider)();
await ref.read(authActionsProvider).logout();
}
}
}

View File

@@ -181,7 +181,7 @@ class _ConduitAppState extends ConsumerState<ConduitApp> {
hasSavedCredentialsProvider2.future,
);
if (hasCreds) {
await ref.read(silentLoginActionProvider)();
await ref.read(authActionsProvider).silentLogin();
}
} catch (_) {
// Ignore errors, fallback to showing unified page