Add auth request ui

CodeDoctorDE · CodeDoctorDE · commit 1575b4c0bbfc · 2025-06-13T19:32:55.000+02:00
diff --git a/api/lib/helpers.dart b/api/lib/helpers.dart
@@ -0,0 +1 @@
+export 'src/helpers/crypto.dart';
diff --git a/api/lib/setonix_api.dart b/api/lib/setonix_api.dart
@@ -1,6 +1,7 @@
 /// The Linwood Setonix API
 library;
 
+export 'helpers.dart';
 export 'models.dart';
 export 'event.dart';
 export 'services.dart';
diff --git a/api/lib/src/helpers/crypto.dart b/api/lib/src/helpers/crypto.dart
@@ -1,11 +1,10 @@
 import 'dart:typed_data';
 
 import 'package:convert/convert.dart';
-import 'package:cryptography_plus/cryptography_plus.dart';
+import 'package:crypto/crypto.dart';
 
-Future<String> generateFingerprint(Uint8List publicKeyBytes,
-    [bool short = false]) async {
-  final digest = await Sha256().hash(publicKeyBytes);
+String generateFingerprint(Uint8List publicKeyBytes, [bool short = false]) {
+  final digest = sha256.convert(publicKeyBytes);
   var hexString = hex.encode(digest.bytes);
   if (short) {
     hexString = hexString.substring(0, 32);
diff --git a/api/lib/src/models/meta.dart b/api/lib/src/models/meta.dart
@@ -1,6 +1,7 @@
 import 'dart:typed_data';
 
 import 'package:dart_mappable/dart_mappable.dart';
+import 'package:setonix_api/src/helpers/crypto.dart';
 
 part 'meta.mapper.dart';
 
@@ -79,4 +80,7 @@ final class SetonixAccount {
     required this.publicKey,
     required this.name,
   });
+
+  String getFingerprint([bool short = false]) =>
+      generateFingerprint(publicKey, short);
 }
diff --git a/api/pubspec.lock b/api/pubspec.lock
@@ -146,7 +146,7 @@ packages:
     source: hosted
     version: "1.19.1"
   convert:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: convert
       sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
diff --git a/api/pubspec.yaml b/api/pubspec.yaml
@@ -28,6 +28,7 @@ dependencies:
       ref: b7787191b0705ff0a22149409b1b360468d9e06d
   crypto: ^3.0.5
   collection: ^1.18.0
+  convert: ^3.1.2
   # path: ^1.8.0
 
 dev_dependencies:
diff --git a/app/lib/bloc/world/bloc.dart b/app/lib/bloc/world/bloc.dart
@@ -1,4 +1,5 @@
 import 'package:bloc_concurrency/bloc_concurrency.dart';
+import 'package:cryptography_plus/cryptography_plus.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart' show ColorScheme;
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -201,4 +202,23 @@ class WorldBloc extends Bloc<PlayableWorldEvent, ClientWorldState> {
       // ignore: empty_catches
     } catch (e) {}
   }
+
+  Future<void> authenticate(SetonixAccount account) async {
+    final challenge = state.world.authRequest?.challenge;
+    if (challenge == null) {
+      return;
+    }
+    final generator = Ed25519();
+    final keyPair = SimpleKeyPairData(
+      account.privateKey,
+      publicKey: SimplePublicKey(account.publicKey, type: KeyPairType.ed25519),
+      type: KeyPairType.ed25519,
+    );
+    final signature = await generator.sign(challenge, keyPair: keyPair);
+    final request = AuthenticateRequest(
+      Uint8List.fromList(signature.bytes),
+      account.publicKey,
+    );
+    process(request);
+  }
 }
diff --git a/app/lib/l10n/app_en.arb b/app/lib/l10n/app_en.arb
@@ -259,5 +259,7 @@
   "backupKey": "Backup key",
   "importAccounts": "Import accounts",
   "importAccountsDescription": "Are you sure you want to import the accounts?",
-  "backupAllKeys": "Backup all keys"
+  "backupAllKeys": "Backup all keys",
+  "noAccount": "There are no accounts available",
+  "authenticateRequired": "Authentication is required to connect to the server"
 }
diff --git a/app/lib/pages/game/auth.dart b/app/lib/pages/game/auth.dart
@@ -1,46 +1,131 @@
 import 'dart:ui';
 
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:material_leap/material_leap.dart';
 import 'package:phosphor_flutter/phosphor_flutter.dart';
 import 'package:setonix/api/settings.dart';
+import 'package:setonix/bloc/world/bloc.dart';
+import 'package:setonix/bloc/world/state.dart';
 import 'package:setonix/pages/settings/home.dart';
