feat(flutter/api): dio client with Bearer interceptor + ApiError
ApiError.fromDio handles both server envelope shapes: {"error":"code"}
(admin endpoints) and {"error":{"code","message"}} (most others). Same
dual-shape problem the web apiFetch already solves. Token comes from a
resolver function so the auth provider can swap implementations
without touching the client.
ErrorCopy is a lazy singleton over assets/error-copy.json with the
same fallback chain web uses (specific code -> unknown -> hard-coded).
This commit is contained in:
@@ -0,0 +1,30 @@
|
|||||||
|
import 'package:dio/dio.dart';
|
||||||
|
|
||||||
|
typedef TokenResolver = Future<String?> Function();
|
||||||
|
|
||||||
|
class ApiClient {
|
||||||
|
/// Builds a dio instance pinned to [baseUrl] with a Bearer-auth
|
||||||
|
/// interceptor that pulls the current token from [tokenResolver]
|
||||||
|
/// on every request. Server already supports cookie OR bearer
|
||||||
|
/// (internal/auth/session.go); we use bearer to skip cookie-jar.
|
||||||
|
static Dio buildDio({
|
||||||
|
required String baseUrl,
|
||||||
|
required TokenResolver tokenResolver,
|
||||||
|
}) {
|
||||||
|
final d = Dio(BaseOptions(
|
||||||
|
baseUrl: baseUrl,
|
||||||
|
connectTimeout: const Duration(seconds: 8),
|
||||||
|
receiveTimeout: const Duration(seconds: 30),
|
||||||
|
contentType: Headers.jsonContentType,
|
||||||
|
responseType: ResponseType.json,
|
||||||
|
));
|
||||||
|
d.interceptors.add(InterceptorsWrapper(onRequest: (opts, handler) async {
|
||||||
|
final t = await tokenResolver();
|
||||||
|
if (t != null && t.isNotEmpty) {
|
||||||
|
opts.headers['Authorization'] = 'Bearer $t';
|
||||||
|
}
|
||||||
|
handler.next(opts);
|
||||||
|
}));
|
||||||
|
return d;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
import 'dart:convert';
|
||||||
|
import 'package:flutter/services.dart' show rootBundle;
|
||||||
|
|
||||||
|
class ErrorCopy {
|
||||||
|
ErrorCopy._(this._table);
|
||||||
|
final Map<String, String> _table;
|
||||||
|
|
||||||
|
static ErrorCopy? _instance;
|
||||||
|
|
||||||
|
static Future<ErrorCopy> load() async {
|
||||||
|
if (_instance != null) return _instance!;
|
||||||
|
final raw = await rootBundle.loadString('assets/error-copy.json');
|
||||||
|
final m = (jsonDecode(raw) as Map).cast<String, dynamic>().map(
|
||||||
|
(k, v) => MapEntry(k, v.toString()),
|
||||||
|
);
|
||||||
|
_instance = ErrorCopy._(m);
|
||||||
|
return _instance!;
|
||||||
|
}
|
||||||
|
|
||||||
|
String forCode(String code) =>
|
||||||
|
_table[code] ?? _table['unknown'] ?? 'Something went wrong.';
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
import 'package:dio/dio.dart';
|
||||||
|
|
||||||
|
class ApiError implements Exception {
|
||||||
|
ApiError({required this.code, required this.message, required this.status});
|
||||||
|
|
||||||
|
final String code;
|
||||||
|
final String message;
|
||||||
|
final int status;
|
||||||
|
|
||||||
|
factory ApiError.fromDio(DioException e) {
|
||||||
|
if (e.type == DioExceptionType.connectionError ||
|
||||||
|
e.type == DioExceptionType.connectionTimeout) {
|
||||||
|
return ApiError(code: 'connection_refused', message: 'Connection refused', status: 0);
|
||||||
|
}
|
||||||
|
final response = e.response;
|
||||||
|
final data = response?.data;
|
||||||
|
if (data is Map<String, dynamic>) {
|
||||||
|
final field = data['error'];
|
||||||
|
if (field is String) {
|
||||||
|
return ApiError(code: field, message: field, status: response?.statusCode ?? 0);
|
||||||
|
}
|
||||||
|
if (field is Map<String, dynamic>) {
|
||||||
|
final code = field['code']?.toString() ?? 'unknown';
|
||||||
|
final msg = field['message']?.toString() ?? code;
|
||||||
|
return ApiError(code: code, message: msg, status: response?.statusCode ?? 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
final status = response?.statusCode ?? 0;
|
||||||
|
if (status == 401) return ApiError(code: 'unauthenticated', message: 'unauthenticated', status: status);
|
||||||
|
if (status == 404) return ApiError(code: 'not_found', message: 'not_found', status: status);
|
||||||
|
return ApiError(code: 'unknown', message: e.message ?? 'unknown', status: status);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
import 'package:dio/dio.dart';
|
||||||
|
import 'package:flutter_test/flutter_test.dart';
|
||||||
|
|
||||||
|
import 'package:minstrel/api/client.dart';
|
||||||
|
|
||||||
|
void main() {
|
||||||
|
test('client attaches Bearer token from token resolver', () async {
|
||||||
|
final d = ApiClient.buildDio(
|
||||||
|
baseUrl: 'http://example/',
|
||||||
|
tokenResolver: () async => 'tok-123',
|
||||||
|
);
|
||||||
|
Map<String, dynamic>? captured;
|
||||||
|
d.interceptors.add(
|
||||||
|
InterceptorsWrapper(onRequest: (opts, h) {
|
||||||
|
captured = Map<String, dynamic>.from(opts.headers);
|
||||||
|
h.reject(DioException(requestOptions: opts, type: DioExceptionType.cancel));
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
try {
|
||||||
|
await d.get<void>('/whatever');
|
||||||
|
} catch (_) {}
|
||||||
|
expect(captured?['Authorization'], 'Bearer tok-123');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('client omits Authorization when resolver returns null', () async {
|
||||||
|
final d = ApiClient.buildDio(
|
||||||
|
baseUrl: 'http://example/',
|
||||||
|
tokenResolver: () async => null,
|
||||||
|
);
|
||||||
|
Map<String, dynamic>? captured;
|
||||||
|
d.interceptors.add(
|
||||||
|
InterceptorsWrapper(onRequest: (opts, h) {
|
||||||
|
captured = Map<String, dynamic>.from(opts.headers);
|
||||||
|
h.reject(DioException(requestOptions: opts, type: DioExceptionType.cancel));
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
try {
|
||||||
|
await d.get<void>('/whatever');
|
||||||
|
} catch (_) {}
|
||||||
|
expect(captured?.containsKey('Authorization'), isFalse);
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
import 'package:dio/dio.dart';
|
||||||
|
import 'package:flutter_test/flutter_test.dart';
|
||||||
|
|
||||||
|
import 'package:minstrel/api/errors.dart';
|
||||||
|
|
||||||
|
void main() {
|
||||||
|
RequestOptions opts() => RequestOptions(path: '/x');
|
||||||
|
|
||||||
|
group('ApiError.fromDio', () {
|
||||||
|
test('flat envelope: {error: "code"}', () {
|
||||||
|
final d = DioException(
|
||||||
|
requestOptions: opts(),
|
||||||
|
response: Response(
|
||||||
|
requestOptions: opts(),
|
||||||
|
statusCode: 503,
|
||||||
|
data: {'error': 'lidarr_unreachable'},
|
||||||
|
),
|
||||||
|
);
|
||||||
|
final e = ApiError.fromDio(d);
|
||||||
|
expect(e.code, 'lidarr_unreachable');
|
||||||
|
expect(e.status, 503);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('nested envelope: {error: {code, message}}', () {
|
||||||
|
final d = DioException(
|
||||||
|
requestOptions: opts(),
|
||||||
|
response: Response(
|
||||||
|
requestOptions: opts(),
|
||||||
|
statusCode: 400,
|
||||||
|
data: {'error': {'code': 'bad_request', 'message': 'invalid JSON body'}},
|
||||||
|
),
|
||||||
|
);
|
||||||
|
final e = ApiError.fromDio(d);
|
||||||
|
expect(e.code, 'bad_request');
|
||||||
|
expect(e.message, 'invalid JSON body');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('connection refused: code is connection_refused', () {
|
||||||
|
final d = DioException(
|
||||||
|
requestOptions: opts(),
|
||||||
|
type: DioExceptionType.connectionError,
|
||||||
|
error: 'Connection refused',
|
||||||
|
);
|
||||||
|
final e = ApiError.fromDio(d);
|
||||||
|
expect(e.code, 'connection_refused');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('401 with no envelope falls back to unauthenticated', () {
|
||||||
|
final d = DioException(
|
||||||
|
requestOptions: opts(),
|
||||||
|
response: Response(requestOptions: opts(), statusCode: 401),
|
||||||
|
);
|
||||||
|
final e = ApiError.fromDio(d);
|
||||||
|
expect(e.code, 'unauthenticated');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user