A cross platform Audiobookshelf client for Android and iOS
Dart
Fix SSO login for servers behind a proxy that needs custom headers
Barnabasc4c61887c543
diff --git a/lib/providers/auth_provider.dart b/lib/providers/auth_provider.dartindex 607c7aa7..abc238f3 100644--- a/lib/providers/auth_provider.dart+++ b/lib/providers/auth_provider.dart@@ -579,6 +579,7 @@ class AuthProvider extends ChangeNotifier {Future<bool> loginWithOidc({required String serverUrl,required Map<String, dynamic> result,+ Map<String, String> customHeaders = const {},AppLocalizations? l,}) async {_errorMessage = null;@@ -609,6 +610,7 @@ class AuthProvider extends ChangeNotifier {_userJson = user;_serverSettings = result['serverSettings'] as Map<String, dynamic>?;_serverReachable = true;+ _customHeaders = customHeaders;final devicesRaw = result['ereaderDevices'] as List<dynamic>?;_ereaderDevices = devicesRaw?.cast<Map<String, dynamic>>() ?? const [];await _persistEreaderDevices();@@ -633,6 +635,11 @@ class AuthProvider extends ChangeNotifier {if (_defaultLibraryId != null) {await prefs.setString('default_library_id', _defaultLibraryId!);}+ if (customHeaders.isNotEmpty) {+ await prefs.setString('custom_headers', jsonEncode(customHeaders));+ } else {+ await prefs.remove('custom_headers');+ }} catch (_) {}// Save to multi-account servicediff --git a/lib/screens/login_screen.dart b/lib/screens/login_screen.dartindex 4a6a1492..de1267f0 100644--- a/lib/screens/login_screen.dart+++ b/lib/screens/login_screen.dart@@ -153,6 +153,16 @@ class _LoginScreenState extends State<LoginScreen>_debounce = Timer(const Duration(milliseconds: 800), () => _checkServer());}+ Map<String, String> _collectHeaders() {+ final headers = <String, String>{};+ for (final (keyCtrl, valCtrl) in _headerControllers) {+ final k = keyCtrl.text.trim();+ final v = valCtrl.text.trim();+ if (k.isNotEmpty && v.isNotEmpty) headers[k] = v;+ }+ return headers;+ }+Future<void> _checkServer() async {final text = _serverController.text.trim();if (text.isEmpty) return;@@ -161,14 +171,7 @@ class _LoginScreenState extends State<LoginScreen>final fullUrl = '$_protocol$cleanUrl';try {- // Build custom headers for ping- final headers = <String, String>{};- for (final (keyCtrl, valCtrl) in _headerControllers) {- final k = keyCtrl.text.trim();- final v = valCtrl.text.trim();- if (k.isNotEmpty && v.isNotEmpty) headers[k] = v;- }-+ final headers = _collectHeaders();final ok = await ApiService.pingServer(fullUrl, customHeaders: headers);if (!mounted) return;if (_serverController.text.trim() != text) return;@@ -187,7 +190,7 @@ class _LoginScreenState extends State<LoginScreen>if (ok) {// Also check if OIDC is available- OidcService.checkOidcEnabled(fullUrl).then((config) {+ OidcService.checkOidcEnabled(fullUrl, customHeaders: headers).then((config) {if (mounted && _serverController.text.trim() == text) {setState(() => _oidcConfig = config);}@@ -232,13 +235,7 @@ class _LoginScreenState extends State<LoginScreen>final cleanUrl = serverText.replaceAll(RegExp(r'^https?://'), '');final fullUrl = '$_protocol$cleanUrl';- // Build custom headers map- final headers = <String, String>{};- for (final (keyCtrl, valCtrl) in _headerControllers) {- final k = keyCtrl.text.trim();- final v = valCtrl.text.trim();- if (k.isNotEmpty && v.isNotEmpty) headers[k] = v;- }+ final headers = _collectHeaders();final success = apiKey.isNotEmpty? await auth.loginWithApiKey(@@ -285,8 +282,9 @@ class _LoginScreenState extends State<LoginScreen>final cleanUrl = serverText.replaceAll(RegExp(r'^https?://'), '');final fullUrl = '$_protocol$cleanUrl';+ final headers = _collectHeaders();final oidc = OidcService();- final callbackUri = await oidc.startLogin(fullUrl);+ final callbackUri = await oidc.startLogin(fullUrl, customHeaders: headers);if (callbackUri == null) {if (!mounted) return;// Quiet path: user just dismissed the popup. Don't surface an error.@@ -310,6 +308,7 @@ class _LoginScreenState extends State<LoginScreen>final success = await auth.loginWithOidc(serverUrl: fullUrl,result: result,+ customHeaders: headers,l: AppLocalizations.of(context),);if (mounted) {diff --git a/lib/services/oidc_service.dart b/lib/services/oidc_service.dartindex 64839629..42132380 100644--- a/lib/services/oidc_service.dart+++ b/lib/services/oidc_service.dart@@ -22,6 +22,10 @@ class OidcService {/// The raw cookie strings from the /auth/openid response.List<String> _rawCookies = [];+ /// Custom headers (e.g. Cloudflare Access) carried across the flow so the+ /// callback request can pass the same proxy as the pre-flight.+ Map<String, String> _customHeaders = const {};+/// Diagnostic message from the most recent failure. Cleared on each/// startLogin() call. Null when the last attempt succeeded or the user/// simply cancelled the popup. Surface to the UI so SSO failures aren't@@ -57,11 +61,12 @@ class OidcService {/// Returns the callback [Uri] on success, or null on failure/cancellation./// On failure, [lastError] holds a diagnostic message and [lastWasUserCancel]/// distinguishes user-dismissed popups from real errors.- Future<Uri?> startLogin(String serverUrl) async {+ Future<Uri?> startLogin(String serverUrl, {Map<String, String> customHeaders = const {}}) async {_serverUrl = serverUrl.endsWith('/') ? serverUrl.substring(0, serverUrl.length - 1) : serverUrl;_generatePkce();_state = _generateRandom(16);_rawCookies = [];+ _customHeaders = customHeaders;_lastError = null;_lastWasUserCancel = false;@@ -85,6 +90,7 @@ class OidcService {try {final request = await client.getUrl(Uri.parse(authUrl));request.followRedirects = false;+ _customHeaders.forEach(request.headers.set);request.headers.set('x-return-tokens', 'true');final response = await request.close();@@ -233,6 +239,7 @@ class OidcService {try {final request = await client.getUrl(Uri.parse(callbackUrl));request.followRedirects = false;+ _customHeaders.forEach(request.headers.set);request.headers.set('x-return-tokens', 'true');if (_rawCookies.isNotEmpty) {@@ -272,16 +279,18 @@ class OidcService {_codeChallenge = null;_state = null;_rawCookies = [];+ _customHeaders = const {};}/// Cancel any in-progress flow.void cancel() => _cleanup();/// Fetch server status to check if OIDC is available.- static Future<Map<String, dynamic>?> getServerAuthConfig(String serverUrl) async {+ static Future<Map<String, dynamic>?> getServerAuthConfig(String serverUrl, {Map<String, String> customHeaders = const {}}) async {final url = serverUrl.endsWith('/') ? '${serverUrl}status' : '$serverUrl/status';try {- final response = await http.get(Uri.parse(url)).timeout(const Duration(seconds: 10));+ final response = await http.get(Uri.parse(url), headers: customHeaders.isNotEmpty ? customHeaders : null)+ .timeout(const Duration(seconds: 10));if (response.statusCode == 200) {return jsonDecode(response.body) as Map<String, dynamic>;}@@ -292,8 +301,8 @@ class OidcService {}/// Check if a server has OIDC enabled.- static Future<OidcConfig?> checkOidcEnabled(String serverUrl) async {- final status = await getServerAuthConfig(serverUrl);+ static Future<OidcConfig?> checkOidcEnabled(String serverUrl, {Map<String, String> customHeaders = const {}}) async {+ final status = await getServerAuthConfig(serverUrl, customHeaders: customHeaders);if (status == null) return null;final authMethods = status['authMethods'] as List<dynamic>? ?? [];