+import 'package:setonix/services/file_system.dart';
 import 'package:setonix/src/generated/i18n/app_localizations.dart';
+import 'package:setonix_api/setonix_api.dart';
 
-class AuthGameView extends StatelessWidget {
+class AuthGameView extends StatefulWidget {
   const AuthGameView({super.key});
 
+  @override
+  State<AuthGameView> createState() => _AuthGameViewState();
+}
+
+class _AuthGameViewState extends State<AuthGameView> {
+  late final SetonixFileSystem _fileSystem;
+  Future<List<SetonixAccount>>? _keysFuture;
+
+  @override
+  void initState() {
+    super.initState();
+    _fileSystem = context.read<SetonixFileSystem>();
+    _buildKeysFuture();
+  }
+
+  void _buildKeysFuture() {
+    _keysFuture = _fileSystem.getAccounts();
+  }
+
   @override
   Widget build(BuildContext context) {
-    return Stack(
-      children: [
-        BackdropFilter(
-          filter: ImageFilter.blur(sigmaX: 5, sigmaY: 5),
-          child: Container(
-            color: Colors.black.withValues(alpha: 0.5),
-          ),
-        ),
-        ResponsiveAlertDialog(
-          title: Text(AppLocalizations.of(context).authenticate),
-          constraints: BoxConstraints(
-            maxWidth: LeapBreakpoints.medium,
-          ),
-          headerActions: [
-            IconButton(
-              icon: const Icon(PhosphorIconsLight.gear),
-              onPressed: () {
-                openSettings(context, view: SettingsView.accounts);
-              },
-            ),
-          ],
-          content: Column(
-            mainAxisSize: MainAxisSize.min,
+    return BlocBuilder<WorldBloc, ClientWorldState>(
+        buildWhen: (previous, current) =>
+            previous.world.authRequest != current.world.authRequest,
+        builder: (context, state) {
+          final authRequest = state.world.authRequest;
+          if (authRequest == null) {
+            return const SizedBox.shrink();
+          }
+          return Stack(
             children: [
-              Text(AppLocalizations.of(context).authenticateDescription),
+              BackdropFilter(
+                filter: ImageFilter.blur(sigmaX: 5, sigmaY: 5),
+                child: Container(
+                  color: Colors.black.withValues(alpha: 0.5),
+                ),
+              ),
+              ResponsiveAlertDialog(
+                title: Text(AppLocalizations.of(context).authenticate),
+                constraints: BoxConstraints(
+                  maxWidth: LeapBreakpoints.medium,
+                ),
+                headerActions: [
+                  IconButton(
+                    icon: const Icon(PhosphorIconsLight.gear),
+                    onPressed: () async {
+                      await openSettings(context, view: SettingsView.accounts);
+                      setState(() {
+                        _buildKeysFuture();
+                      });
+                    },
+                  ),
+                ],
+                content: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    Text(AppLocalizations.of(context).authenticateDescription),
+                    if (authRequest.isRequired)
+                      Text(
+                        AppLocalizations.of(context).authenticateRequired,
+                        style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                              color: Colors.red,
+                            ),
+                      ),
+                    Flexible(
+                      child: FutureBuilder<List<SetonixAccount>>(
+                        future: _keysFuture,
+                        builder: (context, snapshot) {
+                          if (snapshot.connectionState ==
+                              ConnectionState.waiting) {
+                            return const Center(
+                                child: CircularProgressIndicator());
+                          } else if (snapshot.hasError) {
+                            return Center(
+                              child: Text(
+                                AppLocalizations.of(context).error,
+                              ),
+                            );
+                          } else if (!snapshot.hasData ||
+                              snapshot.data!.isEmpty) {
+                            return Center(
+                              child:
+                                  Text(AppLocalizations.of(context).noAccount),
+                            );
+                          } else {
+                            final accounts = snapshot.data!;
+                            return ListView.builder(
+                              shrinkWrap: true,
+                              itemCount: accounts.length,
+                              itemBuilder: (context, index) {
+                                final account = accounts[index];
+                                return ListTile(
+                                  title: Text(account.name),
+                                  subtitle: Text(account.getFingerprint(true)),
+                                  onTap: () {
+                                    context
+                                        .read<WorldBloc>()
+                                        .authenticate(account);
+                                  },
+                                );
+                              },
+                            );
+                          }
+                        },
+                      ),
+                    ),
+                  ],
+                ),
+              )
             ],
-          ),
-        )
-      ],
-    );
+          );
+        });
   }
 }
