mirror
/
relatica
kopia lustrzana https://gitlab.com/mysocialportal/relatica
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix cycling of multiple logins on app startup

merge-requests/67/merge
Hank Grabowski 2024-12-19 16:12:48 -05:00
rodzic 4eba9eb6a9
commit 1e6b16291a
2 zmienionych plików z 7 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
lib/riverpod_controllers/account_services.dart
Wyświetl plik

@ -103,7 +103,7 @@ class CredentialSignin extends _$CredentialSignin {
return false; return false;
} }
FutureResult<Profile, ExecError> signIn() async { FutureResult<Profile, ExecError> signIn(bool activateProfileOnSuccess) async {
final result = final result =
await credentials.signIn(ref).andThenAsync((signedInCredentials) async { await credentials.signIn(ref).andThenAsync((signedInCredentials) async {
ref.read(statusServiceProvider.notifier).setStatus( ref.read(statusServiceProvider.notifier).setStatus(
@ -126,7 +126,7 @@ class CredentialSignin extends _$CredentialSignin {
ref ref
.read(statusServiceProvider.notifier) .read(statusServiceProvider.notifier)
.setStatus('Loaded user profile ${profileData.handle}'); .setStatus('Loaded user profile ${profileData.handle}');
if (ref.read(loggedInProfilesProvider).isEmpty) { if (activateProfileOnSuccess) {
ref.read(activeProfileProvider.notifier).setActiveProfile(loginProfile); ref.read(activeProfileProvider.notifier).setActiveProfile(loginProfile);
} }
ref.read(loggedInProfilesProvider.notifier).add(loginProfile); ref.read(loggedInProfilesProvider.notifier).add(loginProfile);
@ -158,10 +158,10 @@ class ProfileManager extends _$ProfileManager {
return false; return false;
} }
FutureResult<Profile, ExecError> signIn() async { FutureResult<Profile, ExecError> signIn(bool activateProfileOnSuccess) async {
return await ref return await ref
.read(credentialSigninProvider(profile.credentials).notifier) .read(credentialSigninProvider(profile.credentials).notifier)
.signIn(); .signIn(activateProfileOnSuccess);
} }
Future signOut({bool withNotification = true}) async { Future signOut({bool withNotification = true}) async {
@ -218,7 +218,8 @@ class AccountServicesInitializer extends _$AccountServicesInitializer {
continue; continue;
} }
final pr = await ref.read(profileManagerProvider(p).notifier).signIn(); final pr =
await ref.read(profileManagerProvider(p).notifier).signIn(false);
if (pr.isSuccess) { if (pr.isSuccess) {
final profile = pr.value; final profile = pr.value;
if (profile.id.isNotEmpty && profile.id == lastActiveProfile) { if (profile.id.isNotEmpty && profile.id == lastActiveProfile) {

2
lib/screens/sign_in.dart
Wyświetl plik

@ -444,7 +444,7 @@ class _SignInScreenState extends ConsumerState<SignInScreen> {
buildSnackbar(context, 'Attempting to sign in account...'); buildSnackbar(context, 'Attempting to sign in account...');
final result = final result =
await ref.read(credentialSigninProvider(creds).notifier).signIn(); await ref.read(credentialSigninProvider(creds).notifier).signIn(true);
if (context.mounted && result.isFailure) { if (context.mounted && result.isFailure) {
buildSnackbar(context, 'Error signing in: ${result.error}'); buildSnackbar(context, 'Error signing in: ${result.error}');