nilsjohan/recipe-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Clean up ApiClient code structure and improve readability

Browse Source
This commit is contained in:
Nils-Johan Gynther
2026-04-22 08:14:32 +02:00
parent 967121113e
commit 75d993f83a
1 changed files with 130 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flutter/lib/core/api/api_client.dart
+89 -98
View File
@@ -1,4 +1,4 @@
import 'dart:convert';
import 'dart:convert';
import 'package:http/http.dart' as http;
@@ -14,7 +14,7 @@ class ApiClient {
ApiClient({http.Client? client})
: baseUrl = const String.fromEnvironment(
'API_BASE_URL',
defaultValue: '/api',
defaultValue: '/api',
),
_client = client ?? http.Client();
@@ -23,45 +23,33 @@ class ApiClient {
if (token != null) 'Authorization': 'Bearer $token',
};
Future<dynamic> getJson(String path, {String? token}) async {
final response = await _client.get(
Uri.parse('$baseUrl$path'),
headers: _headers(token: token),
);
return _decodeOrNull(_guardResponse(response));
}
Future<dynamic> getJson(String path, {String? token}) async {
final response = await _client.get(
Uri.parse('$baseUrl$path'),
headers: _headers(token: token),
);
return _decodeOrNull(_guardResponse(response));
}
Future<dynamic> postJson(
String path, {
Object? body,
String? token,
}) async {
final response = await _client.post(
Uri.parse('$baseUrl$path'),
headers: _headers(token: token),
body: body == null ? null : jsonEncode(body),
);
return _decodeOrNull(_guardResponse(response));
}
Future<dynamic> postJson(String path, {Object? body, String? token}) async {
final response = await _client.post(
Uri.parse('$baseUrl$path'),
headers: _headers(token: token),
body: body == null ? null : jsonEncode(body),
);
return _decodeOrNull(_guardResponse(response));
}
Future<dynamic> putJson(
String path, {
Object? body,
String? token,
}) async {
final response = await _client.put(
Uri.parse('$baseUrl$path'),
headers: _headers(token: token),
body: body == null ? null : jsonEncode(body),
);
return _decodeOrNull(_guardResponse(response));
}
Future<dynamic> putJson(String path, {Object? body, String? token}) async {
final response = await _client.put(
Uri.parse('$baseUrl$path'),
headers: _headers(token: token),
body: body == null ? null : jsonEncode(body),
);
return _decodeOrNull(_guardResponse(response));
}
Future<dynamic> patchJson(
String path, {
Object? body,
String? token,
}) async {
Future<dynamic> patchJson(String path, {Object? body, String? token}) async {
final response = await _client.patch(
Uri.parse('$baseUrl$path'),
headers: _headers(token: token),
@@ -69,72 +57,75 @@ class ApiClient {
);
return _decodeOrNull(_guardResponse(response));
}
}
final parsedBody = _decodeOrNull(response);
final serverMessage = _extractMessage(parsedBody);
Future<dynamic> deleteJson(String path, {String? token}) async {
final response = await _client.delete(
Uri.parse('$baseUrl$path'),
headers: _headers(token: token),
);
return _decodeOrNull(_guardResponse(response));
}
if (response.statusCode == 401) {
throw ApiException(
type: ApiErrorType.unauthorized,
statusCode: 401,
message: serverMessage ?? 'Unauthorized',
);
}
if (response.statusCode == 403) {
throw ApiException(
type: ApiErrorType.forbidden,
statusCode: 403,
message: serverMessage ?? 'Forbidden',
);
}
if (response.statusCode >= 500) {
throw ApiException(
type: ApiErrorType.server,
statusCode: response.statusCode,
message: serverMessage ?? 'Server error',
);
}
throw ApiException(
type: ApiErrorType.unknown,
statusCode: response.statusCode,
message: serverMessage ?? 'Request failed',
);
http.Response _guardResponse(http.Response response) {
if (response.statusCode >= 200 && response.statusCode < 300) {
return response;
}
dynamic _decodeOrNull(http.Response response) {
final body = response.body.trim();
if (body.isEmpty) {
return null;
}
final parsedBody = _decodeOrNull(response);
final serverMessage = _extractMessage(parsedBody);
try {
return jsonDecode(body);
} catch (_) {
return body;
}
if (response.statusCode == 401) {
throw ApiException(
type: ApiErrorType.unauthorized,
statusCode: 401,
message: serverMessage ?? 'Unauthorized',
);
}
String? _extractMessage(dynamic parsedBody) {
if (parsedBody is Map<String, dynamic>) {
final message = parsedBody['message'];
if (message is String && message.trim().isNotEmpty) {
return message;
}
if (message is List && message.isNotEmpty) {
return message.first.toString();
}
final error = parsedBody['error'];
if (error is String && error.trim().isNotEmpty) {
return error;
}
}
if (parsedBody is String && parsedBody.trim().isNotEmpty) {
return parsedBody;
}
return null;
if (response.statusCode == 403) {
throw ApiException(
type: ApiErrorType.forbidden,
statusCode: 403,
message: serverMessage ?? 'Forbidden',
);
}
if (response.statusCode >= 500) {
throw ApiException(
type: ApiErrorType.server,
statusCode: response.statusCode,
message: serverMessage ?? 'Server error',
);
}
throw ApiException(
type: ApiErrorType.unknown,
statusCode: response.statusCode,
message: serverMessage ?? 'Request failed',
);
}
dynamic _decodeOrNull(http.Response response) {
final body = response.body.trim();
if (body.isEmpty) return null;
try {
return jsonDecode(body);
} catch (_) {
return body;
}
}
String? _extractMessage(dynamic parsedBody) {
if (parsedBody is Map<String, dynamic>) {
final message = parsedBody['message'];
if (message is String && message.trim().isNotEmpty) return message;
if (message is List && message.isNotEmpty) {
return message.first.toString();
}
final error = parsedBody['error'];
if (error is String && error.trim().isNotEmpty) return error;
}
if (parsedBody is String && parsedBody.trim().isNotEmpty) return parsedBody;
return null;
}
}