diff --git a/app/lib/pages/settings/accounts.dart b/app/lib/pages/settings/accounts.dart
@@ -7,6 +7,7 @@ import 'package:setonix/src/generated/i18n/app_localizations.dart';
 import 'package:material_leap/material_leap.dart';
 import 'package:phosphor_flutter/phosphor_flutter.dart';
 import 'package:setonix/services/file_system.dart';
+import 'package:setonix_api/setonix_api.dart';
 
 import '../../bloc/settings.dart';
 
@@ -20,7 +21,7 @@ class AccountsSettingsPage extends StatefulWidget {
 
 class _AccountsSettingsPageState extends State<AccountsSettingsPage> {
   late final KeyFileSystem _privateKeyFileSystem, _publicKeyFileSystem;
-  Future<List<(String, String)>>? _keysFuture;
+  Future<List<SetonixAccount>>? _keysFuture;
   late final SetonixFileSystem _fileSystem;
 
   @override
@@ -33,12 +34,7 @@ class _AccountsSettingsPageState extends State<AccountsSettingsPage> {
   }
 
   void _buildKeysFuture() {
-    _keysFuture = _privateKeyFileSystem
-        .getKeys()
-        .then((e) => Future.wait(e.map((key) async {
-              final fingerprint = await _fileSystem.getFingerprint(key, true);
-              return (key, fingerprint);
-            })));
+    _keysFuture = _fileSystem.getAccounts();
   }
 
   @override
@@ -74,19 +70,21 @@ class _AccountsSettingsPageState extends State<AccountsSettingsPage> {
           ),
         ],
       ),
-      body: FutureBuilder<List<(String, String)>>(
+      body: FutureBuilder<List<SetonixAccount>>(
         future: _keysFuture,
         builder: (context, state) {
-          final keys = state.data ?? <(String, String)>[];
+          final accounts = state.data ?? <SetonixAccount>[];
           return ListView.builder(
-            itemCount: keys.length,
+            itemCount: accounts.length,
             itemBuilder: (context, index) {
-              final (key, fingerprint) = keys[index];
+              final account = accounts[index];
+              final key = account.name;
+              final fingerprint = account.getFingerprint(true);
               void deleteKey() {
                 _privateKeyFileSystem.deleteFile(key);
                 _publicKeyFileSystem.deleteFile(key);
                 setState(() {
-                  keys.removeAt(index);
+                  accounts.removeAt(index);
                 });
               }
 
diff --git a/app/lib/services/file_system.dart b/app/lib/services/file_system.dart
@@ -9,7 +9,6 @@ import 'package:idb_shim/idb.dart';
 import 'package:lw_file_system/lw_file_system.dart';
 import 'package:setonix/api/open.dart';
 import 'package:setonix/api/storage.dart';
-import 'package:setonix/helpers/crypto.dart';
 import 'package:setonix_api/setonix_api.dart';
 
 const imageTypeGroup = fs.XTypeGroup(
@@ -272,18 +271,19 @@ class SetonixFileSystem {
     }
   }
 
+  Future<List<SetonixAccount>> getAccounts([List<String>? names]) async {
+    names ??= await privateKeySystem.getKeys();
+    return Future.wait(
+      names.map((name) => getAccount(name)),
+    ).then((accounts) => accounts.nonNulls.toList());
+  }
+
   Future<SetonixData> exportAccounts(
       [List<String>? names, List<SetonixAccount>? accounts]) async {
     var data = SetonixData.empty().setMetadata(FileMetadata(
       type: FileType.accounts,
     ));
-    names ??= await privateKeySystem.getKeys();
-    final allAccounts = accounts ??
-        (await Future.wait(
-          names.map((name) => getAccount(name)),
-        ))
-            .whereType<SetonixAccount>()
-            .toList();
+    final allAccounts = accounts ?? await getAccounts(names);
     for (final account in allAccounts) {
       final privateKey = account.privateKey;
       final publicKey = account.publicKey;

Original file line number	Diff line number	Diff line change
`@@ -259,5 +259,7 @@`
`259`	`259`	`"backupKey": "Backup key",`
`260`	`260`	`"importAccounts": "Import accounts",`
`261`	`261`	`"importAccountsDescription": "Are you sure you want to import the accounts?",`
`262`		`- "backupAllKeys": "Backup all keys"`
	`262`	`+ "backupAllKeys": "Backup all keys",`
	`263`	`+ "noAccount": "There are no accounts available",`
	`264`	`+ "authenticateRequired": "Authentication is required to connect to the server"`
`263`	`265`	`}`