这是indexloc提供的服务，不要输入任何密码
Skip to content

fix: do not add account if failed to save token #308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 22, 2024
Merged

fix: do not add account if failed to save token #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions lib/provider/accounts_notifier_provider.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';

import '../model/account.dart';
import 'dio_provider.dart';
import 'emojis_notifier_provider.dart';
import 'shared_preferences_provider.dart';
import 'tokens_notifier_provider.dart';

Expand Down Expand Up @@ -37,14 +36,9 @@ class AccountsNotifier extends _$AccountsNotifier {
if (state.contains(account)) {
return;
}
await ref.read(tokensNotifierProvider.notifier).add(account, token);
state = [...state, account];
await Future.wait([
_save(),
ref.read(tokensNotifierProvider.notifier).add(account, token),
]);
await ref
.read(emojisNotifierProvider(account.host).notifier)
.reloadEmojis();
await _save();
}

Future<bool> loginWithToken(String host, String token) async {
Expand Down
2 changes: 1 addition & 1 deletion lib/provider/accounts_notifier_provider.g.dart
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 12 additions & 13 deletions lib/view/page/authenticate_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,18 @@ class AuthenticatePage extends ConsumerWidget {
),
body: Center(
child: ElevatedButton(
onPressed: () => futureWithDialog(
context,
Future(() async {
final succeeded =
await ref.read(miAuthNotifierProvider.notifier).check();
if (!context.mounted) return;
if (succeeded) {
context.go('/timelines');
} else {
await showMessageDialog(context, t.misskey.loginFailed);
}
}),
),
onPressed: () async {
final succeeded = await futureWithDialog(
context,
ref.read(miAuthNotifierProvider.notifier).check(),
);
if (!context.mounted) return;
if (succeeded ?? false) {
context.go('/timelines');
} else {
await showMessageDialog(context, t.misskey.loginFailed);
}
},
child: Text(t.aria.authenticated),
),
),
Expand Down