fix: completed better error managment for all api clients

This commit is contained in:
alzalia1 2025-08-20 18:20:37 +02:00
parent 6359efa0c3
commit 59e1c2558c
3 changed files with 65 additions and 37 deletions

View file

@ -1,6 +1,5 @@
import 'dart:convert'; import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart';
import 'package:http/http.dart'; import 'package:http/http.dart';
import 'package:logger/logger.dart'; import 'package:logger/logger.dart';
@ -38,7 +37,7 @@ class ApiClient {
); );
Future<void> _initStore() async { Future<void> _initStore() async {
_secureStorage ??= const FlutterSecureStorage(aOptions: AndroidOptions()); _secureStorage ??= const FlutterSecureStorage();
} }
Future<Map<String, String>> _getHeaders([ Future<Map<String, String>> _getHeaders([

View file

@ -1,29 +1,39 @@
import 'dart:convert'; import 'dart:convert';
import 'dart:ffi';
import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart';
import 'package:logger/logger.dart';
import 'package:seshat/config/constants.dart'; import 'package:seshat/config/constants.dart';
import 'package:seshat/utils/result.dart'; import 'package:seshat/utils/result.dart';
import "package:http/http.dart" as http; import "package:http/http.dart";
class AuthClient { class AuthClient {
AuthClient(); AuthClient();
FlutterSecureStorage? _secureStorage; FlutterSecureStorage? _secureStorage;
Logger log = Logger(
printer: PrettyPrinter(
colors: true,
lineLength: 100,
methodCount: 0,
dateTimeFormat: DateTimeFormat.dateAndTime,
),
);
Future<void> _initStore() async { Future<void> _initStore() async {
_secureStorage ??= const FlutterSecureStorage( _secureStorage ??= const FlutterSecureStorage();
aOptions: AndroidOptions(encryptedSharedPreferences: true),
);
} }
Future<Result<bool>> hasValidToken() async { Future<Result<bool>> hasValidToken() async {
final url = "https://$apiBasePath/token-check";
log.i("Fetching: hasValidToken ($url)");
final client = Client();
try { try {
await _initStore(); await _initStore();
bool hasToken = await _secureStorage!.containsKey(key: "token"); bool hasToken = await _secureStorage!.containsKey(key: "token");
if (hasToken) { if (hasToken) {
var token = await _secureStorage!.read(key: "token"); var token = await _secureStorage!.read(key: "token");
var url = Uri.parse("https://$apiBasePath/token-check"); var response = await client.post(
var response = await http.post( Uri.parse(url),
url,
headers: {"Content-Type": "application/json"}, headers: {"Content-Type": "application/json"},
body: jsonEncode({"token": token}), body: jsonEncode({"token": token}),
); );
@ -34,33 +44,41 @@ class AuthClient {
} }
return Result.ok(false); return Result.ok(false);
} catch (e) { } catch (e) {
log.e(e.toString());
return Result.error(Exception(e)); return Result.error(Exception(e));
} finally {
client.close();
} }
} }
Future<Result<String>> login(String username, String password) async { Future<Result<String>> login(String username, String password) async {
var client = http.Client(); final url = "https://$apiBasePath/auth";
log.i("Logging in: $url");
var client = Client();
try { try {
await _initStore(); await _initStore();
var url = Uri.parse("https://$apiBasePath/auth");
var response = await client.post( var response = await client.post(
url, Uri.parse(url),
headers: { headers: {"Content-Type": "application/json"},
"Content-Type": "application/json",
"Accept": "application/json",
},
body: jsonEncode({"password": password, "username": username}), body: jsonEncode({"password": password, "username": username}),
); );
if (response.statusCode == 200) { switch (response.statusCode) {
case 200:
var json = jsonDecode(response.body); var json = jsonDecode(response.body);
await _secureStorage!.write(key: "token", value: json["access_token"]); await _secureStorage!.write(
key: "token",
value: json["access_token"],
);
return Result.ok(json["access_token"]); return Result.ok(json["access_token"]);
} else if (response.statusCode == 401) { case 401:
return Result.error(Exception("Wrong credentials")); throw "Wrong credentials";
} else { case 500:
return Result.error(Exception("Token creation error")); throw "Token creation error";
default:
throw "Unknown error with code ${response.statusCode.toString()}";
} }
} catch (e) { } catch (e) {
log.e(e.toString());
return Result.error(Exception(e)); return Result.error(Exception(e));
} finally { } finally {
client.close(); client.close();
@ -68,18 +86,20 @@ class AuthClient {
} }
Future<Result<int>> getRemoteApiVersion() async { Future<Result<int>> getRemoteApiVersion() async {
final client = http.Client(); final url = "https://$apiBasePath/version";
log.i("Fetching: getRemoteApiVersion ($url)");
final client = Client();
try { try {
final response = await client.get( final response = await client.get(Uri.parse(url));
Uri.parse("https://$apiBasePath/version"), switch (response.statusCode) {
); case 200:
if (response.statusCode == 200) {
final json = jsonDecode(response.body) as int; final json = jsonDecode(response.body) as int;
return Result.ok(json); return Result.ok(json);
} else { default:
throw "Something wrong happened"; throw "Unknown error with code ${response.statusCode.toString()}";
} }
} catch (e) { } catch (e) {
log.e(e.toString());
return Result.error(Exception(e)); return Result.error(Exception(e));
} finally { } finally {
client.close(); client.close();

View file

@ -2,6 +2,7 @@ import 'dart:async';
import 'dart:convert'; import 'dart:convert';
import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart';
import 'package:logger/logger.dart';
import 'package:rxdart/rxdart.dart'; import 'package:rxdart/rxdart.dart';
import 'package:seshat/config/constants.dart'; import 'package:seshat/config/constants.dart';
import 'package:seshat/domain/models/owner.dart'; import 'package:seshat/domain/models/owner.dart';
@ -15,20 +16,28 @@ class WebsocketClient {
sync: true, sync: true,
); );
late final StreamSubscription sub; late final StreamSubscription sub;
Logger log = Logger(
printer: PrettyPrinter(
colors: true,
lineLength: 100,
methodCount: 0,
dateTimeFormat: DateTimeFormat.dateAndTime,
),
);
Stream<Owner> get owners => _ownersController.stream; Stream<Owner> get owners => _ownersController.stream;
Future<void> _initStore() async { Future<void> _initStore() async {
_secureStorage ??= const FlutterSecureStorage( _secureStorage ??= const FlutterSecureStorage();
aOptions: AndroidOptions(encryptedSharedPreferences: true),
);
} }
Future<void> connect() async { Future<void> connect() async {
final url = "wss://$apiBasePath/ws";
log.i("Webocket: $url");
await _initStore(); await _initStore();
if (_channel != null) return; if (_channel != null) return;
_channel = WebSocketChannel.connect(Uri.parse("wss://$apiBasePath/ws")); _channel = WebSocketChannel.connect(Uri.parse(url));
await _channel!.ready; await _channel!.ready;
var token = await _secureStorage!.read(key: "token"); var token = await _secureStorage!.read(key: "token");