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

feat: login with token if MiAuth is not supported #493

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
Dec 10, 2024
Merged

feat: login with token if MiAuth is not supported #493

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
46 changes: 33 additions & 13 deletions lib/view/page/login_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'dart:async';
import 'dart:ui';

import 'package:collection/collection.dart';
Expand All @@ -9,8 +10,10 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:url_launcher/url_launcher.dart' hide launchUrl;

import '../../i18n/strings.g.dart';
import '../../provider/api/meta_notifier_provider.dart';
import '../../provider/miauth_notifier_provider.dart';
import '../../provider/misskey_servers_provider.dart';
import '../../util/future_with_dialog.dart';
import '../../util/launch_url.dart';
import '../../util/punycode.dart';
import '../dialog/misskey_server_list_dialog.dart';
Expand All @@ -21,20 +24,31 @@ import '../widget/misskey_server_background.dart';
class LoginPage extends HookConsumerWidget {
const LoginPage({super.key});

void _launchMiAuth(WidgetRef ref, String host) {
final trimmed =
toAscii(host.trim().replaceFirst('https://', '').split('/').first)
.toLowerCase();
Future<void> _launchMiAuth(WidgetRef ref, String hostText) async {
final trimmed = toAscii(
hostText.trim().replaceFirst(RegExp('https?://'), '').split('/').first,
).toLowerCase();
try {
final meta = await ref.read(metaNotifierProvider(trimmed).future);
if (!ref.context.mounted) return;
if (meta.features?.miauth case false || null) {
unawaited(ref.context.push('/login/token?host=$trimmed'));
return;
}
} catch (_) {}
if (!ref.context.mounted) return;
final url =
ref.read(miAuthNotifierProvider.notifier).buildMiAuthUrl(trimmed);
launchUrl(
ref,
url,
mode: defaultTargetPlatform == TargetPlatform.iOS
? LaunchMode.inAppWebView
: null,
unawaited(
launchUrl(
ref,
url,
mode: defaultTargetPlatform == TargetPlatform.iOS
? LaunchMode.inAppWebView
: null,
),
);
ref.context.push('/login/authenticate');
unawaited(ref.context.push('/login/authenticate'));
}

@override
Expand Down Expand Up @@ -116,7 +130,10 @@ class LoginPage extends HookConsumerWidget {
controller: controller,
focusNode: focusNode,
autofocus: true,
onSubmitted: (host) => _launchMiAuth(ref, host),
onSubmitted: (host) => futureWithDialog(
context,
_launchMiAuth(ref, host),
),
),
Align(
alignment: Alignment.centerLeft,
Expand All @@ -141,7 +158,10 @@ class LoginPage extends HookConsumerWidget {
const SizedBox(height: 16.0),
ElevatedButton.icon(
onPressed: host.value.isNotEmpty
? () => _launchMiAuth(ref, host.value)
? () => futureWithDialog(
context,
_launchMiAuth(ref, host.value),
)
: null,
icon: const Icon(Icons.open_in_browser),
label: Text(t.aria.authenticate),
Expand Down
42 changes: 23 additions & 19 deletions lib/view/page/token_login_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,14 @@ class TokenLoginPage extends HookConsumerWidget {

final String? host;

Future<void> _login(WidgetRef ref, String host, String token) async {
final trimmed =
toAscii(host.trim().replaceFirst('https://', '').split('/').first)
.toLowerCase();
await futureWithDialog(
ref.context,
ref
.read(accountsNotifierProvider.notifier)
.loginWithToken(trimmed, token),
);
Future<void> _login(WidgetRef ref, String hostText, String token) async {
final trimmed = toAscii(
hostText.trim().replaceFirst(RegExp('https?://'), '').split('/').first,
).toLowerCase();
if (!ref.context.mounted) return;
await ref
.read(accountsNotifierProvider.notifier)
.loginWithToken(trimmed, token);
if (!ref.context.mounted) return;
ref.context.go('/timelines');
}
Expand Down Expand Up @@ -107,7 +105,7 @@ class TokenLoginPage extends HookConsumerWidget {
MisskeyServerAutocomplete(
controller: hostController,
focusNode: hostFocusNode,
autofocus: true,
autofocus: this.host?.isEmpty ?? true,
onSubmitted: (_) => tokenFocusNode.requestFocus(),
),
Align(
Expand Down Expand Up @@ -139,10 +137,13 @@ class TokenLoginPage extends HookConsumerWidget {
submitActivator: VoidCallbackIntent(
() => hostController.text.isNotEmpty &&
tokenController.text.isNotEmpty
? _login(
ref,
hostController.text,
tokenController.text,
? futureWithDialog(
context,
_login(
ref,
hostController.text,
tokenController.text,
),
)
: null,
),
Expand All @@ -167,10 +168,13 @@ class TokenLoginPage extends HookConsumerWidget {
ElevatedButton.icon(
onPressed:
host.value.isNotEmpty && token.value.isNotEmpty
? () => _login(
ref,
hostController.text,
tokenController.text,
? () => futureWithDialog(
context,
_login(
ref,
hostController.text,
tokenController.text,
),
)
: null,
icon: const Icon(Icons.key),
Expand Down
2 changes: 1 addition & 1 deletion lib/view/widget/misskey_server_autocomplete.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class MisskeyServerAutocomplete extends ConsumerWidget {
text: toAscii(
text
.trim()
.replaceFirst('https://', '')
.replaceFirst(RegExp('https?://'), '')
.split('/')
.first,
).toLowerCase(),
Expand Down
Loading