Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

Fix login on newer servers and background episode checks

Barnabas45a0f4c27094
diff --git a/lib/providers/auth_provider.dart b/lib/providers/auth_provider.dart
index c9df4ca0..22549d15 100644
--- a/lib/providers/auth_provider.dart
+++ b/lib/providers/auth_provider.dart
@@ -4,6 +4,7 @@ import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:flutter/material.dart';
import 'package:shared_preferences/shared_preferences.dart';
import '../services/api_service.dart';
+import '../services/auth_tokens.dart';
import '../services/android_auto_service.dart';
import '../services/book_search_index.dart';
import '../services/carplay_service.dart';
@@ -489,15 +490,19 @@ class AuthProvider extends ChangeNotifier {
}
_serverUrl = url;
- // Prefer new JWT accessToken, fall back to legacy user.token for old servers
- final newAccessToken = result['accessToken'] as String?;
- final newRefreshToken = result['refreshToken'] as String?;
- _isLegacyToken = newAccessToken == null;
- _accessToken = newAccessToken ?? user['token'] as String?;
- _refreshToken = newRefreshToken;
+ // Prefer the JWTs returned inside user by current servers, while accepting
+ // the top-level shape and legacy token used by older servers.
+ final tokens = AuthTokens.fromResponse(result);
+ if (tokens.token == null) {
+ _errorMessage = l?.authUnexpectedServerResponse ?? 'Unexpected server response';
+ return false;
+ }
+ _isLegacyToken = tokens.isLegacy;
+ _accessToken = tokens.token;
+ _refreshToken = tokens.refreshToken;
debugPrint('[Auth] Login response keys: ${result.keys.toList()}');
debugPrint('[Auth] Login user keys: ${user.keys.toList()}');
- debugPrint('[Auth] accessToken=${newAccessToken != null}, refreshToken=${newRefreshToken != null}, legacyToken=${user['token'] != null}, isLegacy=$_isLegacyToken');
+ debugPrint('[Auth] accessToken=${tokens.accessToken != null}, refreshToken=${tokens.refreshToken != null}, legacyToken=${tokens.legacyToken != null}, isLegacy=$_isLegacyToken');
debugPrint('[Auth] Token being used: ${_accessToken != null ? '${_accessToken!.substring(0, _accessToken!.length.clamp(0, 20))}... (${_accessToken!.length} chars)' : 'null'}');
_username = user['username'] as String?;
_userId = user['id'] as String?;
@@ -672,14 +677,18 @@ class AuthProvider extends ChangeNotifier {
}
_serverUrl = url;
- final newAccessToken = result['accessToken'] as String?;
- final newRefreshToken = result['refreshToken'] as String?;
- _isLegacyToken = newAccessToken == null;
- _accessToken = newAccessToken ?? user['token'] as String?;
- _refreshToken = newRefreshToken;
+ final tokens = AuthTokens.fromResponse(result);
+ if (tokens.token == null) {
+ _errorMessage = l?.authSsoUnexpectedResponse ?? 'SSO returned an unexpected response';
+ notifyListeners();
+ return false;
+ }
+ _isLegacyToken = tokens.isLegacy;
+ _accessToken = tokens.token;
+ _refreshToken = tokens.refreshToken;
debugPrint('[Auth] OIDC response keys: ${result.keys.toList()}');
debugPrint('[Auth] OIDC user keys: ${user.keys.toList()}');
- debugPrint('[Auth] accessToken=${newAccessToken != null}, refreshToken=${newRefreshToken != null}, legacyToken=${user['token'] != null}, isLegacy=$_isLegacyToken');
+ debugPrint('[Auth] accessToken=${tokens.accessToken != null}, refreshToken=${tokens.refreshToken != null}, legacyToken=${tokens.legacyToken != null}, isLegacy=$_isLegacyToken');
debugPrint('[Auth] Token being used: ${_accessToken != null ? '${_accessToken!.substring(0, _accessToken!.length.clamp(0, 20))}... (${_accessToken!.length} chars)' : 'null'}');
_username = user['username'] as String?;
_userId = user['id'] as String?;
diff --git a/lib/services/api_service.dart b/lib/services/api_service.dart
index 2cb3ca0c..87a04917 100644
--- a/lib/services/api_service.dart
+++ b/lib/services/api_service.dart
@@ -4,6 +4,7 @@ import 'package:flutter/foundation.dart';
import 'package:http/http.dart' as http;
import 'package:shared_preferences/shared_preferences.dart';
import 'package:package_info_plus/package_info_plus.dart';
+import 'auth_tokens.dart';
/// Outcome of a local-session upsert. [serverTooOld] flags a 404/501 (the
/// server predates /api/session/local) so the caller can fall back to the
@@ -115,6 +116,7 @@ class ApiService {
String? _refreshToken;
final bool _isLegacyToken;
final Map<String, String> customHeaders;
+ final http.Client? _httpClient;
/// Called after a successful token refresh so the auth layer can persist.
void Function(String newAccessToken, String? newRefreshToken)? onTokensRefreshed;
@@ -150,9 +152,11 @@ class ApiService {
this.customHeaders = const {},
this.onTokensRefreshed,
this.onAuthExpired,
+ http.Client? httpClient,
}) : _accessToken = token,
_refreshToken = refreshToken,
- _isLegacyToken = isLegacyToken;
+ _isLegacyToken = isLegacyToken,
+ _httpClient = httpClient;
/// Current access token (for external use like cover URLs, socket auth).
String get token => _accessToken;
@@ -172,6 +176,24 @@ class ApiService {
String get _cleanBaseUrl =>
baseUrl.endsWith('/') ? baseUrl.substring(0, baseUrl.length - 1) : baseUrl;
+ Future<http.Response> _get(Uri url, {Map<String, String>? headers}) {
+ return _httpClient?.get(url, headers: headers) ?? http.get(url, headers: headers);
+ }
+
+ Future<http.Response> _post(Uri url, {Map<String, String>? headers, Object? body}) {
+ return _httpClient?.post(url, headers: headers, body: body) ??
+ http.post(url, headers: headers, body: body);
+ }
+
+ Future<http.Response> _patch(Uri url, {Map<String, String>? headers, Object? body}) {
+ return _httpClient?.patch(url, headers: headers, body: body) ??
+ http.patch(url, headers: headers, body: body);
+ }
+
+ Future<http.Response> _delete(Uri url, {Map<String, String>? headers}) {
+ return _httpClient?.delete(url, headers: headers) ?? http.delete(url, headers: headers);
+ }
+
/// Attempt to refresh the access token using the refresh token.
/// Returns true if successful. Uses a lock so concurrent 401s only
/// trigger one refresh.
@@ -189,19 +211,19 @@ class ApiService {
// Timeout is load-bearing: this is awaited from tryRestoreSession via
// the 401-retry path, and a stalled response here would otherwise hold
// the splash screen forever.
- final response = await http.post(
- Uri.parse('$_cleanBaseUrl/api/authorize'),
+ final response = await _post(
+ Uri.parse('$_cleanBaseUrl/auth/refresh'),
headers: {
...customHeaders,
- 'Authorization': 'Bearer $_refreshToken',
- 'x-return-tokens': 'true',
+ 'x-refresh-token': _refreshToken!,
},
).timeout(const Duration(seconds: 15));
if (response.statusCode == 200) {
final data = jsonDecode(response.body) as Map<String, dynamic>;
- final newAccess = data['accessToken'] as String?;
- final newRefresh = data['refreshToken'] as String?;
+ final tokens = AuthTokens.fromResponse(data);
+ final newAccess = tokens.accessToken;
+ final newRefresh = tokens.refreshToken;
if (newAccess != null) {
_accessToken = newAccess;
if (newRefresh != null) _refreshToken = newRefresh;
@@ -227,7 +249,7 @@ class ApiService {
Future<http.Response> _authGet(Uri url, {Map<String, String>? headers, Duration timeout = const Duration(seconds: 15)}) async {
final h = headers ?? _headers;
- var response = await http.get(url, headers: h).timeout(timeout);
+ var response = await _get(url, headers: h).timeout(timeout);
if (response.statusCode == 401) {
debugPrint('[API] 401 on GET ${url.path} - isLegacy=$_isLegacyToken, hasRefresh=${_refreshToken != null}, tokenLen=${_accessToken.length}');
}
@@ -235,7 +257,7 @@ class ApiService {
if (await _refreshAccessToken()) {
final refreshedHeaders = Map<String, String>.from(h)
..['Authorization'] = 'Bearer $_accessToken';
- response = await http.get(url, headers: refreshedHeaders).timeout(timeout);
+ response = await _get(url, headers: refreshedHeaders).timeout(timeout);
}
if (response.statusCode == 401) onAuthExpired?.call();
}
@@ -246,12 +268,12 @@ class ApiService {
Future<http.Response> _authPost(Uri url, {Map<String, String>? headers, Object? body, Duration timeout = const Duration(seconds: 15)}) async {
final h = headers ?? _headers;
- var response = await http.post(url, headers: h, body: body).timeout(timeout);
+ var response = await _post(url, headers: h, body: body).timeout(timeout);
if (response.statusCode == 401 && !_isLegacyToken) {
if (await _refreshAccessToken()) {
final refreshedHeaders = Map<String, String>.from(h)
..['Authorization'] = 'Bearer $_accessToken';
- response = await http.post(url, headers: refreshedHeaders, body: body).timeout(timeout);
+ response = await _post(url, headers: refreshedHeaders, body: body).timeout(timeout);
}
if (response.statusCode == 401) onAuthExpired?.call();
}
@@ -261,12 +283,12 @@ class ApiService {
/// Make an authenticated PATCH request, retrying once on 401 with a refreshed token.
Future<http.Response> _authPatch(Uri url, {Map<String, String>? headers, Object? body, Duration timeout = const Duration(seconds: 15)}) async {
final h = headers ?? _headers;
- var response = await http.patch(url, headers: h, body: body).timeout(timeout);
+ var response = await _patch(url, headers: h, body: body).timeout(timeout);
if (response.statusCode == 401 && !_isLegacyToken) {
if (await _refreshAccessToken()) {
final refreshedHeaders = Map<String, String>.from(h)
..['Authorization'] = 'Bearer $_accessToken';
- response = await http.patch(url, headers: refreshedHeaders, body: body).timeout(timeout);
+ response = await _patch(url, headers: refreshedHeaders, body: body).timeout(timeout);
}
if (response.statusCode == 401) onAuthExpired?.call();
}
@@ -276,12 +298,12 @@ class ApiService {
/// Make an authenticated DELETE request, retrying once on 401 with a refreshed token.
Future<http.Response> _authDelete(Uri url, {Map<String, String>? headers, Duration timeout = const Duration(seconds: 15)}) async {
final h = headers ?? _headers;
- var response = await http.delete(url, headers: h).timeout(timeout);
+ var response = await _delete(url, headers: h).timeout(timeout);
if (response.statusCode == 401 && !_isLegacyToken) {
if (await _refreshAccessToken()) {
final refreshedHeaders = Map<String, String>.from(h)
..['Authorization'] = 'Bearer $_accessToken';
- response = await http.delete(url, headers: refreshedHeaders).timeout(timeout);
+ response = await _delete(url, headers: refreshedHeaders).timeout(timeout);
}
if (response.statusCode == 401) onAuthExpired?.call();
}
diff --git a/lib/services/auth_tokens.dart b/lib/services/auth_tokens.dart
new file mode 100644
index 00000000..17601df4
--- /dev/null
+++ b/lib/services/auth_tokens.dart
@@ -0,0 +1,30 @@
+class AuthTokens {
+ final String? accessToken;
+ final String? refreshToken;
+ final String? legacyToken;
+
+ const AuthTokens({this.accessToken, this.refreshToken, this.legacyToken});
+
+ String? get token => accessToken ?? legacyToken;
+ bool get isLegacy => accessToken == null;
+
+ factory AuthTokens.fromResponse(Map<String, dynamic> response) {
+ final rawUser = response['user'];
+ final user = rawUser is Map<String, dynamic> ? rawUser : null;
+
+ return AuthTokens(
+ accessToken:
+ _readToken(user?['accessToken']) ??
+ _readToken(response['accessToken']),
+ refreshToken:
+ _readToken(user?['refreshToken']) ??
+ _readToken(response['refreshToken']),
+ legacyToken: _readToken(user?['token']),
+ );
+ }
+
+ static String? _readToken(Object? value) {
+ if (value is! String || value.isEmpty) return null;
+ return value;
+ }
+}
diff --git a/lib/services/episode_notification_service.dart b/lib/services/episode_notification_service.dart
index 5aac4076..948a08ff 100644
--- a/lib/services/episode_notification_service.dart
+++ b/lib/services/episode_notification_service.dart
@@ -27,6 +27,25 @@ class EpisodeNotificationService {
static const _uniqueName = 'com.barnabas.absorb.episodeNotifCheck';
static const channelId = 'new_episodes';
+ @visibleForTesting
+ static Future<void> prepareBackgroundPreferences({
+ Future<void> Function()? reloadPreferences,
+ Future<void> Function()? initializeAccount,
+ }) async {
+ if (reloadPreferences != null) {
+ await reloadPreferences();
+ } else {
+ final prefs = await SharedPreferences.getInstance();
+ await prefs.reload();
+ }
+
+ if (initializeAccount != null) {
+ await initializeAccount();
+ } else {
+ await UserAccountService().init();
+ }
+ }
+
/// Register/cancel the periodic job to match the setting. Called on app
/// start (self-healing after OEM kills) and when the setting changes.
static Future<void> syncRegistration() async {
@@ -110,8 +129,9 @@ void episodeNotifDispatcher() {
}
Future<void> _checkAndNotify() async {
- // Resolve the active account scope so ScopedPrefs reads hit the right user.
- await UserAccountService().init();
+ // WorkManager uses a separate Flutter engine whose SharedPreferences cache
+ // can lag behind writes from earlier workers or the foreground app.
+ await EpisodeNotificationService.prepareBackgroundPreferences();
final subscribed = await ScopedPrefs.getStringList('subscribed_podcasts');
if (subscribed.isEmpty) return;
diff --git a/pubspec.yaml b/pubspec.yaml
index 7598ed29..0f7ca23f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
name: absorb
description: An Audiobookshelf Client
publish_to: 'none'
-version: 1.9.2+217
+version: 1.9.3+218
environment:
sdk: '>=3.10.0 <4.0.0'