A cross platform Audiobookshelf client for Android and iOS
Dart
Let admins export a setup file to sign a new user in
Barnabasb9d09ec6bd4f
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arbindex e8d87e44..5cdb46f1 100644--- a/lib/l10n/app_en.arb+++ b/lib/l10n/app_en.arb@@ -66,7 +66,7 @@"loginFailed": "Login failed","loginSsoFailed": "SSO login failed or was cancelled","loginSsoAuthFailed": "SSO authentication failed. Please try again.",- "loginRestoreFromBackup": "Restore from backup",+ "loginRestoreFromBackup": "Import","loginInvalidBackupFile": "Invalid backup file","loginRestoreBackupTitle": "Restore backup?","loginRestoreBackupWithAccounts": "This will restore all settings and {count} saved account(s). You'll be signed in automatically.",diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dartindex 0f5d4295..be0402db 100644--- a/lib/l10n/app_localizations.dart+++ b/lib/l10n/app_localizations.dart@@ -517,7 +517,7 @@ abstract class AppLocalizations {/// No description provided for @loginRestoreFromBackup.////// In en, this message translates to:- /// **'Restore from backup'**+ /// **'Import'**String get loginRestoreFromBackup;/// No description provided for @loginInvalidBackupFile.diff --git a/lib/l10n/app_localizations_el.dart b/lib/l10n/app_localizations_el.dartindex 52dd1b84..59eff987 100644--- a/lib/l10n/app_localizations_el.dart+++ b/lib/l10n/app_localizations_el.dart@@ -212,7 +212,7 @@ class AppLocalizationsEl extends AppLocalizations {'SSO authentication failed. Please try again.';@override- String get loginRestoreFromBackup => 'Restore from backup';+ String get loginRestoreFromBackup => 'Import';@overrideString get loginInvalidBackupFile => 'Invalid backup file';diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dartindex 30e99342..af9bf3a0 100644--- a/lib/l10n/app_localizations_en.dart+++ b/lib/l10n/app_localizations_en.dart@@ -212,7 +212,7 @@ class AppLocalizationsEn extends AppLocalizations {'SSO authentication failed. Please try again.';@override- String get loginRestoreFromBackup => 'Restore from backup';+ String get loginRestoreFromBackup => 'Import';@overrideString get loginInvalidBackupFile => 'Invalid backup file';diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dartindex c47742cf..4319a1c4 100644--- a/lib/l10n/app_localizations_es.dart+++ b/lib/l10n/app_localizations_es.dart@@ -212,7 +212,7 @@ class AppLocalizationsEs extends AppLocalizations {'SSO authentication failed. Please try again.';@override- String get loginRestoreFromBackup => 'Restore from backup';+ String get loginRestoreFromBackup => 'Import';@overrideString get loginInvalidBackupFile => 'Invalid backup file';diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dartindex c444a47f..19da1bdb 100644--- a/lib/l10n/app_localizations_it.dart+++ b/lib/l10n/app_localizations_it.dart@@ -212,7 +212,7 @@ class AppLocalizationsIt extends AppLocalizations {'SSO authentication failed. Please try again.';@override- String get loginRestoreFromBackup => 'Restore from backup';+ String get loginRestoreFromBackup => 'Import';@overrideString get loginInvalidBackupFile => 'Invalid backup file';diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dartindex 3dde2b9d..c6148200 100644--- a/lib/l10n/app_localizations_ja.dart+++ b/lib/l10n/app_localizations_ja.dart@@ -212,7 +212,7 @@ class AppLocalizationsJa extends AppLocalizations {'SSO authentication failed. Please try again.';@override- String get loginRestoreFromBackup => 'Restore from backup';+ String get loginRestoreFromBackup => 'Import';@overrideString get loginInvalidBackupFile => 'Invalid backup file';diff --git a/lib/l10n/app_localizations_no.dart b/lib/l10n/app_localizations_no.dartindex 35f0418a..85a7d3d1 100644--- a/lib/l10n/app_localizations_no.dart+++ b/lib/l10n/app_localizations_no.dart@@ -212,7 +212,7 @@ class AppLocalizationsNo extends AppLocalizations {'SSO authentication failed. Please try again.';@override- String get loginRestoreFromBackup => 'Restore from backup';+ String get loginRestoreFromBackup => 'Import';@overrideString get loginInvalidBackupFile => 'Invalid backup file';diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dartindex 1bd41451..3dd21b1d 100644--- a/lib/l10n/app_localizations_pt.dart+++ b/lib/l10n/app_localizations_pt.dart@@ -212,7 +212,7 @@ class AppLocalizationsPt extends AppLocalizations {'SSO authentication failed. Please try again.';@override- String get loginRestoreFromBackup => 'Restore from backup';+ String get loginRestoreFromBackup => 'Import';@overrideString get loginInvalidBackupFile => 'Invalid backup file';diff --git a/lib/l10n/app_localizations_ro.dart b/lib/l10n/app_localizations_ro.dartindex 69ba9210..ea38eee0 100644--- a/lib/l10n/app_localizations_ro.dart+++ b/lib/l10n/app_localizations_ro.dart@@ -212,7 +212,7 @@ class AppLocalizationsRo extends AppLocalizations {'SSO authentication failed. Please try again.';@override- String get loginRestoreFromBackup => 'Restore from backup';+ String get loginRestoreFromBackup => 'Import';@overrideString get loginInvalidBackupFile => 'Invalid backup file';diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dartindex 0dc49c37..f944693a 100644--- a/lib/l10n/app_localizations_ru.dart+++ b/lib/l10n/app_localizations_ru.dart@@ -213,7 +213,7 @@ class AppLocalizationsRu extends AppLocalizations {'SSO authentication failed. Please try again.';@override- String get loginRestoreFromBackup => 'Restore from backup';+ String get loginRestoreFromBackup => 'Import';@overrideString get loginInvalidBackupFile => 'Invalid backup file';diff --git a/lib/screens/admin_api_keys_screen.dart b/lib/screens/admin_api_keys_screen.dartindex bd189233..d9e842f2 100644--- a/lib/screens/admin_api_keys_screen.dart+++ b/lib/screens/admin_api_keys_screen.dart@@ -86,7 +86,6 @@ class _AdminApiKeysScreenState extends State<AdminApiKeysScreen> {final owner = (key['user'] as Map?)?['username'] as String? ?? '';final isActive = key['isActive'] as bool? ?? false;final expiresAt = DateTime.tryParse(key['expiresAt'] as String? ?? '');- final lastUsedAt = DateTime.tryParse(key['lastUsedAt'] as String? ?? '');final isExpired = expiresAt != null && expiresAt.isBefore(DateTime.now());final (statusColor, statusLabel) = isExpired@@ -95,7 +94,6 @@ class _AdminApiKeysScreenState extends State<AdminApiKeysScreen> {? (cs.onSurfaceVariant, l.adminApiKeysInactive): (const Color(0xFF4CAF50), l.adminApiKeysActive);- final lastUsedStr = lastUsedAt != null ? l.adminApiKeysLastUsed(_timeAgo(lastUsedAt)) : l.adminApiKeysNeverUsed;final expiryStr = expiresAt != null ? l.adminApiKeysExpiresOn(_fmtDate(expiresAt)) : l.adminApiKeysNeverExpires;return Padding(@@ -121,11 +119,12 @@ class _AdminApiKeysScreenState extends State<AdminApiKeysScreen> {),]),const SizedBox(height: 3),- Text(- [if (owner.isNotEmpty) owner, lastUsedStr].join(' · '),- style: tt.labelSmall?.copyWith(color: cs.onSurface.withValues(alpha: 0.4), fontSize: 11),- maxLines: 1, overflow: TextOverflow.ellipsis,- ),+ if (owner.isNotEmpty)+ Text(+ owner,+ style: tt.labelSmall?.copyWith(color: cs.onSurface.withValues(alpha: 0.4), fontSize: 11),+ maxLines: 1, overflow: TextOverflow.ellipsis,+ ),const SizedBox(height: 1),Text(expiryStr, style: tt.labelSmall?.copyWith(color: cs.onSurface.withValues(alpha: 0.28), fontSize: 10)),])),@@ -188,16 +187,6 @@ class _AdminApiKeysScreenState extends State<AdminApiKeysScreen> {builder: (_) => _ApiKeyEditorSheet(users: widget.users, onCreated: _load));}- String _timeAgo(DateTime dt) {- final l = AppLocalizations.of(context)!;- final d = DateTime.now().difference(dt);- if (d.inSeconds < 60) return l.justNow;- if (d.inMinutes < 60) return l.minutesAgo(d.inMinutes);- if (d.inHours < 24) return l.hoursAgo(d.inHours);- if (d.inDays < 30) return l.daysAgo(d.inDays);- return l.adminUsersMonthsAgo((d.inDays / 30).floor());- }-static const _months = ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'];String _fmtDate(DateTime d) => '${_months[d.month - 1]} ${d.day}, ${d.year}';}diff --git a/lib/screens/admin_users_screen.dart b/lib/screens/admin_users_screen.dartindex d4259160..c6a3f10a 100644--- a/lib/screens/admin_users_screen.dart+++ b/lib/screens/admin_users_screen.dart@@ -1,8 +1,13 @@+import 'dart:convert';+import 'dart:io';+import 'dart:typed_data';import 'package:cached_network_image/cached_network_image.dart';+import 'package:file_picker/file_picker.dart';import 'package:flutter/material.dart';import 'package:provider/provider.dart';import '../providers/auth_provider.dart';import '../providers/library_provider.dart';+import '../services/backup_service.dart';import '../widgets/absorb_page_header.dart';import '../widgets/absorb_wave_icon.dart';import '../l10n/app_localizations.dart';@@ -376,6 +381,12 @@ class _UserDetailScreenState extends State<_UserDetailScreen> {padding: const EdgeInsets.fromLTRB(20, 12, 8, 0),child: Row(children: [Expanded(child: AbsorbPageHeader(title: _username, padding: EdgeInsets.zero)),+ if (!_isRoot)+ IconButton(+ icon: Icon(Icons.ios_share_rounded, color: cs.primary.withValues(alpha: 0.7), size: 20),+ tooltip: 'Create setup file',+ onPressed: _exportSetupFile,+ ),if (!_isRoot)IconButton(icon: Icon(Icons.edit_rounded, color: cs.primary.withValues(alpha: 0.7), size: 20),@@ -771,6 +782,105 @@ class _UserDetailScreenState extends State<_UserDetailScreen> {}));}+ /// Mint an API key for this user and write a one-account .absorb setup file.+ /// The new user imports it from the login screen and is signed straight in.+ /// The file carries a working credential, so it must be handed over privately.+ Future<void> _exportSetupFile() async {+ final auth = context.read<AuthProvider>();+ final api = auth.apiService;+ if (api == null) return;+ final userId = widget.user['id'] as String? ?? '';+ final username = widget.user['username'] as String? ?? '';+ if (userId.isEmpty) return;++ final urlCtrl = TextEditingController(text: auth.serverUrl ?? '');+ final hasHeaders = auth.customHeaders.isNotEmpty;++ final proceed = await showDialog<bool>(+ context: context,+ builder: (ctx) {+ final cs = Theme.of(ctx).colorScheme;+ return AlertDialog(+ title: const Text('Create setup file'),+ content: Column(mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start, children: [+ Text("Creates a sign-in file for $username. They import it from the login screen and they're in.",+ style: TextStyle(fontSize: 13, color: cs.onSurfaceVariant)),+ const SizedBox(height: 14),+ TextField(+ controller: urlCtrl,+ autocorrect: false,+ keyboardType: TextInputType.url,+ decoration: const InputDecoration(labelText: 'Server URL the new user will use', isDense: true),+ ),+ const SizedBox(height: 10),+ Text(+ hasHeaders+ ? 'An API key will be created for this user and your custom headers are included so they can reach the server. Treat the file like a password.'+ : 'An API key will be created for this user. Treat the file like a password.',+ style: TextStyle(fontSize: 12, color: cs.onSurfaceVariant.withValues(alpha: 0.8)),+ ),+ ]),+ actions: [+ TextButton(onPressed: () => Navigator.pop(ctx, false), child: const Text('Cancel')),+ FilledButton(onPressed: () => Navigator.pop(ctx, true), child: const Text('Create')),+ ],+ );+ },+ );++ if (proceed != true) return;+ final serverUrl = urlCtrl.text.trim();+ if (serverUrl.isEmpty) return;++ final key = await api.createApiKey(name: 'Absorb setup: $username', userId: userId);+ final token = key?['apiKey'] as String?;+ if (token == null || token.isEmpty) {+ if (mounted) {+ ScaffoldMessenger.of(context).showSnackBar(+ const SnackBar(content: Text('Could not create an API key for this user')),+ );+ }+ return;+ }++ try {+ final payload = await BackupService.buildSetupFile(+ serverUrl: serverUrl,+ username: username,+ token: token,+ userId: userId,+ customHeaders: auth.customHeaders,+ );+ final jsonStr = const JsonEncoder.withIndent(' ').convert(payload);+ final safeName = username.replaceAll(RegExp(r'[^A-Za-z0-9_-]'), '_');+ final bytes = Uint8List.fromList(utf8.encode(jsonStr));++ final result = await FilePicker.platform.saveFile(+ dialogTitle: 'Save setup file',+ fileName: 'absorb_setup_$safeName.absorb',+ type: FileType.any,+ bytes: bytes,+ );++ if (result != null) {+ if (Platform.isWindows || Platform.isLinux || Platform.isMacOS) {+ await File(result).writeAsString(jsonStr);+ }+ if (mounted) {+ ScaffoldMessenger.of(context).showSnackBar(+ SnackBar(content: Text('Setup file for $username saved')),+ );+ }+ }+ } catch (e) {+ if (mounted) {+ ScaffoldMessenger.of(context).showSnackBar(+ SnackBar(content: Text('Failed to create setup file: $e')),+ );+ }+ }+ }+String _timeAgo(DateTime dt) {final l = AppLocalizations.of(context)!;final d = DateTime.now().difference(dt);diff --git a/lib/screens/login_screen.dart b/lib/screens/login_screen.dartindex de1267f0..3b64f8ec 100644--- a/lib/screens/login_screen.dart+++ b/lib/screens/login_screen.dart@@ -13,6 +13,7 @@ import '../services/backup_service.dart';import '../services/oidc_service.dart';import '../services/user_account_service.dart';import '../widgets/absorb_wave_icon.dart';+import '../widgets/overlay_toast.dart';import '../services/audio_player_service.dart';import '../main.dart' show applyTrustAllCerts, oledNotifier;import '../l10n/app_localizations.dart';@@ -857,16 +858,22 @@ class _LoginScreenState extends State<LoginScreen>final accounts = data['accounts'] as List<dynamic>?;final accountCount = accounts?.length ?? 0;final hasAccounts = accountCount > 0;+ // A setup/login file carries an account but no settings payload, so it+ // should read as a sign-in rather than a backup restore.+ final isSetup = data['setup'] == true || (hasAccounts && data['settings'] == null);+ final firstUsername = hasAccounts ? ((accounts!.first as Map)['username'] as String? ?? '') : '';if (!mounted) return;final l = AppLocalizations.of(context)!;final confirm = await showDialog<bool>(context: context,builder: (ctx) => AlertDialog(- title: Text(l.loginRestoreBackupTitle),- content: Text(hasAccounts- ? l.loginRestoreBackupWithAccounts(accountCount)- : l.loginRestoreBackupNoAccounts),+ title: Text(isSetup ? 'Sign in' : l.loginRestoreBackupTitle),+ content: Text(isSetup+ ? (firstUsername.isNotEmpty ? 'Sign in as $firstUsername?' : 'Sign in to this server?')+ : (hasAccounts+ ? l.loginRestoreBackupWithAccounts(accountCount)+ : l.loginRestoreBackupNoAccounts)),actions: [TextButton(onPressed: () => Navigator.pop(ctx, false),@@ -874,7 +881,7 @@ class _LoginScreenState extends State<LoginScreen>),FilledButton(onPressed: () => Navigator.pop(ctx, true),- child: Text(l.loginRestore),+ child: Text(isSetup ? 'Sign in' : l.loginRestore),),],),@@ -894,36 +901,28 @@ class _LoginScreenState extends State<LoginScreen>if (mounted) {final l2 = AppLocalizations.of(context)!;if (auth.isAuthenticated && auth.serverReachable) {- ScaffoldMessenger.of(context).showSnackBar(SnackBar(- content: Text(l2.loginRestoredAndSignedIn(restoredAccounts.first.username)),- behavior: SnackBarBehavior.floating,- shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),- ));+ showOverlayToast(+ context,+ isSetup+ ? 'Signed in as ${restoredAccounts.first.username}'+ : l2.loginRestoredAndSignedIn(restoredAccounts.first.username),+ icon: Icons.check_circle_outline_rounded,+ );} else {// Token expired — accounts are saved but need re-auth- ScaffoldMessenger.of(context).showSnackBar(SnackBar(- content: Text(l2.loginSessionExpired),- behavior: SnackBarBehavior.floating,- shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),- ));+ showOverlayToast(context, l2.loginSessionExpired, icon: Icons.error_outline_rounded);setState(() {}); // Refresh to show saved accounts list}}}} else if (mounted) {final l3 = AppLocalizations.of(context)!;- ScaffoldMessenger.of(context).showSnackBar(SnackBar(- content: Text(l3.loginSettingsRestored),- behavior: SnackBarBehavior.floating,- shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),- ));+ showOverlayToast(context, l3.loginSettingsRestored, icon: Icons.check_circle_outline_rounded);}} catch (e) {if (mounted) {final l4 = AppLocalizations.of(context)!;- ScaffoldMessenger.of(context).showSnackBar(- SnackBar(content: Text(l4.loginRestoreFailed(e.toString()))),- );+ showOverlayToast(context, l4.loginRestoreFailed(e.toString()), icon: Icons.error_outline_rounded);}}}diff --git a/lib/services/backup_service.dart b/lib/services/backup_service.dartindex aa70be7c..28faec87 100644--- a/lib/services/backup_service.dart+++ b/lib/services/backup_service.dart@@ -299,6 +299,37 @@ class BackupService {};}+ /// Build a minimal setup file for provisioning a new user: a single account+ /// whose token is an API key minted for them, plus any custom headers needed+ /// to reach the server. Importing it from the login screen signs them in.+ /// The token has no refresh counterpart, so it is flagged legacy and used as+ /// a standing bearer key.+ static Future<Map<String, dynamic>> buildSetupFile({+ required String serverUrl,+ required String username,+ required String token,+ String? userId,+ Map<String, String>? customHeaders,+ }) async {+ final pkgInfo = await PackageInfo.fromPlatform();+ return {+ 'version': 3,+ 'setup': true,+ 'createdAt': DateTime.now().toIso8601String(),+ 'appVersion': pkgInfo.version,+ 'accounts': [+ {+ 'serverUrl': serverUrl,+ 'username': username,+ 'token': token,+ 'userId': userId,+ 'isLegacyToken': true,+ },+ ],+ if (customHeaders != null && customHeaders.isNotEmpty) 'customHeaders': customHeaders,+ };+ }+static Future<void> importSettings(Map<String, dynamic> data) async {final prefs = await SharedPreferences.getInstance();